Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1:/tmp/cvs-serv1867
Modified Files:
Makefile
Log Message:
Print the JDK version used to compile the compiler in the version info.
Also try to use ANT_HOME to find ant.
Based on a patch by Christian Stuellenberg.
Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** Makefile 31 Aug 2003 00:53:27 -0000 1.124
--- Makefile 31 Aug 2003 09:06:52 -0000 1.125
***************
*** 11,14 ****
--- 11,26 ----
TAG = ${shell if [ `grep '^ --' debian/changelog |head -1|wc -c` -le 10 ]; then echo prerelease; fi }
+ # ANT classpath; we will use NICE_ANTJAR or ANT_HOME (in that order)
+ # if present, otherwise try good default
+ ANT_CLASSPATH= ${shell if [ "z${NICE_ANTJAR}" != "z" ] ; \
+ then echo "${NICE_ANTJAR}"; \
+ elif [ "z${ANT_HOME}" != "z" ] ; \
+ then echo "${ANT_HOME}/lib/ant.jar"; \
+ else if [ "z${CLASSPATH}" != "z" ]; \
+ then echo "/usr/share/java/ant.jar:./external/ant.jar:${CLASSPATH}"; \
+ else echo "/usr/share/java/ant.jar:./external/ant.jar:"; \
+ fi \
+ fi }
+
SHELL = /bin/sh
TOP=${PWD}
***************
*** 71,75 ****
setDate:
! cd src/nice/tools/compiler; ./setBuildDate "${VERSION}" "${TAG}"
test:
--- 83,92 ----
setDate:
! cd src; ${JAVAC} nice/tools/compiler/JavaVersion.java
! ${java} -classpath classes nice.tools.compiler.JavaVersion > src/nice/tools/compiler/javaVersion
! @echo "We are using compiler `cat src/nice/tools/compiler/javaVersion` (at least our java version let us assume that)"
! cd src/nice/tools/compiler; ./setBuildDate "${VERSION}" "`cat javaVersion`" "${TAG}"
! @rm src/nice/tools/compiler/javaVersion
! @rm classes/nice/tools/compiler/JavaVersion.class
test:
***************
*** 160,165 ****
ant:
@echo "Building the Ant task definition..."
! @${javac} -sourcepath src -classpath "/usr/share/java/ant.jar:./external/ant.jar:./classes:./classes.old" -d classes src/nice/tools/ant/Nicec.java ||\
! echo "Compilation of the Ant task definition failed.\nAnt should be in the classpath, or linked to by ./external/ant.jar"
testengine:
--- 177,182 ----
ant:
@echo "Building the Ant task definition..."
! @${javac} -sourcepath src -classpath "${ANT_CLASSPATH}:./classes:./classes.old" -d classes src/nice/tools/ant/Nicec.java ||\
! echo -e "Compilation of the Ant task definition failed.\n NICE_ANTJAR or ANT_HOME should be set, Ant should be in the CLASSPATH or at least linked to by ./external/ant.jar"
testengine:
|
