--- a/Make.proto Fri Mar 20 14:29:53 2015 +0100
+++ b/Make.proto Wed Mar 25 19:09:32 2015 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.28 2015-03-20 12:08:00 vrany Exp $
+# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.29 2015-03-25 18:09:32 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava.
@@ -63,16 +63,16 @@
all:: preMake classLibRule postMake
-pre_objs:: zlib support/fdlibm/libfdm.a antIfPossible
+pre_objs:: zlib support/fdlibm/libfdm.a antIfPossible
java: ant
ant:
- ant -f java/build.xml
+ ant -f java/build.xml
antIfPossible:
- -ant -f java/build.xml
+ -ant -f java/build.xml
full:: ant
@@ -112,9 +112,9 @@
# 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
+#ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+#stx_libjava.$(O): $(shell hg root)/.hg/dirstate
+#endif
@@ -304,4 +304,3 @@
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/AbstractNumberVector.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/Delay.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Semaphore.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic/SmallInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/TwoByteString.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Unicode16String.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedLongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedWordArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/Socket.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic3/WrappedMethod.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/tools/Make.proto Fri Mar 20 14:29:53 2015 +0100
+++ b/tools/Make.proto Wed Mar 25 19:09:32 2015 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/tools/Make.proto,v 1.7 2015-03-20 13:29:52 vrany Exp $
+# $Header: /cvs/stx/stx/libjava/tools/Make.proto,v 1.8 2015-03-25 18:09:32 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_tools.
@@ -63,16 +63,16 @@
all:: preMake classLibRule postMake
-pre_objs:: antIfPossible
+pre_objs:: antIfPossible
java: ant
ant:
- ant -f java/build.xml
+ ant -f java/build.xml
antIfPossible:
- -ant -f java/build.xml
+ -ant -f java/build.xml
full:: ant
@@ -105,9 +105,9 @@
# 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_tools.$(O): $(shell hg root)/.hg/dirstate
-endif
+#ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+#stx_libjava_tools.$(O): $(shell hg root)/.hg/dirstate
+#endif
@@ -191,4 +191,3 @@
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaCodeLibrary.$(H) $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-