Makefiles regenerated
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 28 Nov 2012 10:27:15 +0000
changeset 112 a88a34b9ee63
parent 111 6439af30a24b
child 113 1528f6a77725
Makefiles regenerated
mercurial/Make.proto
mercurial/bc.mak
--- a/mercurial/Make.proto	Wed Nov 28 09:55:19 2012 +0000
+++ b/mercurial/Make.proto	Wed Nov 28 10:27:15 2012 +0000
@@ -68,7 +68,7 @@
 
 
 
-# Update SVN revision in stx_libbasic3.st
+# Update SVN revision in package definition class
 ifneq (,$(findstring .svn,$(wildcard .svn)))
 .svnversion: *.st
 	if [ -d .svn ]; then \
@@ -92,6 +92,15 @@
 
 
 
+# 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 '**NOHG**'))
+stx_libscm_mercurial.$(OBJ): $(shell hg root)/.hg/dirstate
+endif
+
+
+
 
 # run default testsuite for this package
 test: $(TOP)/goodies/builder/reports
--- a/mercurial/bc.mak	Wed Nov 28 09:55:19 2012 +0000
+++ b/mercurial/bc.mak	Wed Nov 28 10:27:15 2012 +0000
@@ -73,6 +73,10 @@
 
 
 
+
+
+
+
 test: $(TOP)\goodies\builder\reports\NUL
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)