[Nice-commit] Nice Makefile,1.127,1.128

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

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

Modified Files:
	Makefile 
Log Message:
Use a separate directory to store inlined operations. This allows 
further separation of the running compiler with the source compiler being 
compiled, thus making bootstraping easier.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Makefile	31 Aug 2003 14:30:11 -0000	1.127
--- Makefile	5 Sep 2003 21:23:53 -0000	1.128
***************
*** 31,39 ****
  JAVAC_FLAGS = -O -g
  
! JAVAC= ${javac} -classpath "${TOP}/classes:${TOP}/classes.old" -sourcepath "${TOP}/src:${TOP}/stdlib" -d "${TOP}/classes" $(JAVAC_FLAGS)
  JAVADOC=javadoc
  
  NICEC_ARGS= --exclude-runtime 
! NICEC=CLASSPATH="${TOP}/classes" JAVA="${java}" ./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" 
  
--- 31,40 ----
  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" 
  
***************
*** 124,128 ****
  clean:
  	rm -f src/nice/tools/compiler/console.jar
! 	-rm -rf classes share/java src/bossa/parser/{Parse*.java,Token*.java,ASCII_*.java}
  	find "${TOP}" \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  
--- 125,129 ----
  clean:
  	rm -f src/nice/tools/compiler/console.jar
! 	-rm -rf classes classes-inline share/java src/bossa/parser/{Parse*.java,Token*.java,ASCII_*.java}
  	find "${TOP}" \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  
***************
*** 156,163 ****
  bootstrap: parser
  	cd src/gnu/lists && ./withCollections
! 	mkdir -p classes
  	-cd src/bossa/syntax && mv -f dispatch.java.bootstrap dispatch.java
  	${JAVAC} \
! 		stdlib/nice/lang/Native.java stdlib/nice/lang/inline/*.java \
  		src/mlsub/compilation/Module.java \
  		src/bossa/modules/Package.java src/bossa/util/*.java \
--- 157,164 ----
  bootstrap: parser
  	cd src/gnu/lists && ./withCollections
! 	mkdir -p classes classes-inline
  	-cd src/bossa/syntax && mv -f dispatch.java.bootstrap dispatch.java
  	${JAVAC} \
! 		stdlib/nice/lang/Native.java \
  		src/mlsub/compilation/Module.java \
  		src/bossa/modules/Package.java src/bossa/util/*.java \
***************
*** 165,168 ****
--- 166,171 ----
  		src/nice/tools/code/*.java src/mlsub/typing/*.java \
  		src/mlsub/typing/lowlevel/*.java src/bossa/syntax/dispatch.java
+ 	$(JAVAC_GENERIC) -d classes-inline stdlib/nice/lang/inline/*.java
+ 	cp -a classes-inline/* classes
  	${NICEC} -R bossa.modules
  	${NICEC} -r nice.tools.ast