projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Add support for MicroPeak v2.0
[fw/altos]
/
micropeak
/
Makefile.am
diff --git
a/micropeak/Makefile.am
b/micropeak/Makefile.am
index 7ad2c102c191271e976bd32e5cd7a7b20ca6b00b..23ec077ec4cda796c35f9b4d4970c2ec93621465 100644
(file)
--- a/
micropeak/Makefile.am
+++ b/
micropeak/Makefile.am
@@
-1,5
+1,5
@@
JAVAROOT=classes
JAVAROOT=classes
-AM_JAVACFLAGS=
-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=
$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
man_MANS=micropeak.1
man_MANS=micropeak.1
@@
-14,18
+14,14
@@
micropeakdir=$(datadir)/java
micropeak_JAVA= \
MicroPeak.java \
MicroData.java \
micropeak_JAVA= \
MicroPeak.java \
MicroData.java \
- MicroDataPoint.java \
MicroDownload.java \
MicroExport.java \
MicroFile.java \
MicroFrame.java \
MicroDownload.java \
MicroExport.java \
MicroFile.java \
MicroFrame.java \
- MicroGraph.java \
MicroRaw.java \
MicroSave.java \
MicroSerial.java \
MicroSerialLog.java \
MicroRaw.java \
MicroSave.java \
MicroSerial.java \
MicroSerialLog.java \
- MicroStats.java \
- MicroStatsTable.java \
MicroFileChooser.java \
MicroDeviceDialog.java \
MicroUSB.java
MicroFileChooser.java \
MicroDeviceDialog.java \
MicroUSB.java
@@
-99,7
+95,7
@@
desktopdir = $(datadir)/applications
desktop_file = altusmetrum-micropeak.desktop
desktop_SCRIPTS = $(desktop_file)
desktop_file = altusmetrum-micropeak.desktop
desktop_SCRIPTS = $(desktop_file)
-all-local: micropeak-test micropeak-jdb $(JAR)
+all-local: micropeak-test micropeak-jdb $(JAR)
$(MDWN)
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
@@
-107,7
+103,7
@@
clean-local:
altoslib_*.jar altosuilib_*.jar \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
altoslib_*.jar altosuilib_*.jar \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
- micropeak-windows.nsi *.desktop
+ micropeak-windows.nsi *.desktop
*.mdwn
EXTRA_DIST = $(desktop_file).in
EXTRA_DIST = $(desktop_file).in
@@
-119,6
+115,8
@@
LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
LINUX_SH=MicroPeak-Linux-$(VERSION).sh
MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
LINUX_SH=MicroPeak-Linux-$(VERSION).sh
MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
+MDWN=$(VERSION).mdwn
+MDWNTMPL=mdwn.tmpl
MICROPEAK_DOC=$(top_srcdir)/doc/micropeak.pdf
MICROPEAK_DOC=$(top_srcdir)/doc/micropeak.pdf
@@
-139,7
+137,8
@@
MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0)
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
+MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
$(MACOSX_DRIVER_0):
wget -O $@ $(MACOSX_DRIVER_0_URL)
$(MACOSX_DRIVER_0):
wget -O $@ $(MACOSX_DRIVER_0_URL)
@@
-157,18
+156,17
@@
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDO
if FATINSTALL
if FATINSTALL
-FATTARGET=$(FATDIR)/$(VERSION)
+FATTARGET=$(FATDIR)/
MicroPeak/releases/
$(VERSION)
-LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
+MDWN_TARGET=$(FATDIR)/MicroPeak/releases/$(MDWN)
+RELNOTES=release-notes-$(VERSION).html
+RELNOTES_SRC=$(top_builddir)/doc/$(RELNOTES)
+RELNOTES_TARGET=$(FATTARGET)/$(RELNOTES)
-fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
-
-$(LINUX_DIST_TARGET): $(LINUX_DIST)
- mkdir -p $(FATTARGET)
- cp -p $< $@
+fat-install: $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET) $(MDWN_TARGET) $(RELNOTES_TARGET)
$(LINUX_SH_TARGET): $(LINUX_SH)
mkdir -p $(FATTARGET)
$(LINUX_SH_TARGET): $(LINUX_SH)
mkdir -p $(FATTARGET)
@@
-182,10
+180,22
@@
$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
mkdir -p $(FATTARGET)
cp -p $< $@
-else
-fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
+$(MDWN_TARGET): $(MDWN)
+ mkdir -p $(FATTARGET)
+ cp -p $< $@
+
+$(RELNOTES_TARGET): $(RELNOTES_SRC)
+ mkdir -p $(FATTARGET)
+ sh $(top_srcdir)/doc/install-html -d $(FATTARGET) $(RELNOTES_SRC)
+
endif
endif
+$(MDWN): $(MDWNTMPL)
+ sed -e 's/%version%/$(VERSION)/g' -e 's/%version_dash%/$(VERSION_DASH)/g' $(MDWNTMPL) > $@
+
+fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
+
+
micropeak: Makefile
echo "#!/bin/sh" > $@
echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
micropeak: Makefile
echo "#!/bin/sh" > $@
echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
@@
-212,12
+222,18
@@
$(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTO
$(ICONJAR) \
-C classes org \
-C ../libaltos libaltosJNI
$(ICONJAR) \
-C classes org \
-C ../libaltos libaltosJNI
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif
$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes org \
-C ../libaltos libaltosJNI
$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes org \
-C ../libaltos libaltosJNI
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif
classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
@@
-297,7
+313,8
@@
$(MACOSX_DIST): $(MACOSX_FILES)
-rm -rf macosx
mkdir macosx
cp -a MicroPeak.app macosx/
-rm -rf macosx
mkdir macosx
cp -a MicroPeak.app macosx/
- cp -a $(MACOSX_README) macosx/ReadMe.rtf
+ cp -a $(MACOSX_README) macosx/ReadMe-MicroPeak.rtf
+ cp -a $(MACOSX_INSTALL) macosx
cp -a $(DOC) macosx
cp -p Info.plist macosx/MicroPeak.app/Contents
cp -p $(MACOSX_DRIVERS) macosx
cp -a $(DOC) macosx
cp -p Info.plist macosx/MicroPeak.app/Contents
cp -p $(MACOSX_DRIVERS) macosx