Blimp

improved build system to include precooked BlinkenLib.jar into Blimp.jar
Parent 28fb318
Stefan Schuermans

Stefan Schuermans commited on 2011-09-10 16:46:28
Showing 4 changed files, with 12 additions and 9 deletions.

.gitignore
View file @ 0cbf0ef
... ... 
@@ -0,0 +1,3 @@
1 
+Blimp.jar
2 
+Blimp.keystore
3 
+BlinkenLib.jar
Blimp.mf
View file @ 0cbf0ef
... ... 
@@ -1 +1,3 @@
1 
+Manifest-Version: 1.0
1 2 
 Main-Class: org.blinkenarea.Blimp.Blimp
3 
+Class-Path: BlinkenLib.jar
Makefile
View file @ 0cbf0ef
... ... 
@@ -36,7 +36,7 @@ IMAGE_FILES=$(IMG)/ColorPicker.png $(IMG)/Dot.png $(IMG)/Line.png \
36 36 
 all: jar
37 37
38 38 
 clean:
39 
-	rm -f $(CLASS_FILES) Blimp.jar
39 
+	rm -f $(CLASS_FILES) BlinkenLib.jar Blimp.jar
40 40
41 41 
 jar: Blimp.jar
42 42
... ... 
@@ -46,16 +46,13 @@ run: Blimp.jar
46 46 
 %.class: %.java
47 47 
 	$(JAVAC) -classpath $(CLASSPATH) $<
48 48
49 
+BlinkenLib.jar: $(BLINKEN_LIB)
50 
+	ln -s $< $@
51 
+
49 52 
 Blimp.keystore:
50 
-	$(KEYTOOL) -genkey -alias Blimp -dname CN=Blimp,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore Blimp.keystore -storepass $(KEYPASS) -validity 3652
53 
+	$(KEYTOOL) -genkey -alias Blimp -dname CN=Blimp,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore Blimp.keystore -storepass $(KEYPASS) -dname cn=Blimp -validity 3652
51 54
52 
-Blimp.jar: Blimp.mf Blimp.keystore $(CLASS_FILES) $(IMAGE_FILES)
55 
+Blimp.jar: Blimp.mf Blimp.keystore BlinkenLib.jar $(CLASS_FILES) $(IMAGE_FILES)
53 56 
 	$(JAR) cmf Blimp.mf Blimp.jar $(CLASS_FILES) $(IMAGE_FILES)
54 
-	rm -rf jar.tmp
55 
-	mkdir jar.tmp
56 
-	cat $(BLINKEN_LIB) | ( cd jar.tmp ; $(JAR) x )
57 
-	rm -rf jar.tmp/META-INF
58 
-	$(JAR) uf Blimp.jar -C jar.tmp .
59 
-	rm -rf jar.tmp
60 57 
 	$(JARSIGNER) -keystore Blimp.keystore -storepass $(KEYPASS) Blimp.jar Blimp
61 58
org/blinkenareBlimp/.gitignore
View file @ 0cbf0ef
... ... 
@@ -0,0 +1 @@
1 
+*.class
0 2