From: adam <adam@megacz.com>
Date: Mon, 27 Dec 2004 04:29:03 +0000 (+0000)
Subject: Makefile: org.ibex.tool.Compiler now bootstraps itself
X-Git-Url: http://git.megacz.com/?p=org.ibex.tool.git;a=commitdiff_plain;h=4dd9b7d28746b040a32abfc84c0672f18d23fbdc

Makefile: org.ibex.tool.Compiler now bootstraps itself

darcs-hash:20041227042903-5007d-c90f08f47c34bf32d6437ddb334e9edde78b0ac1.gz
---

diff --git a/Makefile b/Makefile
index 8a48fe0..f140f36 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,14 @@ classes = $(sources:src/%.java=build/%.class)
 default: org.ibex.tool.jar
 
 org.ibex.tool.jar: $(classes)
-	@echo "Archiving       org.ibex.tool.jar"
-	@echo "Main-Class: org.ibex.tool.Compiler" > .manifest
-	@jar -cmf .manifest org.ibex.tool.jar \
-		`find build -name \*.class      | sed 's_^\([^/]*\)/_ -C \1 _'` \
-		`find src   -name \*.rsc        | sed 's_^\([^/]*\)/_ -C \1 _'` \
-		`find src   -name \*.properties | sed 's_^\([^/]*\)/_ -C \1 _'` \
+	@echo "Bootstrapping:    org.ibex.tool.jar"
+	@java -cp src:build org.ibex.tool.Compiler -j org.ibex.tool.jar -m org.ibex.tool.Compiler -v src
+	@echo "Adding resources: org.ibex.tool.jar"
+	@cd src; jar -uf ../org.ibex.tool.jar `find . -name \*.rsc -or -name \*.properties`
 
 $(classes): $(sources)
 	@mkdir -p build
-	@echo "Compiling       org.ibex.tool"
+	@echo "Compiling:        org.ibex.tool"
 	@javac -sourcepath java -d build -source 1.3 -target 1.1 \
 		$(sources)