--- a/Make.proto Mon Feb 18 12:38:46 2013 +0100
+++ b/Make.proto Mon Feb 18 12:39:01 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.16 2013-02-16 18:08:32 vrany Exp $
+# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.17 2013-02-18 11:39:01 vrany Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava.
@@ -63,9 +63,11 @@
all:: preMake classLibRule postMake
-pre_objs:: zlib support/fdlibm/libfdm.a ant
+pre_objs:: zlib support/fdlibm/libfdm.a update-svn-revision
+full: all ant
+
ant:
ant -f java/build.xml
@@ -77,45 +79,14 @@
-
-# Update SVN revision in package definition class
-ifneq (,$(findstring .svn,$(wildcard .svn)))
-.svnversion: *.st
- if [ -d .svn ]; then \
- rev=$(shell svnversion -n); \
- echo -n $$rev > .svnversion; \
- else \
- echo -n exported > .svnversion; \
- fi
-
-stx_libjava.o: stx_libjava.st .svnversion
- @if [ -d .svn ]; then \
- rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
- echo " [SV] Expanding svnRevisionNo in $1.st"; \
- sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libjava.svn.st; \
+update-svn-revision:
+ if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
+ svnversion -n > .svnversion; \
+ sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+ stx_libjava.st; \
fi
- $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava.svn $(C_RULE);
- sed -i -e "s/\".stx_libjava.svn.st\");/\"\stx_libjava.st\");/g" .stx_libjava.svn.c
- $(MAKE) .stx_libjava.svn.$(O)
- @mv .stx_libjava.svn.$(O) stx_libjava.$(O)
-endif
-
-
+.PHONY: update-svn-revision
-# 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.$(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)
@@ -133,15 +104,14 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"