Nice Makefile,1.162,1.163

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20254

Modified Files:
	Makefile 
Log Message:
Use relative paths in nicec and most javac calls. Just looks better ;-)


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** Makefile	7 Mar 2005 12:15:25 -0000	1.162
--- Makefile	31 Mar 2005 19:21:43 -0000	1.163
***************
*** 21,26 ****
  	fi }
  
! SHELL = /bin/sh
! TOP=${PWD}
  
  java  = java
--- 21,26 ----
  	fi }
  
! SHELL := /bin/sh
! PWD   := $(shell pwd)
  
  java  = java
***************
*** 30,41 ****
  JAVAC_FLAGS = -O -g
  
! JAVAC_GENERIC= ${javac} -classpath "${TOP}/classes:${TOP}/classes.old" -sourcepath "${TOP}/src:${TOP}/stdlib" $(JAVAC_FLAGS)
! JAVAC= ${JAVAC_GENERIC} -d "${TOP}/classes"
  JAVADOC=javadoc
  
! NICEC_ARGS= --exclude-runtime 
! NICEC=CLASSPATH="${TOP}/classes" JAVA="${java} -Dnice.inlined=classes-inline" ./bin/nicec.bootstrap ${NICEC_ARGS} -d "${TOP}/classes.old" --sourcepath="${TOP}/stdlib.old:${TOP}/stdlib:${TOP}/src.old:${TOP}/src" --classpath="${TOP}/classes"
! NICEC1=JAVA="${java}" ${TOP}/bin/nicec ${NICEC_ARGS} -d "${TOP}/classes" --sourcepath="${TOP}/stdlib:${TOP}/src" 
  
  
  
--- 30,42 ----
  JAVAC_FLAGS = -O -g
  
! JAVAC_GENERIC= ${javac} -classpath "${PWD}/classes:${PWD}/classes.old" -sourcepath "${PWD}/src:${PWD}/stdlib" ${JAVAC_FLAGS}
! JAVAC= ${JAVAC_GENERIC} -d "${PWD}/classes"
  JAVADOC=javadoc
  
! NICEC_ARGS= --exclude-runtime
! NICEC=CLASSPATH=classes JAVA="${java} -Dnice.inlined=classes-inline" bin/nicec.bootstrap ${NICEC_ARGS} -d classes.old --sourcepath=stdlib.old:stdlib:src.old:src --classpath=classes
! NICEC1=JAVA="${java}" bin/nicec ${NICEC_ARGS} -d classes --sourcepath=stdlib:src
  
+ MANIFEST = src/nice/tools/compiler/Manifest
  
  
***************
*** 73,77 ****
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu -C classes.old bossa -C classes.old mlsub -C classes.old nice
  	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
--- 74,78 ----
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf $(MANIFEST) share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu -C classes.old bossa -C classes.old mlsub -C classes.old nice
  	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
***************
*** 79,83 ****
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu
  	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
--- 80,84 ----
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf $(MANIFEST) share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu
  	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
***************
*** 96,100 ****
  
  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)"
--- 97,101 ----
  
  setDate:
! 	${JAVAC} src/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)"
***************
*** 120,129 ****
  gcj:
  	cp src/nice/tools/compiler/console.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/console.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)
  
--- 121,130 ----
  gcj:
  	cp src/nice/tools/compiler/console.jar $(GCJTEMP)
! 	$(jar) umf $(MANIFEST) $(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/typing -C classes mlsub -C classes bossa -C classes gnu
! 	$(GCJ) --main=nice.tools.compiler.console.fun -o bin/nicec.bin $(GCJTEMP)
  
  gcj-testsuite:
  	cp src/nice/tools/compiler/console.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 nice/tools/typing -C classes mlsub -C classes bossa -C classes gnu
  	$(GCJ) -g --main=nice.tools.testsuite.TestNice -o bin/testsuite.bin $(GCJTEMP)
  
***************
*** 133,137 ****
  	rm -f bin/{nicedoc,niceunit}
  	[ -r src/bossa/syntax/dispatch.java ] && mv src/bossa/syntax/dispatch.java src/bossa/syntax/dispatch.java.bootstrap || true
! 	find "${TOP}" \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  
  
--- 134,138 ----
  	rm -f bin/{nicedoc,niceunit}
  	[ -r src/bossa/syntax/dispatch.java ] && mv src/bossa/syntax/dispatch.java src/bossa/syntax/dispatch.java.bootstrap || true
! 	find . \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  
  
***************
*** 187,191 ****
  
  src/bossa/parser/Parser.java: src/bossa/parser/Parser.jj
! 	cd src/bossa/parser; CLASSPATH=`TOP=${TOP} ${TOP}/external/javacc` \
  		${java} javacc Parser.jj
  
--- 188,192 ----
  
  src/bossa/parser/Parser.java: src/bossa/parser/Parser.jj
! 	cd src/bossa/parser; CLASSPATH=`TOP=${PWD} ${PWD}/external/javacc` \
  		${java} javacc Parser.jj
  
***************
*** 220,223 ****
--- 221,227 ----
  	echo "Compilation of the testsuite engine failed."
  
+ visibility:
+ 	$(NICEC1) -a visibility.jar nice.tools.visibility
+ 
  
  #****************************************************************
***************
*** 228,232 ****
  # has no -[X]depend
  dep:
! 	cd src; ${JAVAC} bossa/modules/Package.java
  
  parser: src/bossa/parser/Parser.java
--- 232,236 ----
  # has no -[X]depend
  dep:
! 	${JAVAC} src/bossa/modules/Package.java
  
  parser: src/bossa/parser/Parser.java
***************
*** 241,245 ****
  
  recompileSTDLIB:
! 	${JAVAC} "${TOP}"/stdlib/nice/lang/*.java
  
  # Compile individual files with: F=file.java make compile
--- 245,249 ----
  
  recompileSTDLIB:
! 	${JAVAC} stdlib/nice/lang/*.java
  
  # Compile individual files with: F=file.java make compile
***************
*** 261,266 ****
  	mkdir -p doc
  	cd src; ${JAVADOC} -windowtitle "Nice" -doctitle "The Nice compiler source" \
! 	-overview "${TOP}"/src/overview.html \
! 	-d "${TOP}"/doc -private -author -version \
  	nice.tools.code \
  	mlsub.typing mlsub.typing.lowlevel mlsub.compilation \
--- 265,270 ----
  	mkdir -p doc
  	cd src; ${JAVADOC} -windowtitle "Nice" -doctitle "The Nice compiler source" \
! 	-overview src/overview.html \
! 	-d doc -private -author -version \
  	nice.tools.code \
  	mlsub.typing mlsub.typing.lowlevel mlsub.compilation \



-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/Info/Sentarus/hamr30