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

* -T<target> support

Browse Source 
* better error reporting for not found dirs
  * some cleanups and nicer strings
This commit is contained in:
peter 2001-08-02 20:50:29 +00:00
parent 071f6b7ba0
commit 18660be258
5 changed files with 297 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
utils/fpcm/fpcmake.inc
View File

@ -1014,8 +1014,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
'# a safety check is done if Makefile.fpc is available'#010+ '# a safety check is done if Makefile.fpc is available'#010+
'ifdef PACKAGE_VERSION'#010+ 'ifdef PACKAGE_VERSION'#010+
'ifneq ($(wildcard Makefile.fpc),)'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+
' $(FPCMAKE) -p Makefile.fpc'#010+ ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
' $(MKDIR) $(IN','STALL_UNITDIR)'#010+ ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
@ -1024,14 +1024,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ifdef INSTALLPPUFILES'#010+ 'ifdef INSTALLPPUFILES'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+ 'ifneq ($(INSTALLPPULI','NKFILES),)'#010+
' ',' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
'ifdef inUnix'#010+ 'ifdef inUnix'#010+
' ln -sf $(LIB_FULLNAME) $(INSTAL','L_LIBDIR)/$(LIB_NAME)'#010+ ' ln -sf $(LIB_FUL','LNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
@ -1041,15 +1041,15 @@ const fpcmakeini : array[0..125,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_sourceinstall: distclean'#010+ 'fpc_sourceinstall: distclean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010,
' $(COPYT','REE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
#010+ #010+
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
'ifdef HASEXAMPLES'#010+ 'ifdef HASEXAMPLES'#010+
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+ 'endif'#010+
'ifdef EXAMPLESOURCEFILES'#010+ 'ifdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_','EXAMPLEDIR)'#010+ ' $(COPY) $(EXAMPLESOURCEFI','LES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+ 'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
@ -1058,9 +1058,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
#010+ #010+
'[distinstallrules]'#010+ '[distinstallrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Dist Install'#010+ '# Dist',' Install'#010+
'######','##############################################################'+ '#####################################################################'#010+
'#'#010+
#010+ #010+
'.PHONY: fpc_distinstall'#010+ '.PHONY: fpc_distinstall'#010+
#010+ #010+
@ -1069,14 +1068,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
#010+ #010+
'[zipinstallrules]'#010+ '[zipinstallrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Zip'#010+ '# Zip',#010+
'##############','######################################################'+ '#####################################################################'#010+
'#'#010+
#010+ #010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+ #010+
'# Temporary path to pack a file, can only use a single deep'#010+ '# Temporary path to pack a file, can only use a single deep'#010+
'# subdir, because the deltree can'#039't see the whole tree t','o remove'+ '# subdir, because the deltree can'#039't see t','he whole tree to remove'+
#010+ #010+
'ifndef PACKDIR'#010+ 'ifndef PACKDIR'#010+
'ifndef inUnix'#010+ 'ifndef inUnix'#010+
@ -1091,7 +1089,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ifdef DIST_ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+
'else'#010+ 'else'#010+
'ZIPNAME=$(ZIPPREFIX)','$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'ZIPNA','ME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1108,10 +1106,10 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ifndef USEZIP'#010+ 'ifndef USEZIP'#010+
'ifdef inUnix'#010+ 'ifdef inUnix'#010+
'USETAR=1'#010+ 'USETAR=1'#010+
'endif'#010+ 'endi','f'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Use ','a wrapper script by default for Os/2'#010+ '# Use a wrapper script by default for Os/2'#010+
'ifndef inUnix'#010+ 'ifndef inUnix'#010+
'USEZIPWRAPPER=1'#010+ 'USEZIPWRAPPER=1'#010+
'endif'#010+ 'endif'#010+
@ -1120,7 +1118,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'# the path separator'#010+ '# the path separator'#010+
'ifdef USEZIPWRAPPER'#010+ 'ifdef USEZIPWRAPPER'#010+
'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fp','czip$(BATCHEXT))'#010+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(D','IST_DESTDIR)/fpczip$(BATCHEXT))'#010+
'else'#010+ 'else'#010+
'ZIPPATHSEP=/'#010+ 'ZIPPATHSEP=/'#010+
'endif'#010+ 'endif'#010+
@ -1129,7 +1127,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010+ 'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(Z','IPNAME)$(TAREXT)'#010+ 'ZIPDESTFILE:=$(DI','ST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
'else'#010+ 'else'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
@ -1137,13 +1135,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
'TFILE) *'#010+ 'TFILE) *'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_zipinstall:'#010+ 'fpc_zipinstall:'#010,
' $(MAKE)',' $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
' $(DEL) $(ZIPDESTFILE)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+ 'ifdef USEZIPWRAPPER'#010+
'# Handle gecho separate as we need to espace \ with \\'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+
'ifneq ($(ECHOREDIR),echo)'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))"',' > $(ZIPWRAP'+ ' $(ECHOREDIR) -e "$(subst \,\\,$(Z','IPCMD_CDPACK))" > $(ZIPWRAP'+
'PER)'#010+ 'PER)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
#010+ #010+
@ -1151,7 +1149,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ER)'#010+ 'ER)'#010+
'else'#010+ 'else'#010+
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_ZIP) ','>> $(ZIPWRAPPER)'#010+ ' echo',' $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
'endif'#010+ 'endif'#010+
'ifdef inUnix'#010+ 'ifdef inUnix'#010+
@ -1161,7 +1159,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'endif'#010+ 'endif'#010+
' $(DEL) $(ZIPWRAPPER)'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+
'else'#010+ 'else'#010+
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010, ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(','ZIPCMD_CDBASE)'#010+
'endif'#010+ 'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+ ' $(DELTREE) $(PACKDIR)'#010+
#010+ #010+
@ -1170,7 +1168,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
#010+ #010+
'fpc_zipexampleinstall:'#010+ 'fpc_zipexampleinstall:'#010+
'ifdef HASEXAMPLES'#010+ 'ifdef HASEXAMPLES'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010, ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall',' ZIPSUFFIX=ex'+
'm'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_zipdistinstall:'#010+ 'fpc_zipdistinstall:'#010+
@ -1180,7 +1179,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'[cleanrules]'#010+ '[cleanrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Clean rules'#010+ '# Clean rules'#010+
'#############################################################','#######'+ '##############################################','######################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
@ -1191,14 +1190,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef CLEAN_UNITS'#010+ 'ifdef CLEAN_UNITS'#010+
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UN','ITS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'if','def CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
'LEANPPUFILES)))'#010+ 'LEANPPUFILES)))'#010+
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN','PP'+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIR','PREFIX),$(CLEANPP'+
'UFILES))'#010+ 'UFILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
'IX),$(CLEANPPULINKFILES)))'#010+ 'IX),$(CLEANPPULINKFILES)))'#010+
@ -1209,7 +1208,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
' -$(DEL) $(CLEANEXEFILES)'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CL','EANPPUFILES)'#010+ ' ',' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+
@ -1218,8 +1217,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEAN_FILES'#010+ 'ifdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+ ' -$(DEL) $(CL','EAN_FILES)'#010+
'endi','f'#010+ 'endif'#010+
'ifdef LIB_NAME'#010+ 'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif'#010+ 'endif'#010+
@ -1228,7 +1227,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
#010+ #010+
'fpc_distclean: clean'#010+ 'fpc_distclean: clean'#010+
#010+ #010+
'# Also run clean first if targetdir is set. Unittargetdir is always',#010+ '# Also run clean first if targetdir is set. Unittarg','etdir is always'#010+
'# set if targetdir or unittargetdir is specified'#010+ '# set if targetdir or unittargetdir is specified'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+
'TARGETDIRCLEAN=fpc_clean'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+
@ -1238,17 +1237,17 @@ const fpcmakeini : array[0..125,1..240] of char=(
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+ 'endif'#010+
' -$(DEL) *$(OEXT',') *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ ' ','-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+
'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
#010+ #010+
'ifdef AOUTEXT'#010+ 'ifdef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+ ' -$(DEL) *$(AOUTEXT)',#010+
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[infor','ules]'#010+ '[inforules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Info rules'#010+ '# Info rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -1257,76 +1256,76 @@ const fpcmakeini : array[0..125,1..240] of char=(
#010+ #010+
'fpc_info:'#010+ 'fpc_info:'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Package info =','='#010+ ' @$(ECHO) ==',' Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010,
' @$(ECHO',') FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
' @$(ECHO)'#010+ ' @$(','ECHO)'#010+
' @','$(ECHO) == Directory info =='#010+ ' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PAC','KAGESDIR)'#010+
' ',' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+ ' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Pwd....... $(PWD)'#010+ ' @$(ECHO) Pwd....... $(PWD)'#010+
' @$(ECHO) Mv.....','... $(MVPROG)'#010+ ' @$','(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FP','CMAKE)'#010+ ' @$(ECHO) ','FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+ ' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Target Loaders...... $(TA','RGET_LOADERS)'#010+ ' @$(ECHO) Target Loa','ders...... $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+
' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples..... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target Examples..... $(TAR','GET_EXAMPLES)'#010+
' ',' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install Units.......',' $(INSTALL_UNITS)'#010+ ' @$(ECHO) Insta','ll Units....... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+ ' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipPrefix............ $(ZI','PPREFIX)'#010+ ' @$(ECHO) ZipPrefix..','.......... $(ZIPPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
' @$(ECHO) Install binary dir... ','$(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install',' binary dir... $(INSTALL_BINDIR)'#010+
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO) Install doc dir...... $(IN','STALL_DOCDIR)'#010+ ' @$(ECHO) Install doc',' dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name.','....... $(DIST_ZIPNAME)'#010+ ' @$(ECHO) ',' Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[localmakefile]'#010+ '[localmakefile]'#010+
@ -1334,7 +1333,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
'# Local Makefile'#010+ '# Local Makefile'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'ifneq ($(wildcard fpcmak','e.loc),)'#010+ 'ifneq ($(','wildcard fpcmake.loc),)'#010+
'include fpcmake.loc'#010+ 'include fpcmake.loc'#010+
'endif'#010+ 'endif'#010+
#010+ #010+

2
utils/fpcm/fpcmake.ini
View File

@ -974,7 +974,7 @@ ifdef FPCMAKE
# a safety check is done if Makefile.fpc is available # a safety check is done if Makefile.fpc is available
ifdef PACKAGE_VERSION ifdef PACKAGE_VERSION
ifneq ($(wildcard Makefile.fpc),) ifneq ($(wildcard Makefile.fpc),)
$(FPCMAKE) -p Makefile.fpc $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) Package.fpc $(INSTALL_UNITDIR) $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
endif endif

80
utils/fpcm/fpcmake.pp
View File

@ -16,6 +16,9 @@
{$H+} {$H+}
program fpcmake; program fpcmake;
{ Define to not catch exceptions and output backtraces }
{ define NOEXCEPT}
uses uses
getopts, getopts,
sysutils, sysutils,
@ -33,8 +36,9 @@ program fpcmake;
end; end;
var var
Mode : TMode; ParaMode : TMode;
VerboseLevel : TVerboseLevel; ParaVerboseLevel : TVerboseLevel;
ParaTargets : string;
{***************************************************************************** {*****************************************************************************
@ -43,7 +47,7 @@ program fpcmake;
procedure Show(lvl:TVerboseLevel;const s:string); procedure Show(lvl:TVerboseLevel;const s:string);
begin begin
if VerboseLevel>=lvl then if ParaVerboseLevel>=lvl then
Writeln(s); Writeln(s);
end; end;
@ -88,9 +92,13 @@ program fpcmake;
begin begin
Show(V_Default,'Processing '+fn); Show(V_Default,'Processing '+fn);
CurrFPCMake:=nil; CurrFPCMake:=nil;
// try {$ifndef NOEXCEPT}
try
{$endif NOEXCEPT}
{ Load Makefile.fpc } { Load Makefile.fpc }
CurrFPCMake:=TFPCMakeConsole.Create(fn); CurrFPCMake:=TFPCMakeConsole.Create(fn);
if ParaTargets<>'' then
CurrFPCMake.SetTargets(ParaTargets);
CurrFPCMake.LoadMakefileFPC; CurrFPCMake.LoadMakefileFPC;
// CurrFPCMake.Print; // CurrFPCMake.Print;
@ -105,13 +113,17 @@ program fpcmake;
CurrMakefile.WriteGenericMakefile; CurrMakefile.WriteGenericMakefile;
CurrMakefile.Free; CurrMakefile.Free;
// except {$ifndef NOEXCEPT}
// on e : exception do except
// begin on e : exception do
// Error(e.message); begin
// Subdirs:=''; Error(e.message);
// end; {$ifdef SUBDIRS}
// end; Subdirs:='';
{$endif SUBDIRS}
end;
end;
{$endif NOEXCEPT}
CurrFPCMake.Free; CurrFPCMake.Free;
{$ifdef SUBDIRS} {$ifdef SUBDIRS}
@ -138,9 +150,13 @@ program fpcmake;
begin begin
Show(V_Default,'Processing '+fn); Show(V_Default,'Processing '+fn);
CurrFPCMake:=nil; CurrFPCMake:=nil;
// try {$ifndef NOEXCEPT}
try
{$endif NOEXCEPT}
{ Load Makefile.fpc } { Load Makefile.fpc }
CurrFPCMake:=TFPCMakeConsole.Create(fn); CurrFPCMake:=TFPCMakeConsole.Create(fn);
if ParaTargets<>'' then
CurrFPCMake.SetTargets(ParaTargets);
CurrFPCMake.LoadMakefileFPC; CurrFPCMake.LoadMakefileFPC;
// CurrFPCMake.Print; // CurrFPCMake.Print;
@ -149,20 +165,21 @@ program fpcmake;
CurrPackageFpc.WritePackageFpc; CurrPackageFpc.WritePackageFpc;
CurrPackageFpc.Free; CurrPackageFpc.Free;
// except {$ifndef NOEXCEPT}
// on e : exception do except
// begin on e : exception do
// Error(e.message); begin
// Subdirs:=''; Error(e.message);
// end; end;
// end; end;
{$endif NOEXCEPT}
CurrFPCMake.Free; CurrFPCMake.Free;
end; end;
procedure ProcessFile(const fn:string); procedure ProcessFile(const fn:string);
begin begin
case Mode of case ParaMode of
m_None : m_None :
Error('No operation specified, see -h for help'); Error('No operation specified, see -h for help');
m_Makefile : m_Makefile :
@ -205,6 +222,7 @@ begin
writeln(' -w Write Makefile'); writeln(' -w Write Makefile');
writeln(''); writeln('');
writeln('Options:'); writeln('Options:');
writeln(' -T<target>[,target] Support only specified targets');
writeln(' -v Be more verbose'); writeln(' -v Be more verbose');
writeln(' -q Be quiet'); writeln(' -q Be quiet');
writeln(' -h This help screen'); writeln(' -h This help screen');
@ -218,23 +236,24 @@ Procedure ProcessOpts;
Process command line opions, and checks if command line options OK. Process command line opions, and checks if command line options OK.
} }
const const
ShortOpts = 'pwqvh'; ShortOpts = 'pwqvhT:';
var var
C : char; C : char;
begin begin
if paramcount=0 then if paramcount=0 then
usage; usage;
{ Reset } { Reset }
Mode:=m_none; ParaMode:=m_none;
VerboseLevel:=v_default; ParaVerboseLevel:=v_default;
repeat repeat
c:=Getopt (ShortOpts); c:=Getopt (ShortOpts);
Case C of Case C of
EndOfOptions : break; EndOfOptions : break;
'p' : Mode:=m_PackageFpc; 'p' : ParaMode:=m_PackageFpc;
'w' : Mode:=m_Makefile; 'w' : ParaMode:=m_Makefile;
'q' : VerboseLevel:=v_quiet; 'q' : ParaVerboseLevel:=v_quiet;
'v' : VerboseLevel:=v_verbose; 'v' : ParaVerboseLevel:=v_verbose;
'T' : ParaTargets:=OptArg;
'?' : Usage; '?' : Usage;
'h' : Usage; 'h' : Usage;
end; end;
@ -251,7 +270,12 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.5 2001-07-13 21:01:59 peter Revision 1.6 2001-08-02 20:50:29 peter
* -T<target> support
* better error reporting for not found dirs
* some cleanups and nicer strings
Revision 1.5 2001/07/13 21:01:59 peter
* cygdrive support * cygdrive support
* fixed cygwin detection * fixed cygwin detection
* fixed some duplicate and extraeous spaces * fixed some duplicate and extraeous spaces

147
utils/fpcm/fpcmmain.pp
View File

@ -30,8 +30,8 @@ interface
fpcmdic; fpcmdic;
const const
Version='v1.99.0'; Version='1.1';
Title='fpcmake '+Version; Title='FPCMake Version '+Version;
TitleDate=Title+' ['+{$ifdef fpc}{$i %DATE}{$else}'n/a'{$endif}+']'; TitleDate=Title+' ['+{$ifdef fpc}{$i %DATE}{$else}'n/a'{$endif}+']';
type type
@ -107,7 +107,8 @@ interface
FExportSec : TFPCMakeSection; FExportSec : TFPCMakeSection;
FIsPackage : boolean; FIsPackage : boolean;
FPackageName, FPackageName,
FPackageVersion : string; FPackageVersion,
FPackageTargets : string;
FRequireList : TTargetRequireList; FRequireList : TTargetRequireList;
FVariables : TKeyValue; FVariables : TKeyValue;
FIncludeTargets : TTargetSet; FIncludeTargets : TTargetSet;
@ -127,6 +128,7 @@ interface
constructor CreateFromStream(s:TStream;const AFileName:string); constructor CreateFromStream(s:TStream;const AFileName:string);
destructor Destroy;override; destructor Destroy;override;
procedure Verbose(lvl:TFPCMakeVerbose;const s:string);virtual; procedure Verbose(lvl:TFPCMakeVerbose;const s:string);virtual;
procedure SetTargets(const s:string);
procedure LoadSections; procedure LoadSections;
procedure LoadMakefileFPC; procedure LoadMakefileFPC;
procedure LoadPackageSection; procedure LoadPackageSection;
@ -153,7 +155,8 @@ interface
end; end;
function posidx(const substr,s : string;idx:integer):integer; function posidx(const substr,s : string;idx:integer):integer;
function GetToken(var s:string):string; function GetToken(var s:string;sep:char):string;
procedure AddToken(var s:string;const tok:string;sep:char);
implementation implementation
@ -167,6 +170,15 @@ implementation
s_no_package_name='No package name set'; s_no_package_name='No package name set';
s_no_package_version='No package version set'; s_no_package_version='No package version set';
s_err_require_format='Wrong require format "%s"'; s_err_require_format='Wrong require format "%s"';
s_wrong_package_name='Package name "%s" expected, but "%s" found';
s_wrong_package_version='Package version "%s" expected, but version "%s" found';
s_directory_not_found='Directory "%s" not found';
s_makefilefpc_not_found='No Makefile.fpc found in directory "%s"';
s_package_not_found='Package "%s" not found';
s_fpcmake_version_required='FPCMake version "%s" is required';
s_no_targets_set='No targets set';
s_targets_info='Targets: "%s"';
s_globals='Globals:';
{**************************************************************************** {****************************************************************************
@ -218,12 +230,12 @@ implementation
end; end;
function GetToken(var s:string):string; function GetToken(var s:string;sep:char):string;
var var
i : integer; i : integer;
begin begin
s:=Trim(s); s:=Trim(s);
i:=pos(' ',s); i:=pos(sep,s);
if i=0 then if i=0 then
begin begin
Result:=s; Result:=s;
@ -237,6 +249,17 @@ implementation
end; end;
procedure AddToken(var s:string;const tok:string;sep:char);
begin
if tok='' then
exit;
if s<>'' then
s:=s+sep+tok
else
s:=tok;
end;
{**************************************************************************** {****************************************************************************
TKeyValueItem TKeyValueItem
****************************************************************************} ****************************************************************************}
@ -390,10 +413,7 @@ implementation
p:=TKeyValueItem(FDictionary.Search(NewKey)); p:=TKeyValueItem(FDictionary.Search(NewKey));
{ Concat values if key already exists } { Concat values if key already exists }
if assigned(p) then if assigned(p) then
begin AddToken(p.FValue,Value,' ')
if Value<>'' then
p.Value:=p.Value+' '+Value
end
else else
FDictionary.Add(NewKey,Value); FDictionary.Add(NewKey,Value);
inc(i); inc(i);
@ -579,9 +599,39 @@ implementation
end; end;
procedure TFPCMake.SetTargets(const s:string);
var
hslst : string;
hs : string;
t : TTarget;
begin
FIncludeTargets:=[];
hslst:=s;
repeat
hs:=LowerCase(GetToken(hslst,','));
if hs='' then
break;
for t:=low(TTarget) to high(TTarget) do
if hs=TargetStr[t] then
include(FIncludeTargets,t);
until false;
if FIncludeTargets=[] then
raise Exception.Create(s_no_targets_set)
else
begin
hs:='';
for t:=low(TTarget) to high(TTarget) do
if t in FIncludeTargets then
AddToken(hs,TargetStr[t],' ');
Verbose(FPCMakeDebug,Format(s_targets_info,[hs]));
end;
end;
procedure TFPCMake.LoadPackageSection; procedure TFPCMake.LoadPackageSection;
var var
s : string; hs,s : string;
t : TTarget;
begin begin
{ Get package info from package section } { Get package info from package section }
FPackageSec:=TFPCMakeSection(FSections['package']); FPackageSec:=TFPCMakeSection(FSections['package']);
@ -607,6 +657,20 @@ implementation
if FPackageVersion='' then if FPackageVersion='' then
Raise Exception.Create(s_no_package_version); Raise Exception.Create(s_no_package_version);
FIsPackage:=true; FIsPackage:=true;
{ optional targets }
FPackageTargets:='';
s:=LowerCase(FPackageSec['targets']);
repeat
hs:=GetToken(s,' ');
if hs='' then
break;
for t:=low(TTarget) to high(TTarget) do
if hs=TargetStr[t] then
begin
AddToken(FPackageTargets,hs,' ');
break;
end;
until false;
{ Set the ExportSec } { Set the ExportSec }
FExportSec:=TFPCMakeSection(FSections[Lowercase(FPackageName)]); FExportSec:=TFPCMakeSection(FSections[Lowercase(FPackageName)]);
end; end;
@ -653,9 +717,9 @@ implementation
ReqFPCMake.LoadPackageSection; ReqFPCMake.LoadPackageSection;
{ Check package name and version } { Check package name and version }
if LowerCase(ReqFPCMake.PackageName)<>ReqName then if LowerCase(ReqFPCMake.PackageName)<>ReqName then
raise Exception.Create('s_wrong_package_name'); raise Exception.Create(Format(s_wrong_package_name,[ReqName,LowerCase(ReqFPCMake.PackageName)]));
if (ReqVersion<>'') and (ReqFPCMake.PackageVersion<ReqVersion) then if (ReqVersion<>'') and (ReqFPCMake.PackageVersion<ReqVersion) then
raise Exception.Create('s_wrong_package_version'); raise Exception.Create(Format(s_wrong_package_version,[ReqVersion,ReqFPCMake.PackageVersion]));
{ First load the requirements of this package } { First load the requirements of this package }
LoadRequires(t,ReqFPCMake); LoadRequires(t,ReqFPCMake);
{ Get a copy of the package section } { Get a copy of the package section }
@ -684,7 +748,7 @@ implementation
s:=SubstVariables('$(wildcard $(addsuffix /'+ReqName+'/Package.fpc,$(FPCDIR)) $(addsuffix /'+ReqName+'/Package.fpc,$(UNITSDIR)) $(addsuffix /'+ReqName+'/Package.fpc,$(REQUIRE_UNITSDIR)))'); s:=SubstVariables('$(wildcard $(addsuffix /'+ReqName+'/Package.fpc,$(FPCDIR)) $(addsuffix /'+ReqName+'/Package.fpc,$(UNITSDIR)) $(addsuffix /'+ReqName+'/Package.fpc,$(REQUIRE_UNITSDIR)))');
if TryFile(s) then if TryFile(s) then
exit; exit;
Raise Exception.Create('s_package_not_found '+Reqname); Raise Exception.Create(Format(s_package_not_found,[Reqname]));
end; end;
@ -694,9 +758,16 @@ implementation
s : string; s : string;
begin begin
VerboseIdent:=VerboseIdent+' '; VerboseIdent:=VerboseIdent+' ';
Verbose(FPCMakeDebug,'Subdir: '+currdir+subdir+'/Makefile.fpc'); s:=currdir+subdir;
if not FileExists(currdir+subdir+'/Makefile.fpc') then Verbose(FPCMakeDebug,'Subdir: '+s+'/Makefile.fpc');
Raise Exception.Create('s_no_makefile.fpc_found'); if not FileExists(s+'/Makefile.fpc') then
begin
{ give better error what is wrong }
if not PathExists(s) then
Raise Exception.Create(Format(s_directory_not_found,[s]))
else
Raise Exception.Create(Format(s_makefilefpc_not_found,[s]));
end;
{ Process Makefile.fpc } { Process Makefile.fpc }
ReqFPCMake:=TFPCMake.Create(currdir+subdir+'/Makefile.fpc'); ReqFPCMake:=TFPCMake.Create(currdir+subdir+'/Makefile.fpc');
ReqFPCMake.LoadSections; ReqFPCMake.LoadSections;
@ -733,7 +804,7 @@ implementation
s:=Trim(FromFPCMake.GetVariable('require_packages',true)+' '+FromFPCMake.GetVariable('require_packages'+TargetSuffix[t],true)); s:=Trim(FromFPCMake.GetVariable('require_packages',true)+' '+FromFPCMake.GetVariable('require_packages'+TargetSuffix[t],true));
Verbose(FPCMakeDebug,'Required packages for '+TargetStr[t]+': '+s); Verbose(FPCMakeDebug,'Required packages for '+TargetStr[t]+': '+s);
repeat repeat
reqname:=GetToken(s); reqname:=GetToken(s,' ');
if reqname='' then if reqname='' then
break; break;
i:=Pos('(',ReqName); i:=Pos('(',ReqName);
@ -760,7 +831,7 @@ implementation
s:=FromFPCMake.GetVariable('target_dirs',true)+' '+FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t],true); s:=FromFPCMake.GetVariable('target_dirs',true)+' '+FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t],true);
Verbose(FPCMakeDebug,'Required dirs for '+TargetStr[t]+': '+s); Verbose(FPCMakeDebug,'Required dirs for '+TargetStr[t]+': '+s);
repeat repeat
reqdir:=GetToken(s); reqdir:=GetToken(s,' ');
if reqdir='' then if reqdir='' then
break; break;
LoadRequiredDir(t,FromFPCMake.FPackageName,ExtractFilePath(FromFPCMake.FFileName),ReqDir) LoadRequiredDir(t,FromFPCMake.FPackageName,ExtractFilePath(FromFPCMake.FFileName),ReqDir)
@ -795,6 +866,10 @@ implementation
s : string; s : string;
t : ttarget; t : ttarget;
begin begin
{ Check FPCMake version }
s:=GetVariable('require_fpcmake',false);
if (s>version) then
raise Exception.Create(Format(s_fpcmake_version_required,[s]));
{ Maybe add an implicit rtl dependency if there is something { Maybe add an implicit rtl dependency if there is something
to compile } to compile }
s:=GetVariable('require_packages',false); s:=GetVariable('require_packages',false);
@ -828,7 +903,7 @@ implementation
begin begin
s:=Sec['packages']+' '+Sec['packages'+TargetSuffix[t]]; s:=Sec['packages']+' '+Sec['packages'+TargetSuffix[t]];
repeat repeat
ReqName:=GetToken(s); ReqName:=GetToken(s,' ');
if ReqName='' then if ReqName='' then
break; break;
i:=Pos('(',ReqName); i:=Pos('(',ReqName);
@ -852,7 +927,6 @@ implementation
ReqSec:=TFPCMakeSection(FSections['require']); ReqSec:=TFPCMakeSection(FSections['require']);
if assigned(ReqSec) then if assigned(ReqSec) then
AddReqSec(t,ReqSec); AddReqSec(t,ReqSec);
Verbose(FPCMakeInfo,TargetStr[t]+' requires: '+ReqList.CommaText);
GetTargetRequires:=ReqList; GetTargetRequires:=ReqList;
end; end;
@ -908,8 +982,17 @@ implementation
if hs='' then if hs='' then
begin begin
s:=GetVariable('default_fpcdir',true); s:=GetVariable('default_fpcdir',true);
{ add the current subdir to relative paths }
if s<>'' then if s<>'' then
begin
{$ifdef UNIX}
if (s[1]<>'/') then
{$else}
if (length(s)>2) and (s[2]<>':') then
{$endif}
s:=ExtractFilePath(FFileName)+s;
hs:=SubstVariables('$(wildcard $(addprefix '+s+'/,rtl units))'); hs:=SubstVariables('$(wildcard $(addprefix '+s+'/,rtl units))');
end
end; end;
{ OS defaults } { OS defaults }
if hs='' then if hs='' then
@ -962,7 +1045,7 @@ implementation
if GetVariable('UNITSDIR',false)='' then if GetVariable('UNITSDIR',false)='' then
SetVariable('UNITSDIR','$(FPCDIR)/units/$(TARGET)',false); SetVariable('UNITSDIR','$(FPCDIR)/units/$(TARGET)',false);
Verbose(FPCMakeDebug,'Globals:'); Verbose(FPCMakeDebug,s_globals);
Variables.Foreach(@PrintDic); Variables.Foreach(@PrintDic);
end; end;
@ -1021,7 +1104,7 @@ implementation
Expect(s,')'); Expect(s,')');
first:=true; first:=true;
repeat repeat
tok:=GetToken(s1); tok:=GetToken(s1,' ');
if tok='' then if tok='' then
break; break;
if PathOrFileExists(tok) then if PathOrFileExists(tok) then
@ -1046,7 +1129,7 @@ implementation
end; end;
first:=true; first:=true;
repeat repeat
tok:=GetToken(s2); tok:=GetToken(s2,' ');
if tok='' then if tok='' then
break; break;
if not first then if not first then
@ -1068,7 +1151,7 @@ implementation
end; end;
first:=true; first:=true;
repeat repeat
tok:=GetToken(s2); tok:=GetToken(s2,' ');
if tok='' then if tok='' then
break; break;
if not first then if not first then
@ -1160,11 +1243,8 @@ implementation
p:=TKeyValueItem(Sec.Dictionary.Search(Key)); p:=TKeyValueItem(Sec.Dictionary.Search(Key));
if assigned(p) then if assigned(p) then
begin begin
if Add and (p.Value<>'') then if Add then
begin AddToken(p.FValue,Value,' ')
if Value<>'' then
p.Value:=p.Value+' '+Value;
end
else else
p.Value:=Value; p.Value:=Value;
end end
@ -1234,7 +1314,12 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.10 2001-07-31 22:02:32 peter Revision 1.11 2001-08-02 20:50:29 peter
* -T<target> support
* better error reporting for not found dirs
* some cleanups and nicer strings
Revision 1.10 2001/07/31 22:02:32 peter
* install Package.fpc * install Package.fpc
Revision 1.9 2001/07/24 09:06:40 pierre Revision 1.9 2001/07/24 09:06:40 pierre

30
utils/fpcm/fpcmwr.pp
View File

@ -323,7 +323,8 @@ implementation
exit; exit;
end; end;
for t:=low(TTarget) to high(TTarget) do for t:=low(TTarget) to high(TTarget) do
if FInput.GetVariable(IniVar+TargetSuffix[t],false)<>'' then if (t in FInput.IncludeTargets) and
(FInput.GetVariable(IniVar+TargetSuffix[t],false)<>'') then
begin begin
result:=true; result:=true;
exit; exit;
@ -346,6 +347,7 @@ implementation
if s<>'' then if s<>'' then
FOutput.Add('override '+FixVariable(IniVar)+'+='+s); FOutput.Add('override '+FixVariable(IniVar)+'+='+s);
for t:=low(TTarget) to high(TTarget) do for t:=low(TTarget) to high(TTarget) do
if t in FInput.IncludeTargets then
begin begin
s:=FInput.GetVariable(IniVar+TargetSuffix[t],false); s:=FInput.GetVariable(IniVar+TargetSuffix[t],false);
if s<>'' then if s<>'' then
@ -378,7 +380,7 @@ implementation
result:=''; result:='';
s:=FInput.GetVariable(IniVar,false); s:=FInput.GetVariable(IniVar,false);
repeat repeat
name:=GetToken(s); name:=GetToken(s,' ');
if Name='' then if Name='' then
break; break;
{ Remove (..) } { Remove (..) }
@ -395,13 +397,14 @@ implementation
AddStrNoDup(result,name); AddStrNoDup(result,name);
until false; until false;
for t:=low(TTarget) to high(TTarget) do for t:=low(TTarget) to high(TTarget) do
if t in FInput.IncludeTargets then
begin begin
s:=FInput.GetVariable(IniVar+TargetSuffix[t],false); s:=FInput.GetVariable(IniVar+TargetSuffix[t],false);
if s<>'' then if s<>'' then
begin begin
FOutput.Add('ifeq ($(OS_TARGET),'+TargetStr[t]+')'); FOutput.Add('ifeq ($(OS_TARGET),'+TargetStr[t]+')');
repeat repeat
Name:=GetToken(s); Name:=GetToken(s,' ');
if Name='' then if Name='' then
break; break;
{ Remove (..) } { Remove (..) }
@ -457,7 +460,7 @@ implementation
begin begin
hs:=FInput.GetVariable(inivar,false); hs:=FInput.GetVariable(inivar,false);
repeat repeat
Tool:=GetToken(hs); Tool:=GetToken(hs,' ');
if Tool='' then if Tool='' then
break; break;
AddTool(FixVariable(Tool),Tool,''); AddTool(FixVariable(Tool),Tool,'');
@ -566,7 +569,7 @@ implementation
prefix:=FixVariable(inivar)+'_'; prefix:=FixVariable(inivar)+'_';
hs:=AddTargetDefines(inivar,prefix); hs:=AddTargetDefines(inivar,prefix);
repeat repeat
Dir:=GetToken(hs); Dir:=GetToken(hs,' ');
if Dir='' then if Dir='' then
break; break;
AddTargetDir(Dir,prefix); AddTargetDir(Dir,prefix);
@ -629,8 +632,11 @@ implementation
reqs:=''; reqs:='';
{ Add target defines } { Add target defines }
for t:=low(ttarget) to high(ttarget) do for t:=low(ttarget) to high(ttarget) do
if t in FInput.IncludeTargets then
begin begin
sl:=FInput.GetTargetRequires(t); sl:=FInput.GetTargetRequires(t);
{ show info }
FInput.Verbose(FPCMakeInfo,TargetStr[t]+' requires: '+sl.CommaText);
if sl.count>0 then if sl.count>0 then
begin begin
FOutput.Add('ifeq ($(OS_TARGET),'+TargetStr[t]+')'); FOutput.Add('ifeq ($(OS_TARGET),'+TargetStr[t]+')');
@ -645,7 +651,7 @@ implementation
end; end;
{ Add all require packages } { Add all require packages }
repeat repeat
req:=GetToken(reqs); req:=GetToken(reqs,' ');
if Req='' then if Req='' then
break; break;
AddPackage(req,prefix); AddPackage(req,prefix);
@ -716,8 +722,10 @@ implementation
(not CheckTargetVariable('install_files')) and (not CheckTargetVariable('install_files')) and
(not CheckTargetVariable('install_createpackagefpc')) then (not CheckTargetVariable('install_createpackagefpc')) then
FHasSection[sec_install]:=false; FHasSection[sec_install]:=false;
{ Package.fpc also needs to be cleaned }
if (not CheckTargetVariable('clean_units')) and if (not CheckTargetVariable('clean_units')) and
(not CheckTargetVariable('clean_files')) then (not CheckTargetVariable('clean_files')) and
(not CheckTargetVariable('install_createpackagefpc')) then
FHasSection[sec_clean]:=false; FHasSection[sec_clean]:=false;
end; end;
end; end;
@ -763,6 +771,7 @@ implementation
{ Package } { Package }
AddVariable('package_name'); AddVariable('package_name');
AddVariable('package_version'); AddVariable('package_version');
AddVariable('package_targets');
{ First add the required packages sections } { First add the required packages sections }
// for i:=0 to FInput.RequireList.Count-1 do // for i:=0 to FInput.RequireList.Count-1 do
// AddCustomSection(FInput.Requirelist[i]); // AddCustomSection(FInput.Requirelist[i]);
@ -865,7 +874,12 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.14 2001-07-31 22:02:32 peter Revision 1.15 2001-08-02 20:50:29 peter
* -T<target> support
* better error reporting for not found dirs
* some cleanups and nicer strings
Revision 1.14 2001/07/31 22:02:32 peter
* install Package.fpc * install Package.fpc
Revision 1.13 2001/07/13 21:01:59 peter Revision 1.13 2001/07/13 21:01:59 peter