Build files regenerated. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 18 Jan 2016 09:39:21 +0000
branchjv
changeset 2954dd4d4b67e42
parent 294 6da0db947f6c
child 296 4c26321be573
Build files regenerated.
reports/Make.proto
reports/bc.mak
reports/bmake.bat
reports/stx_goodies_builder_reports.st
reports/vcmake.bat
     1.1 --- a/reports/Make.proto	Thu Jan 14 22:33:46 2016 +0000
     1.2 +++ b/reports/Make.proto	Mon Jan 18 09:39:21 2016 +0000
     1.3 @@ -92,6 +92,13 @@
     1.4  
     1.5  
     1.6  
     1.7 +# Enforce recompilation of package definition class if Mercurial working
     1.8 +# copy state changes. Together with --guessVersion it ensures that package
     1.9 +# definition class always contains correct binary revision string.
    1.10 +ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
    1.11 +stx_goodies_builder_reports.$(O): $(shell hg root)/.hg/dirstate
    1.12 +endif
    1.13 +
    1.14  
    1.15  
    1.16  
    1.17 @@ -118,7 +125,6 @@
    1.18  prereq:
    1.19  	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
    1.20  	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
    1.21 -	cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
    1.22  	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
    1.23  	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
    1.24  	cd ../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
     2.1 --- a/reports/bc.mak	Thu Jan 14 22:33:46 2016 +0000
     2.2 +++ b/reports/bc.mak	Mon Jan 18 09:39:21 2016 +0000
     2.3 @@ -53,7 +53,6 @@
     2.4  prereq:
     2.5  	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
     2.6  	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
     2.7 -	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
     2.8  	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
     2.9  	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
    2.10  	pushd ..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
    2.11 @@ -90,3 +89,12 @@
    2.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)
    2.13  
    2.14  # ENDMAKEDEPEND --- do not remove this line
    2.15 +
    2.16 +# **Must be at end**
    2.17 +
    2.18 +# Enforce recompilation of package definition class if Mercurial working
    2.19 +# copy state changes. Together with --guessVersion it ensures that package
    2.20 +# definition class always contains correct binary revision string.
    2.21 +!IFDEF HGROOT
    2.22 +$(OUTDIR)stx_goodies_builder_reports.$(O): $(HGROOT)\.hg\dirstate
    2.23 +!ENDIF
     3.1 --- a/reports/bmake.bat	Thu Jan 14 22:33:46 2016 +0000
     3.2 +++ b/reports/bmake.bat	Mon Jan 18 09:39:21 2016 +0000
     3.3 @@ -7,6 +7,7 @@
     3.4  @REM Kludge got Mercurial, cannot be implemented in Borland make
     3.5  @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
     3.6  @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
     3.7 +
     3.8  make.exe -N -f bc.mak  %DEFINES% %*
     3.9  
    3.10  
     4.1 --- a/reports/stx_goodies_builder_reports.st	Thu Jan 14 22:33:46 2016 +0000
     4.2 +++ b/reports/stx_goodies_builder_reports.st	Mon Jan 18 09:39:21 2016 +0000
     4.3 @@ -197,6 +197,10 @@
     4.4      ^ '$Header$'
     4.5  !
     4.6  
     4.7 +version_HG
     4.8 +    ^ '$Changeset: <not expanded> $'
     4.9 +!
    4.10 +
    4.11  version_SVN
    4.12      ^ '$Id$'
    4.13  ! !
     5.1 --- a/reports/vcmake.bat	Thu Jan 14 22:33:46 2016 +0000
     5.2 +++ b/reports/vcmake.bat	Mon Jan 18 09:39:21 2016 +0000
     5.3 @@ -13,8 +13,9 @@
     5.4  @REM Kludge got Mercurial, cannot be implemented in Borland make
     5.5  @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
     5.6  @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
     5.7 +
     5.8 +
     5.9  make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
    5.10  
    5.11  
    5.12  
    5.13 -