Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/packages/bin Makefile.mak,1.48,1.49 build.dpr,1.33,1.34 build.exe,1.32,1.33 mofiles.mak,1.4,1.5 - Improved makefiles
|
From: Andreas H. <ah...@us...> - 2005-09-17 11:17:03
|
Update of /cvsroot/jvcl/dev/JVCL3/packages/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9307/packages/bin Modified Files: Makefile.mak build.dpr build.exe mofiles.mak Log Message: Improved makefiles Index: mofiles.mak =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/mofiles.mak,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mofiles.mak 29 Sep 2004 20:58:45 -0000 1.4 --- mofiles.mak 17 Sep 2005 11:16:48 -0000 1.5 *************** *** 7,10 **** --- 7,12 ---- !endif + MOFILES = *JVCLInstall.mo *jvcl.mo + MAKE = "$(ROOT)\bin\make.exe" -l+ *************** *** 15,69 **** #------------------------------------------------------------------------------- ! default: $(LANGUAGES) ! bg: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! de: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! es: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! fr: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! it: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! nl: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! pl: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! ro: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! ru: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL ! sv: ! echo Generating: $& ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\JVCLInstall.mo $&\LC_MESSAGES\JVCLInstall.po >NUL ! "$(DXGETTEXTDIR)\msgfmt" -o $&\LC_MESSAGES\jvcl.mo $&\LC_MESSAGES\jvcl.po >NUL --- 17,47 ---- #------------------------------------------------------------------------------- ! .suffixes .po + .po.mo: + @echo Generating: $< + @"$(DXGETTEXTDIR)\msgfmt" -o "$@" "$<" >NUL + + #------------------------------------------------------------------------------- ! default: $(LANGUAGES) ! bg: $(MOFILES:*=bg\LC_MESSAGES\) ! de: $(MOFILES:*=de\LC_MESSAGES\) ! es: $(MOFILES:*=es\LC_MESSAGES\) ! fr: $(MOFILES:*=fr\LC_MESSAGES\) ! it: $(MOFILES:*=it\LC_MESSAGES\) ! nl: $(MOFILES:*=nl\LC_MESSAGES\) ! pl: $(MOFILES:*=pl\LC_MESSAGES\) ! ro: $(MOFILES:*=ro\LC_MESSAGES\) ! ru: $(MOFILES:*=ru\LC_MESSAGES\) + sv: $(MOFILES:*=sv\LC_MESSAGES\) Index: build.exe =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.exe,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 Binary files /tmp/cvsBLvlB9 and /tmp/cvs3U0oMd differ Index: build.dpr =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.dpr,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** build.dpr 19 Apr 2005 22:24:34 -0000 1.33 --- build.dpr 17 Sep 2005 11:16:48 -0000 1.34 *************** *** 27,30 **** --- 27,31 ---- {$APPTYPE CONSOLE} + {.$DEFINE JVCL} { build.exe setups the environment for a Delphi compiler } *************** *** 855,859 **** AddAllEditions(True); WriteLn('build.exe setups the environment for the given targets and executes the'); ! WriteLn('make file that does the required actions.'); WriteLn; WriteLn('build.exe [TARGET] [OPTIONS]'); --- 856,860 ---- AddAllEditions(True); WriteLn('build.exe setups the environment for the given targets and executes the'); ! WriteLn('makefile that does the required actions.'); WriteLn; WriteLn('build.exe [TARGET] [OPTIONS]'); *************** *** 1017,1020 **** --- 1018,1022 ---- if not FileExists(Edition.RootDir + '\bin\dcc32.cfg') then begin + // Invalid Delphi/BCB installation or someone deleted the dcc32.cfg file. {$I-} Rewrite(f); *************** *** 1092,1096 **** begin LibraryRootDir := GetLibraryRootDir; - // ahuser (2005-01-22): make.exe fails if a path with spaces is in the PATH envvar // set ExtraOptions default values --- 1094,1097 ---- *************** *** 1174,1209 **** Path := Path + ';' + ExtractShortPathName(Edition.BplDir); - (* dcc32cfg := CreateDcc32Cfg([ - '-Q', - '-U"' + Edition.RootDir + '\Lib"', - '-U"' + Edition.RootDir + '\Lib\Obj"', - '-R"' + Edition.RootDir + '\Lib"', - '-I"' + Edition.RootDir + '\Include"', - '-I"' + Edition.RootDir + '\Include\Vcl"', - '-U"' + UserDcpDir + '"', - '-U"' + UserLibDir + '"' - ]); - - '-I"$(JCLINCLUDEDIRS)">>"$(CFG)" - @echo -U"$(JCLSOURCEDIRS1)">>"$(CFG)" - @echo -U"$(JCLSOURCEDIRS2)">>"$(CFG)" - # - @echo -I"$(JVCLINCLUDEDIRS)">>"$(CFG)" - @echo -U"$(UNITOUTDIR)">>"$(CFG)" - @echo -U"$(LIBDIR)">>"$(CFG)" - @echo -U"$(JVCLSOURCEDIRS1)">>"$(CFG)" - @echo -U"$(JVCLSOURCEDIRS2)">>"$(CFG)" - @echo -R"$(JVCLRESDIRS)">>"$(CFG)" - # - @echo -U"$(EXTRAUNITDIRS)">>"$(CFG)" - @echo -I"$(EXTRAINCLUDEDIRS)">>"$(CFG)" - @echo -R"$(EXTRARESDIRS)">>"$(CFG)" - # - @echo -U"$(UNITDIRS)">>"$(CFG)" - @echo -R"$(UNITDIRS)">>"$(CFG)" - *) - - //SetEnvironemntVariable('CFGFILE', PChar('..\$(PKGDIR)\dcc32.cfg'); - SetEnvironmentVariable('PATH', Pointer(Path)); --- 1175,1178 ---- Index: Makefile.mak =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/Makefile.mak,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Makefile.mak 22 Mar 2005 21:55:13 -0000 1.48 --- Makefile.mak 17 Sep 2005 11:16:48 -0000 1.49 *************** *** 150,181 **** -@IF EXIST "$(CFG)" del /q "$(CFG)" -@IF EXIST "$(ROOT)\bin\dcc32.cfg" type "$(ROOT)\bin\dcc32.cfg" >>"$(CFG)" ! @echo. >>"$(CFG)" ! @echo -Q>>"$(CFG)" ! @echo -U"$(ROOT)\Lib">>"$(CFG)" ! @echo -U"$(ROOT)\Lib\Obj">>"$(CFG)" ! @echo -R"$(ROOT)\Lib">>"$(CFG)" ! @echo -I"$(ROOT)\Include">>"$(CFG)" ! @echo -I"$(ROOT)\Include\Vcl">>"$(CFG)" ! @echo -U"$(DCPDIR)">>"$(CFG)" ! @echo -U"$(LIBDIR)">>"$(CFG)" ! # ! @echo -I"$(JCLINCLUDEDIRS)">>"$(CFG)" ! @echo -U"$(JCLSOURCEDIRS1)">>"$(CFG)" ! @echo -U"$(JCLSOURCEDIRS2)">>"$(CFG)" ! # ! @echo -I"$(JVCLINCLUDEDIRS)">>"$(CFG)" ! @echo -U"$(UNITOUTDIR)">>"$(CFG)" ! @echo -U"$(LIBDIR)">>"$(CFG)" ! @echo -U"$(JVCLSOURCEDIRS1)">>"$(CFG)" ! @echo -U"$(JVCLSOURCEDIRS2)">>"$(CFG)" ! @echo -R"$(JVCLRESDIRS)">>"$(CFG)" ! # ! @echo -U"$(EXTRAUNITDIRS)">>"$(CFG)" ! @echo -I"$(EXTRAINCLUDEDIRS)">>"$(CFG)" ! @echo -R"$(EXTRARESDIRS)">>"$(CFG)" ! # ! @echo -U"$(UNITDIRS)">>"$(CFG)" ! @echo -R"$(UNITDIRS)">>"$(CFG)" ################################################################################ --- 150,182 ---- -@IF EXIST "$(CFG)" del /q "$(CFG)" -@IF EXIST "$(ROOT)\bin\dcc32.cfg" type "$(ROOT)\bin\dcc32.cfg" >>"$(CFG)" ! @type &&| + -Q + -U"$(ROOT)\Lib" + -U"$(ROOT)\Lib\Obj" + -R"$(ROOT)\Lib" + -I"$(ROOT)\Include" + -I"$(ROOT)\Include\Vcl" + -U"$(DCPDIR)" + -U"$(LIBDIR)" + + -I"$(JCLINCLUDEDIRS)" + -U"$(JCLSOURCEDIRS1)" + -U"$(JCLSOURCEDIRS2)" + + -I"$(JVCLINCLUDEDIRS)" + -U"$(UNITOUTDIR)" + -U"$(LIBDIR)" + -U"$(JVCLSOURCEDIRS1)" + -U"$(JVCLSOURCEDIRS2)" + -R"$(JVCLRESDIRS)" + + -U"$(EXTRAUNITDIRS)" + -I"$(EXTRAINCLUDEDIRS)" + -R"$(EXTRARESDIRS)" + + -U"$(UNITDIRS)" + -R"$(UNITDIRS)" + | >>"$(CFG)" ################################################################################ *************** *** 183,196 **** @echo [Generating: Templates] @$(MAKE) $(QUIET) -f makefile.mak "-DCFG=$(CFGFILE)" configfile ! # ! @echo -LE"$(BPLDIR)">>"$(CFGFILE)" ! @echo -LN"$(DCPDIR)">>"$(CFGFILE)" ! @echo $(PERSONALEDITION_OPTION)>>"$(CFGFILE)" ! # ! @echo -N"$(UNITOUTDIR)">>"$(CFGFILE)" ! @echo -N1"$(HPPDIR)">>"$(CFGFILE)" ! @echo -N2"$(UNITOUTDIR)\obj">>"$(CFGFILE)" ! # ! # @IF NOT $(MASTEREDITION)! == ! @copy "$(CFGFILE)" "$(PKGDIR_MASTEREDITION)\$(CONFIGFILENAME)" --- 184,197 ---- @echo [Generating: Templates] @$(MAKE) $(QUIET) -f makefile.mak "-DCFG=$(CFGFILE)" configfile ! @type &&| ! ! -LE"$(BPLDIR)" ! -LN"$(DCPDIR)" ! (PERSONALEDITION_OPTION) ! ! -N"$(UNITOUTDIR)" ! -N1"$(HPPDIR)" ! -N2"$(UNITOUTDIR)\obj" ! | >>"$(CFGFILE)" @IF NOT $(MASTEREDITION)! == ! @copy "$(CFGFILE)" "$(PKGDIR_MASTEREDITION)\$(CONFIGFILENAME)" *************** *** 229,241 **** $(MAKE) $(QUIET) "-DCFG=..\..\install\JVCLInstall\JVCLInstall.cfg" configfile @cd ..\..\install\JVCLInstall ! # ! @echo -E"$(JVCLROOT)\bin">>JVCLInstall.cfg ! @echo -N"$(JVCLROOT)\dcu">>JVCLInstall.cfg ! @echo -DNO_JCL>>JVCLInstall.cfg ! @echo -DNO_UNITVERSIONING>>JVCLInstall.cfg ! @echo -DUSE_DXGETTEXT>>JVCLInstall.cfg ! @echo -DDEFAULT_JVCL_INC>>JVCLInstall.cfg ! # ! # $(DCC) -B $(DXGETTEXT) -DNO_JCL JVCLInstall.dpr start ..\..\bin\JVCLInstall.exe $(INSTALLOPTIONS) --- 230,242 ---- $(MAKE) $(QUIET) "-DCFG=..\..\install\JVCLInstall\JVCLInstall.cfg" configfile @cd ..\..\install\JVCLInstall ! type &&| ! ! -E"$(JVCLROOT)\bin" ! -N"$(JVCLROOT)\dcu" ! -DNO_JCL ! -DNO_UNITVERSIONING ! -DUSE_DXGETTEXT ! -DDEFAULT_JVCL_INC ! | >>JVCLInstall.cfg $(DCC) -B $(DXGETTEXT) -DNO_JCL JVCLInstall.dpr start ..\..\bin\JVCLInstall.exe $(INSTALLOPTIONS) |