[Nice-commit] Nice Makefile,1.116,1.117

[<bo...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1:/tmp/cvs-serv10793

Modified Files:
	Makefile 
Log Message:
For running the testsuite, enable assertions appropriately, depending on
whether the java used supports -enableassertions or not.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** Makefile	21 Apr 2003 18:37:48 -0000	1.116
--- Makefile	26 Apr 2003 23:51:52 -0000	1.117
***************
*** 77,81 ****
  
  check:
! 	/usr/bin/time ${java} -Dassertions=true -classpath "classes" nice.tools.testsuite.TestNice testsuite
  
  .PHONY: coverage
--- 77,85 ----
  
  check:
! 	if [ `${java} -h 2>&1 | grep -- -enableassertions | wc -l` = 0 ]; then\
! 	  /usr/bin/time ${java} -Dassertions=true -classpath "classes" nice.tools.testsuite.TestNice testsuite; \
! 	else \
! 	  /usr/bin/time ${java} -enableassertions -classpath "classes" nice.tools.testsuite.TestNice testsuite; \
! 	fi
  
  .PHONY: coverage
***************
*** 84,93 ****
  
  GCJ=gcj
! GCJJAR = /tmp/Nice-gcj.jar
  gcj:
! 	cp src/nice/tools/compiler.jar $(GCJJAR)
! 	jar umf src/mainClass $(GCJJAR) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes mlsub -C classes bossa -C classes gnu
! 	$(GCJ) -c -o /tmp/getopt.o --resource gnu/getopt/MessagesBundle.properties classes/gnu/getopt/MessagesBundle.properties
! 	$(GCJ) -g --main=nice.tools.compiler.fun -o bin/nicec.bin $(GCJJAR) /tmp/getopt.o
  
  clean:
--- 88,101 ----
  
  GCJ=gcj
! GCJTEMP = /tmp/Nice-gcj.jar
  gcj:
! 	cp src/nice/tools/compiler.jar $(GCJTEMP)
! 	jar umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes mlsub -C classes bossa -C classes gnu
! 	$(GCJ) --main=nice.tools.compiler.fun -o bin/nicec.bin $(GCJTEMP)
! 
! gcj-testsuite:
! 	cp src/nice/tools/compiler.jar $(GCJTEMP)
! 	jar umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes nice/tools/testsuite -C classes mlsub -C classes bossa -C classes gnu
! 	$(GCJ) -g --main=nice.tools.testsuite.TestNice -o bin/testsuite.bin $(GCJTEMP)
  
  clean: