paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-02-25 06:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed rebuilding the IDE, in case the idemake.cfg files was in a directory with spaces and upper ansi chars in its path, thanks to Yury

Browse Source 
git-svn-id: trunk@15045 -
This commit is contained in:
vincents 2008-05-04 19:32:01 +00:00
parent 3a8336c1b9
commit 6cd01bc70a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/Makefile
View File

@ -272,7 +272,7 @@ LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
endif
endif
export LAZARUS_CONFIG_DIR
LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
LAZARUS_IDE_CONFIG='$(LAZARUS_CONFIG_DIR)/idemake.cfg'
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
BIG_IDE_OPTIONS=-dBigIDE $(LAZARUS_LIBPATHS) \
-Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
@ -3172,13 +3172,13 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
ifeq ($(LAZARUS_OPT),)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
else
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
endif
idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
starter: $(COMPILER_UNITTARGETDIR)
ifeq ($(LAZARUS_OPT),)
$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT)

8
ide/Makefile.fpc
View File

@ -84,7 +84,7 @@ export LAZARUS_CONFIG_DIR
#
# idemake.cfg
LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
LAZARUS_IDE_CONFIG='$(LAZARUS_CONFIG_DIR)/idemake.cfg'
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
#
@ -134,17 +134,17 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
ifeq ($(LAZARUS_OPT),)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
else
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
endif
#-----------------------------------------------------------------------------
idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
#-----------------------------------------------------------------------------
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
#-----------------------------------------------------------------------------
starter: $(COMPILER_UNITTARGETDIR)

2
ide/buildlazdialog.pas
View File

@ -525,7 +525,7 @@ begin
MakeIDECfgFilename:=GetMakeIDEConfigFilename;
if (FileExists(MakeIDECfgFilename)) then begin
if pos(' ', MakeIDECfgFilename)>0 then
ExtraOptions:='@"'+MakeIDECfgFilename+'"'
ExtraOptions:='@'''+MakeIDECfgFilename+''''
else
ExtraOptions:='@'+MakeIDECfgFilename;
exit;