# HG changeset patch # User Jan Vrany # Date 1453109961 0 # Node ID 4dd4d4b67e42a3f262fb7ffe4b35028794111e23 # Parent 6da0db947f6cb0c2862fafa829bd96fe3d8075f2 Build files regenerated. diff -r 6da0db947f6c -r 4dd4d4b67e42 reports/Make.proto --- a/reports/Make.proto Thu Jan 14 22:33:46 2016 +0000 +++ b/reports/Make.proto Mon Jan 18 09:39:21 2016 +0000 @@ -92,6 +92,13 @@ +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**')) +stx_goodies_builder_reports.$(O): $(shell hg root)/.hg/dirstate +endif + @@ -118,7 +125,6 @@ prereq: cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" - cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" diff -r 6da0db947f6c -r 4dd4d4b67e42 reports/bc.mak --- a/reports/bc.mak Thu Jan 14 22:33:46 2016 +0000 +++ b/reports/bc.mak Mon Jan 18 09:39:21 2016 +0000 @@ -53,7 +53,6 @@ prereq: pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " - pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -90,3 +89,12 @@ $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line + +# **Must be at end** + +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +!IFDEF HGROOT +$(OUTDIR)stx_goodies_builder_reports.$(O): $(HGROOT)\.hg\dirstate +!ENDIF diff -r 6da0db947f6c -r 4dd4d4b67e42 reports/bmake.bat --- a/reports/bmake.bat Thu Jan 14 22:33:46 2016 +0000 +++ b/reports/bmake.bat Mon Jan 18 09:39:21 2016 +0000 @@ -7,6 +7,7 @@ @REM Kludge got Mercurial, cannot be implemented in Borland make @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%" + make.exe -N -f bc.mak %DEFINES% %* diff -r 6da0db947f6c -r 4dd4d4b67e42 reports/stx_goodies_builder_reports.st --- a/reports/stx_goodies_builder_reports.st Thu Jan 14 22:33:46 2016 +0000 +++ b/reports/stx_goodies_builder_reports.st Mon Jan 18 09:39:21 2016 +0000 @@ -197,6 +197,10 @@ ^ '$Header$' ! +version_HG + ^ '$Changeset: $' +! + version_SVN ^ '$Id$' ! ! diff -r 6da0db947f6c -r 4dd4d4b67e42 reports/vcmake.bat --- a/reports/vcmake.bat Thu Jan 14 22:33:46 2016 +0000 +++ b/reports/vcmake.bat Mon Jan 18 09:39:21 2016 +0000 @@ -13,8 +13,9 @@ @REM Kludge got Mercurial, cannot be implemented in Borland make @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%" + + make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %* -