first cut at turnon scripts for EasyTimer v2

[fw/altos] / micropeak / Makefile.am

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 017f5348d5ddb015ea9781b5c5b22c613d72bdaf..4a93800d287c10c5ed8cb08f40297f939cf8a148 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,4 @@
 # location of code signing key, et al
-CODEKEYDIR=~/altusmetrumllc/ssl.com
  
 JAVAROOT=classes
 AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
@@ -94,6 +93,13 @@ LINUX_ICONS  =\
 LINUX_MIMETYPE =\
        $(ICONDIR)/org-altusmetrum-mimetypes.xml
 
+FIRMWARE_MP_0_1=$(top_srcdir)/src/micropeak/micropeak-v0.1-$(VERSION).ihx
+FIRMWARE_MP=$(FIRMWARE_MP_0_1)
+FIRMWARE_MS_1_0=$(top_srcdir)/src/microsplash/microsplash-v1.0-$(VERSION).ihx
+FIRMWARE_MS=$(FIRMWARE_MS_1_0)
+
+FIRMWARE=$(FIRMWARE_MP) $(FIRMWARE_MS)
+
 desktopdir = $(datadir)/applications
 desktop_file = altusmetrum-micropeak.desktop
 desktop_SCRIPTS = $(desktop_file)
@@ -142,6 +148,7 @@ MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
 MACOSX_INSTALL=../altosui/install-macosx ../altosui/ask-pass
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
+MACOSX_EXTRA=$(FIRMWARE)
 
 $(MACOSX_DRIVER_0):
        wget -O $@ $(MACOSX_DRIVER_0_URL)
@@ -155,7 +162,7 @@ WINDOWS_DRIVER=CDM_v2.12.00_WHQL_Certified.exe
 $(WINDOWS_DRIVER):
        wget -O "$(WINDOWS_DRIVER)" "$(WINDOWS_DRIVER_URL)"
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER)
+WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER)
 
 if FATINSTALL
 
@@ -324,7 +331,7 @@ $(LINUX_SH): $(LINUX_DIST) $(srcdir)/../altosui/linux-install.sh
        sed 's/AltOS/MicroPeak/g' $(srcdir)/../altosui/linux-install.sh | cat - $(LINUX_DIST) > $@
        chmod +x $@
 
-$(MACOSX_DIST): $(MACOSX_FILES)
+$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        -rm -f $@
        -rm -rf macosx
        mkdir macosx
@@ -335,7 +342,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        cp -a $(DOC) macosx/Doc
        cp -p Info.plist macosx/MicroPeak.app/Contents
        cp -p $(MACOSX_DRIVERS) macosx
-       mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
+       mkdir -p macosx/MicroPeak-$(VERSION) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(MACOSX_ICONS) macosx/MicroPeak.app/Contents/Resources
        cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar
        cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java
@@ -343,14 +350,17 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        cp -p $(ALTOSUILIB_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(JFREECHART_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(JCOMMON_CLASS) macosx/MicroPeak.app/Contents/Resources/Java
+       cp -p $(MACOSX_EXTRA) macosx/MicroPeak-$(VERSION)
        genisoimage -D -V MicroPeak-$(VERSION) -no-pad -r -apple -o $@ macosx
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
        -rm -f $@
        makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)
-       jsign --keystore $(CODEKEYDIR)/altus_metrum,_llc.p12 --alias 1 \
-               --storetype PKCS12 --storepass `cat $(CODEKEYDIR)/password` \
-               --tsaurl http://ts.ssl.com --tsmode RFC3161 $@
+       if [ "$(HAVE_WINDOWS_KEY)" = "yes" ]; then \
+       jsign --keystore "$(WINDOWSKEYFILE)" --alias 1 \
+               --storetype PKCS12 --storepass `cat "$(WINDOWSKEYPASSFILE)"` \
+               --tsaurl http://ts.ssl.com --tsmode RFC3161 $@ ; \
+       fi
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@