summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2010-08-05 15:00:15 -0400
committerBdale Garbee <bdale@gag.com>2010-08-05 15:00:15 -0400
commitaed55ef1ce45b0f6e6fefeebf50be97607b31d65 (patch)
tree7714f6435b9eeff94302b17a088a4b0cf6e80a3b
parent02f17f2cd26189e2676a9dc0d86bd959ed0bc3f4 (diff)
working on java packaging details
-rw-r--r--ao-tools/altosui/Makefile33
-rw-r--r--ao-tools/altosui/Manifest.txt2
-rw-r--r--debian/altos.desktop2
3 files changed, 19 insertions, 18 deletions
diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 790aecda..bae42c9a 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
.SUFFIXES: .java .class
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
CLASSFILES=\
AltosConvert.class \
AltosEeprom.class \
@@ -20,16 +20,17 @@ CLASSFILES=\
AltosDeviceDialog.class \
AltosVoice.class
-FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
-FREETTSLIB=$(FREETTSSRC)/lib
-FREETTSJAR= \
- cmudict04.jar \
- cmulex.jar \
- cmu_time_awb.jar \
- cmutimelex.jar \
- cmu_us_kal.jar \
- en_us.jar \
- freetts.jar
+#FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+#FREETTSLIB=$(FREETTSSRC)/lib
+#FREETTSJAR=/usr/share/java/freetts.jar
+#FREETTSJAR= \
+# cmudict04.jar \
+# cmulex.jar \
+# cmu_time_awb.jar \
+# cmutimelex.jar \
+# cmu_us_kal.jar \
+# en_us.jar \
+# freetts.jar
JAVAFLAGS=-Xlint:unchecked
@@ -55,14 +56,14 @@ altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man
classes/altosui:
mkdir -p classes
- ln -s .. classes/altosui
+ ln -sf .. classes/altosui
classes/libaltosJNI:
mkdir -p classes
- ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+ ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
-$(FREETTSJAR):
- ln -s $(FREETTSLIB)/$@ .
+#$(FREETTSJAR):
+# ln -s $(FREETTSLIB)/$@ .
ifeq ($(OS),Darwin)
RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@ -81,6 +82,6 @@ altosui:
endif
clean:
- rm -f *.class $(FREETTSJAR) altosui.jar
+ rm -f *.class altosui.jar
rm -f AltosUI.app/Contents/Resources/Java/*
rm -rf classes
diff --git a/ao-tools/altosui/Manifest.txt b/ao-tools/altosui/Manifest.txt
index 1f313a13..504d0de3 100644
--- a/ao-tools/altosui/Manifest.txt
+++ b/ao-tools/altosui/Manifest.txt
@@ -1,2 +1,2 @@
Main-Class: altosui.AltosUI
-Class-Path: /usr/share/java/freetts-1.2.2.jar
+Class-Path: /usr/share/java/freetts.jar
diff --git a/debian/altos.desktop b/debian/altos.desktop
index 106e34a0..4281ad3a 100644
--- a/debian/altos.desktop
+++ b/debian/altos.desktop
@@ -7,4 +7,4 @@ Icon=/usr/share/pixmaps/altusmetrum.xpm
Exec=/usr/bin/ao-view %f
Terminal=false
MimeType=text/plain;
-Categories=Science;
+Categories=Education;Science;