paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-28 19:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* use environment variable again for win32, the file writing gives to

Browse Source 
much trouble
This commit is contained in:
peter 2000-01-16 22:26:46 +00:00
parent cea4495a20
commit 1b6cb38346
3 changed files with 248 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
utils/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

30
utils/fpcmake.ini
View File

@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT)
endif
endif
endif
override FPC:=$(subst \,/,$(FPC))
# Target OS
ifndef OS_TARGET
@ -195,11 +196,14 @@ ifeq ($(ECHO),)
ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),)
ECHO:=echo
ECHOE:=echo
else
ECHO:=$(firstword $(ECHO))
ECHOE=$(ECHO) -E
endif
else
ECHO:=$(firstword $(ECHO))
ECHOE=$(ECHO) -E
endif
endif
@ -255,7 +259,7 @@ MKDIR:=ginstall -m 755 -d
endif
endif
export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
[tool_default]
@ -800,16 +804,26 @@ ifdef CFGFILE
override FPCOPT+=@$(CFGFILE)
endif
[command_win32file]
# For win32 the options are passed using the file fpcext.cmd
ifndef FPCEXTCMD
FPCEXTCMD=fpcext.cmd
ifndef FPCEXTFILE
FPCEXTFILE=fpcext.cmd
endif
ifeq ($(OS_SOURCE),win32)
override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)")
override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)"))
override FPCOPT:=@$(FPCEXTCMD)
override TMPVAR:=$(shell "$(DEL) $(FPCEXTFILE)")
override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(FPCEXTFILE)"))
override FPCOPT:=@$(FPCEXTFILE)
endif
[command_win32env]
# For win32 the options are passed using the environment FPCEXTCMD
ifeq ($(OS_SOURCE),win32)
override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD
endif
[command_compiler]
# Compiler commandline
override COMPILER:=$(FPC) $(FPCOPT)
@ -1165,7 +1179,7 @@ endif
ifdef EXTRACLEANFILES
-$(DEL) $(EXTRACLEANFILES)
endif
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
fpc_cleanall: $(CLEANTARGET)
ifdef CLEANEXEFILES
@ -1173,7 +1187,7 @@ ifdef CLEANEXEFILES
endif
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-$(DELTREE) *$(SMARTEXT)
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
[dependrules]

8
utils/fpcmake.pp
View File

@ -1171,6 +1171,8 @@ begin
AddSection((userini.dirtarget<>''),'command_target');
AddSection((userini.dirunittarget<>''),'command_unittarget');
AddSection(true,'command_end');
AddSection(true,'command_win32env');
AddSection(true,'command_compiler');
end;
{ add default rules }
@ -1296,7 +1298,11 @@ begin
end.
{
$Log$
Revision 1.26 2000-01-14 12:14:41 peter
Revision 1.27 2000-01-16 22:26:47 peter
* use environment variable again for win32, the file writing gives to
much trouble
Revision 1.26 2000/01/14 12:14:41 peter
* sourceinstall updates
Revision 1.25 2000/01/13 21:08:46 peter