altosui: Fix windows installer to ship correct files

Was shipping altosui.jar instead of altosui-fat.jar

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/altosui/.gitignore b/ao-tools/altosui/.gitignore
index 63672058e5f95d2b5f87978ef951dcde5ba73058..89be1d53dbb17c3e6e732fa9cc4699029878ef32 100644 (file)
--- a/ao-tools/altosui/.gitignore
+++ b/ao-tools/altosui/.gitignore
@@ -1,14 +1,19 @@
 windows/
 linux/
 windows/
 linux/

-darwin/
+macosx/

 fat/
 Manifest.txt
 fat/
 Manifest.txt

+Manifest-fat.txt

 libaltosJNI
 classes
 altosui
 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
 *.jar
 *.class

-altosui

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index ed7e2f762292e87c9e89c539dd21c768f379cf28..13bceae26892338a33cb9b4949d323bd0aea230e 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,4 +1,5 @@
 JAVAROOT=classes
 JAVAROOT=classes

+AM_JAVACFLAGS=-encoding UTF-8

 
 CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
 
 
 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)
 
 
 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)
 
 
 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) \
 
 clean-local:
        -rm -rf classes/altosui $(JAR) $(FATJAR) \


@@ -139,7 +140,7 @@ $(LIBALTOS):
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 
        -rm -f "$@"
        $(LN_S) ../libaltos/"$@" .
 

-$(FREETTS_CLASS): Makefile
+$(FREETTS_CLASS):

        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 

diff --git a/ao-tools/altosui/altos-windows.nsi b/ao-tools/altosui/altos-windows.nsi
index c8539a5cb6835284bd0405216bfbfcbf41ff194b..6ebec2141e8575ee9eb230498bb1dce98391abce 100644 (file)
--- a/ao-tools/altosui/altos-windows.nsi
+++ b/ao-tools/altosui/altos-windows.nsi
@@ -45,7 +45,7 @@ SectionEnd
 Section "AltosUI Application"
        SetOutPath $INSTDIR
 
 Section "AltosUI Application"
        SetOutPath $INSTDIR
 

-       File "altosui.jar"
+       File "altosui-fat.jar"

        File "cmudict04.jar"
        File "cmulex.jar"
        File "cmu_time_awb.jar"
        File "cmudict04.jar"
        File "cmulex.jar"
        File "cmu_time_awb.jar"


@@ -58,11 +58,11 @@ Section "AltosUI Application"
 
        File "../../icon/*.ico"
 
 
        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"
 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"
 SectionEnd
 
 Section "TeleMetrum and TeleDongle Firmware"

diff --git a/ao-tools/libaltos/Makefile.am b/ao-tools/libaltos/Makefile.am
index 2f1d6fca2d17b05c385f6f84a477f6691dcc664c..4d29d80e44bab58355c2af6fcb682e03490ffc0e 100644 (file)
--- a/ao-tools/libaltos/Makefile.am
+++ b/ao-tools/libaltos/Makefile.am
@@ -1,5 +1,6 @@
 JAVAC=javac
 AM_CFLAGS="-I$(JVM_INCLUDE)"
 JAVAC=javac
 AM_CFLAGS="-I$(JVM_INCLUDE)"

+AM_JAVACFLAGS=-encoding UTF-8

 
 lib_LTLIBRARIES=libaltos.la
 
 
 lib_LTLIBRARIES=libaltos.la