diff options
| author | Keith Packard <keithp@keithp.com> | 2010-09-04 18:20:45 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-09-04 18:21:41 -0700 |
| commit | 044fd27449c70474f51b99dec25fd23d3c03a559 (patch) | |
| tree | 7adf4302895fa3d67790c613444253ba41c393b0 | |
| parent | 148b927c3b8bc7b7b5c5356392032faf2b1203d3 (diff) | |
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>
| -rw-r--r-- | ao-tools/altosui/.gitignore | 15 | ||||
| -rw-r--r-- | ao-tools/altosui/Makefile.am | 7 | ||||
| -rw-r--r-- | ao-tools/altosui/altos-windows.nsi | 6 | ||||
| -rw-r--r-- | ao-tools/libaltos/Makefile.am | 1 |
4 files changed, 18 insertions, 11 deletions
diff --git a/ao-tools/altosui/.gitignore b/ao-tools/altosui/.gitignore index 63672058..89be1d53 100644 --- a/ao-tools/altosui/.gitignore +++ b/ao-tools/altosui/.gitignore @@ -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 diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am index ed7e2f76..13bceae2 100644 --- a/ao-tools/altosui/Makefile.am +++ b/ao-tools/altosui/Makefile.am @@ -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)"/"$@" . diff --git a/ao-tools/altosui/altos-windows.nsi b/ao-tools/altosui/altos-windows.nsi index c8539a5c..6ebec214 100644 --- a/ao-tools/altosui/altos-windows.nsi +++ b/ao-tools/altosui/altos-windows.nsi @@ -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" diff --git a/ao-tools/libaltos/Makefile.am b/ao-tools/libaltos/Makefile.am index 2f1d6fca..4d29d80e 100644 --- a/ao-tools/libaltos/Makefile.am +++ b/ao-tools/libaltos/Makefile.am @@ -1,5 +1,6 @@ JAVAC=javac AM_CFLAGS="-I$(JVM_INCLUDE)" +AM_JAVACFLAGS=-encoding UTF-8 lib_LTLIBRARIES=libaltos.la |