projects / fw / altos / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
windows: Use new windows stub to launch applications
[fw/altos] / altosui / Makefile.am
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 3a2a186399aa76c3a48599773ad98c1dbb1bd8e8..e6de1d97345ddb66b7945f88b140b3fc20c72c42 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 
 JAVAROOT=classes
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 man_MANS=altosui.1
 
@@ -10,72 +10,30 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto
 
 bin_SCRIPTS=altosui
 
-altosui_BT = \
-       AltosBTDevice.java \
-       AltosBTDeviceIterator.java \
-       AltosBTManage.java \
-       AltosBTKnown.java
-
 altosui_JAVA = \
-       GrabNDrag.java \
        AltosAscent.java \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
        AltosConfig.java \
-       AltosConfigFreqUI.java \
        AltosConfigUI.java \
        AltosConfigPyroUI.java \
        AltosConfigureUI.java \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
-       AltosCSV.java \
-       AltosCSVUI.java \
        AltosDescent.java \
-       AltosDeviceUIDialog.java \
-       AltosDisplayThread.java \
-       AltosEepromDelete.java \
-       AltosEepromManage.java \
-       AltosEepromMonitorUI.java \
-       AltosEepromSelect.java \
-       AltosFlashUI.java \
-       AltosFlightDisplay.java \
-       AltosFlightInfoTableModel.java \
-       AltosFlightStats.java \
-       AltosFlightStatsTable.java \
        AltosFlightStatus.java \
        AltosFlightStatusUpdate.java \
        AltosFlightUI.java \
-       AltosFreqList.java \
        Altos.java \
        AltosIdleMonitorUI.java \
        AltosIgniteUI.java \
        AltosIgnitor.java \
        AltosLaunch.java \
        AltosLaunchUI.java \
-       AltosInfoTable.java \
-       AltosKML.java \
        AltosLanded.java \
-       AltosLed.java \
-       AltosLights.java \
        AltosPad.java \
-       AltosUIPreferencesBackend.java \
-       AltosRomconfigUI.java \
-       AltosScanUI.java \
-       AltosSerial.java \
-       AltosSerialInUseException.java \
-       AltosSiteMap.java \
-       AltosSiteMapPreload.java \
-       AltosSiteMapCache.java \
-       AltosSiteMapTile.java \
        AltosUI.java \
-       AltosWriter.java \
-       AltosGraph.java \
-       AltosGraphDataPoint.java \
-       AltosGraphDataSet.java \
-       AltosGraphUI.java \
-       AltosDataChooser.java \
-       AltosVoice.java \
-       $(altosui_BT)
+       AltosGraphUI.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -105,7 +63,7 @@ LIBALTOS= \
        altos.dll
 
 desktopdir = $(datadir)/applications
-desktop_file = altos.desktop
+desktop_file = altusmetrum-altosui.desktop
 desktop_SCRIPTS = $(desktop_file)
 
 JAR=altosui.jar
@@ -113,41 +71,56 @@ JAR=altosui.jar
 FATJAR=altosui-fat.jar
 
 # Icons
-ICONDIR=$(top_srcdir)/icon
+ICONDIR=../icon
 
 JAVA_ICONS=\
-       $(ICONDIR)/altus-metrum-16.png \
-       $(ICONDIR)/altus-metrum-32.png \
-       $(ICONDIR)/altus-metrum-48.png \
-       $(ICONDIR)/altus-metrum-64.png \
-       $(ICONDIR)/altus-metrum-128.png \
-       $(ICONDIR)/altus-metrum-256.png
-
-ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
-       $(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
-       $(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
+       $(ICONDIR)/altusmetrum-altosui-16.png \
+       $(ICONDIR)/altusmetrum-altosui-32.png \
+       $(ICONDIR)/altusmetrum-altosui-48.png \
+       $(ICONDIR)/altusmetrum-altosui-64.png \
+       $(ICONDIR)/altusmetrum-altosui-128.png\
+       $(ICONDIR)/altusmetrum-altosui-256.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
-       -C $(ICONDIR) altus-metrum-32.png \
-       -C $(ICONDIR) altus-metrum-48.png \
-       -C $(ICONDIR) altus-metrum-64.png \
-       -C $(ICONDIR) altus-metrum-128.png \
-       -C $(ICONDIR) altus-metrum-256.png \
-       -C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-       -C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-       -C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
-
-WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
+ICONJAR= \
+       -C $(ICONDIR) altusmetrum-altosui-16.png \
+       -C $(ICONDIR) altusmetrum-altosui-32.png \
+       -C $(ICONDIR) altusmetrum-altosui-48.png \
+       -C $(ICONDIR) altusmetrum-altosui-64.png \
+       -C $(ICONDIR) altusmetrum-altosui-128.png\
+       -C $(ICONDIR) altusmetrum-altosui-256.png
+
+WINDOWS_ICONS  =\
+       $(ICONDIR)/altusmetrum-altosui.ico \
+       $(ICONDIR)/altusmetrum-altosui.exe
+       $(ICONDIR)/application-vnd.altusmetrum.eeprom.ico \
+       $(ICONDIR)/application-vnd.altusmetrum.eeprom.exe \
+       $(ICONDIR)/application-vnd.altusmetrum.telemetry.ico \
+       $(ICONDIR)/application-vnd.altusmetrum.telemetry.exe
+
+MACOSX_ICONS   =\
+       $(ICONDIR)/altusmetrum-altosui.icns \
+       $(ICONDIR)/application-vnd.altusmetrum.eeprom.icns \
+       $(ICONDIR)/application-vnd.altusmetrum.telemetry.icns
+
+LINUX_ICONS    =\
+       $(ICONDIR)/altusmetrum-altosui.svg \
+       $(ICONDIR)/application-vnd.altusmetrum.eeprom.svg \
+       $(ICONDIR)/application-vnd.altusmetrum.telemetry.svg
+
+LINUX_MIMETYPE =\
+       $(ICONDIR)/org-altusmetrum-mimetypes.xml
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
-FIRMWARE_TD=$(FIRMWARE_TD_0_2)
+FIRMWARE_TD_3_0=$(top_srcdir)/src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx
+FIRMWARE_TD=$(FIRMWARE_TD_0_2) $(FIRMWARE_TD_3_0)
 
 FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx
 FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx
 FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
+FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0)
 
 FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
@@ -161,7 +134,13 @@ FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0)
 FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx
 FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI)
+FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx
+FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0)
+
+FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA)
 
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
@@ -184,14 +163,14 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 
 LINUX_LIBS=libaltos32.so libaltos64.so
 
-LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../icon/altusmetrum.svg
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICONS)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICONS)
 
 all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
@@ -199,12 +178,12 @@ clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
-               altosui altosui-test altosui-jdb macosx linux
+               altosui altosui-test altosui-jdb macosx linux *.desktop
 
 EXTRA_DIST = $(desktop_file).in
 
 $(desktop_file): $(desktop_file).in
-       sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/altos.desktop.in > $@
+       sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
        chmod +x $@
 
 if FATINSTALL
@@ -238,7 +217,6 @@ else
 fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
-
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar
@@ -276,8 +254,12 @@ altosui: Makefile
        chmod +x $@
 
 altosui-test: Makefile
-       echo "#!/bin/sh" > $@
-       echo 'exec java -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+       echo '#!/bin/sh' > $@
+       echo 'dir="$$(dirname $$0)"' >> $@
+       echo 'cd "$$dir"' >> $@
+       echo 'altosui="$$(pwd -P)"' >> $@
+       echo 'altos="$$(dirname $$altosui)"' >> $@
+       echo 'exec java -Djava.library.path="$$altos/libaltos/.libs" -jar "$$altosui/altosui.jar" "$$@"' >> $@
        chmod +x $@
 
 altosui-jdb: Makefile
@@ -364,6 +346,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        cp -a $(DOC) macosx/Doc
        cp -p Info.plist macosx/AltosUI.app/Contents
        mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
+       cp -p $(MACOSX_ICONS) macosx/AltosUI.app/Contents/Resources
        cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
        cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java
@@ -374,7 +357,6 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        cp -p $(MACOSX_EXTRA) macosx/AltOS-$(VERSION)
        genisoimage -D -V AltOS-$(VERSION) -no-pad -r -apple -o $@ macosx
 
-$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
+$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi Instdrv/NSIS/Includes/java.nsh
        -rm -f $@
-       makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-
+       makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi || (cat altos-windows.log && exit 1)
AltOS - the operating system for Altus Metrum products