--- a/libs/Make.proto Tue Jan 15 18:12:48 2013 +0000
+++ b/libs/Make.proto Wed Jan 16 13:37:32 2013 +0000
@@ -69,12 +69,10 @@
mvn:
(cd java && mvn package)
-.PHONY: mvn
-
-# 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 \
@@ -84,7 +82,7 @@
echo -n exported > .svnversion; \
fi
-stx_libjava_libs.o: stx_libjava_libs.st .svnversion
+stx_libjava_libs.o: stx_libjava_libs.st .svnversion
@if [ -d .svn ]; then \
rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
echo " [SV] Expanding svnRevisionNo in $1.st"; \
@@ -93,11 +91,27 @@
$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava_libs.svn $(C_RULE);
sed -i -e "s/\".stx_libjava_libs.svn.st\");/\"\stx_libjava_libs.st\");/g" .stx_libjava_libs.svn.c
$(MAKE) .stx_libjava_libs.svn.$(O)
- @mv .stx_libjava_libs.svn.$(O) stx_libjava_libs.$(O)
+ @mv .stx_libjava_libs.svn.$(O) stx_libjava_libs.$(O)
endif
+# 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_libjava_libs.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports
+ $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
# add more install actions here
install::