diff -r -b -c --strip-trailing-cr fpcbuild-3.0.0rc1/fpcsrc/Makefile.fpc fpcbrc1.300/fpcsrc/Makefile.fpc *** fpcbuild-3.0.0rc1/fpcsrc/Makefile.fpc 2015-08-07 15:22:32.000000000 +0200 --- fpcbrc1.300/fpcsrc/Makefile.fpc 2015-08-10 15:14:56.721625000 +0200 *************** *** 21,27 **** [prerules] REQUIREDVERSION=2.6.4 ! REQUIREDVERSION2=2.6.2 # make versions < 3.77 (OS2 version) are buggy --- 21,30 ---- [prerules] REQUIREDVERSION=2.6.4 ! # Accept 3.0.0, without requiring to using OVERRIDEVERSIONCHECK=1 ! # 3.0.0 should become REQUIREDVERSION after 3.0.0 final release ! # and 2.6.4 should be moved to REQUIREDVERSION2 ! REQUIREDVERSION2=3.0.0 # make versions < 3.77 (OS2 version) are buggy diff -r -b -c --strip-trailing-cr fpcbuild-3.0.0rc1/fpcsrc/packages/fpmkunit/src/fpmkunit.pp fpcbrc1.300/fpcsrc/packages/fpmkunit/src/fpmkunit.pp *** fpcbuild-3.0.0rc1/fpcsrc/packages/fpmkunit/src/fpmkunit.pp 2015-07-11 16:20:40.000000000 +0200 --- fpcbrc1.300/fpcsrc/packages/fpmkunit/src/fpmkunit.pp 2015-08-10 18:05:53.440375000 +0200 *************** *** 7162,7168 **** Try // Add fpmake.pp & manifest.xml always L.Add(FPMakePPFile); ! L.Add(ManifestFile); //get all files from all targets for ICPU:=Low(TCPU) to high(TCPU) do for IOS:=Low(TOS) to high(TOS) do --- 7162,7169 ---- Try // Add fpmake.pp & manifest.xml always L.Add(FPMakePPFile); ! // This does not work correctly for multiple packages ! // L.Add(ManifestFile); //get all files from all targets for ICPU:=Low(TCPU) to high(TCPU) do for IOS:=Low(TOS) to high(TOS) do diff -r -b -c --strip-trailing-cr fpcbuild-3.0.0rc1/install/go32v2/win-to-dos-zips.bat fpcbrc1.300/install/go32v2/win-to-dos-zips.bat *** fpcbuild-3.0.0rc1/install/go32v2/win-to-dos-zips.bat 2010-10-13 16:42:12.000000000 +0200 --- fpcbrc1.300/install/go32v2/win-to-dos-zips.bat 2015-08-11 16:11:30.967500000 +0200 *************** *** 1,23 **** @echo off ! rem Batch to generate Dos 2.4.2 zips rem Used on a Windows XP SP3 ! rem in october 2010 for 2.4.2rc1 test rem Variables used below, this should be the only part rem that needs to be updated on a future release ! set BATCH_RELEASE_VERSION=2.4.2 set BATCH_OS_TARGET=go32v2 rem To avoid problems, it seems better to keep thios directory rem name within the 8.3 constraints set BATCH_FPCBUILD_DRIVE=e: ! set BATCH_FPCBUILD_DIR=%BATCH_FPCBUILD_DRIVE%\pas\fpcbuild.242 rem Same with forward slashes ! set GNU_FPCBUILD_DIR=%BATCH_FPCBUILD_DRIVE%/pas/fpcbuild.242 set GO32ZIPDIR=go32v2-zips rem To avoid upx compression ! set UPXPROG=echo rem This is need to force cross compile to use short dir names set LIMIT83fs="go32v2 win32" rem Start of Batch comands --- 1,23 ---- @echo off ! rem Batch to generate Dos 3.0.0 zips rem Used on a Windows XP SP3 ! rem in August 2015 for 3.0.0rc1 test rem Variables used below, this should be the only part rem that needs to be updated on a future release ! set BATCH_RELEASE_VERSION=3.0.0 set BATCH_OS_TARGET=go32v2 rem To avoid problems, it seems better to keep thios directory rem name within the 8.3 constraints set BATCH_FPCBUILD_DRIVE=e: ! set BATCH_FPCBUILD_DIR=%BATCH_FPCBUILD_DRIVE%\pas\fpcbrc1.300 rem Same with forward slashes ! set GNU_FPCBUILD_DIR=%BATCH_FPCBUILD_DRIVE%/pas/fpcbrc1.300 set GO32ZIPDIR=go32v2-zips rem To avoid upx compression ! rem Obsolete, UPX is not used anymore. set UPXPROG=echo rem This is need to force cross compile to use short dir names set LIMIT83fs="go32v2 win32" rem Start of Batch comands *************** *** 50,76 **** if errorlevel 1 goto got_make_error rem Stage 1: Compile and generates all zips :stage1 ! make sourcezip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make demozip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make docsrc OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make go32v2zip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make utilities OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error :stageide make -C fpcsrc/rtl all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make -C fpcsrc/packages all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make -C fpcsrc ide_zipinstall OS_TARGET=%BATCH_OS_TARGET% OPT=-Fl%USEDGDBDIR% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error :stageinst ! make -C fpcsrc installer_all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error mkdir %GO32ZIPDIR% cp fpcsrc/installer/install.exe %GO32ZIPDIR% cp fpcsrc/installer/install.dat %GO32ZIPDIR% --- 50,78 ---- if errorlevel 1 goto got_make_error rem Stage 1: Compile and generates all zips :stage1 ! make -C fpcsrc all ! make sourcezip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error ! make demozip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error ! make docsrc OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error ! make go32v2zip OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error ! make utilities OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error :stageide make -C fpcsrc/rtl all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error ! make -C fpcsrc/packages all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc if errorlevel 1 goto got_make_error ! make -C fpcsrc ide_zipinstall OS_TARGET=%BATCH_OS_TARGET% OPT=-Fl%USEDGDBDIR% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc if errorlevel 1 goto got_make_error :stageinst ! make -C fpcsrc installer_all OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% FPCDIR=%GNU_FPCBUILD_DIR%/fpcsrc BUILDFULLNATIVE=1 if errorlevel 1 goto got_make_error + mkdir %GO32ZIPDIR% cp fpcsrc/installer/install.exe %GO32ZIPDIR% cp fpcsrc/installer/install.dat %GO32ZIPDIR% *************** *** 82,87 **** --- 84,92 ---- rem now we have long file names packages :stageshort + rem First try without any parameter for sources + make shortsrc PKGPRE="" PKGUNITSPRE="" + rem Second try make shortnames OS_TARGET=%BATCH_OS_TARGET% LIMIT83fs=%LIMIT83fs% if errorlevel 1 goto got_make_error rem This fails for fcl packages, because those have a long i386-go32v2 prefix diff -r -b -c --strip-trailing-cr fpcbuild-3.0.0rc1/Makefile fpcbrc1.300/Makefile *** fpcbuild-3.0.0rc1/Makefile 2015-08-07 15:26:28.000000000 +0200 --- fpcbrc1.300/Makefile 2015-08-11 13:28:00.467500000 +0200 *************** *** 2382,2387 **** --- 2382,2399 ---- -mv $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip dxeg$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip fpcm$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip fcmk$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip fpdoc$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip fppkg$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip fprcp$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip h2pas$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip tply$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip p2fm$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip p2jn$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip p2ut$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip rmw$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)ide$(ZIPSUFFIX).zip ide$(ZIPSUFFIXSHORT).zip shortsrc: diff -r -b -c --strip-trailing-cr fpcbuild-3.0.0rc1/Makefile.fpc fpcbrc1.300/Makefile.fpc *** fpcbuild-3.0.0rc1/Makefile.fpc 2015-08-07 15:26:28.000000000 +0200 --- fpcbrc1.300/Makefile.fpc 2015-08-11 13:28:00.545625000 +0200 *************** *** 383,388 **** --- 383,401 ---- -mv $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip + # Utils + -mv $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip dxeg$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip fpcm$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip fcmk$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip fpdoc$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip fppkg$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip fprcp$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip h2pas$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip tply$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip p2fm$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip p2jn$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip p2ut$(ZIPSUFFIXSHORT).zip + -mv $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip rmw$(ZIPSUFFIXSHORT).zip # Sources only -mv $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip -mv $(PKGPRE)ide$(ZIPSUFFIX).zip ide$(ZIPSUFFIXSHORT).zip