altosui: Fix windows installer to ship correct files
authorKeith Packard <keithp@keithp.com>
Sun, 5 Sep 2010 01:20:45 +0000 (18:20 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 5 Sep 2010 01:21:41 +0000 (18:21 -0700)
Was shipping altosui.jar instead of altosui-fat.jar

Signed-off-by: Keith Packard <keithp@keithp.com>
ao-tools/altosui/.gitignore
ao-tools/altosui/Makefile.am
ao-tools/altosui/altos-windows.nsi
ao-tools/libaltos/Makefile.am

index 6367205..89be1d5 100644 (file)
@@ -1,14 +1,19 @@
 windows/
 linux/
-darwin/
+macosx/
 fat/
 Manifest.txt
+Manifest-fat.txt
 libaltosJNI
 classes
 altosui
-Altos-Linux.tgz
-Altos-Mac.zip
-Altos-Windows.exe
+altosui-test
+classaltosui.stamp
+Altos-Linux-*.tar.bz2
+Altos-Mac-*.zip
+Altos-Windows-*.exe
+*.dll
+*.dylib
+*.so
 *.jar
 *.class
-altosui
index ed7e2f7..13bceae 100644 (file)
@@ -1,4 +1,5 @@
 JAVAROOT=classes
+AM_JAVACFLAGS=-encoding UTF-8
 
 CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
 
@@ -77,14 +78,14 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) $(FATJAR)
+all-local: classes/altosui $(JAR) $(FATJAR) altosui altosui-test
 
 clean-local:
        -rm -rf classes/altosui $(JAR) $(FATJAR) \
@@ -139,7 +140,7 @@ $(LIBALTOS):
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 
-$(FREETTS_CLASS): Makefile
+$(FREETTS_CLASS):
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 
index c8539a5..6ebec21 100644 (file)
@@ -45,7 +45,7 @@ SectionEnd
 Section "AltosUI Application"
        SetOutPath $INSTDIR
 
-       File "altosui.jar"
+       File "altosui-fat.jar"
        File "cmudict04.jar"
        File "cmulex.jar"
        File "cmu_time_awb.jar"
@@ -58,11 +58,11 @@ Section "AltosUI Application"
 
        File "../../icon/*.ico"
 
-       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui.jar" "" "$INSTDIR\altus-metrum.ico"
+       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
 Section "AltosUI Desktop Shortcut"
-       CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui.jar"  "" "$INSTDIR\altus-metrum.ico"
+       CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar"  "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
 Section "TeleMetrum and TeleDongle Firmware"
index 2f1d6fc..4d29d80 100644 (file)
@@ -1,5 +1,6 @@
 JAVAC=javac
 AM_CFLAGS="-I$(JVM_INCLUDE)"
+AM_JAVACFLAGS=-encoding UTF-8
 
 lib_LTLIBRARIES=libaltos.la