summaryrefslogtreecommitdiff
path: root/ao-tools
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-09-04 17:59:11 -0700
committerKeith Packard <keithp@keithp.com>2010-09-04 18:21:41 -0700
commitaed59e1c057c13e28fd368dc2592aa4628211097 (patch)
tree2f4efb9e88c9e0a70274f064c418f4b8fa33dcc0 /ao-tools
parent2808bba3efa1cff133cc060dabff06fab8b75388 (diff)
Add version numbers to released files. Set version to 0.7.1
Instead of using git revision counts for version numbers, use explicit versions numbers configured in the configure.ac file. Expose published files with version numbers. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao-tools')
-rw-r--r--ao-tools/altosui/Makefile.am8
-rw-r--r--ao-tools/altosui/altos-windows.nsi4
2 files changed, 6 insertions, 6 deletions
diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 20c8b26d..ed7e2f76 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -66,8 +66,8 @@ JAVA_ICON=$(top_srcdir)/icon/altus-metrum-16x16.jpg
WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
# Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2.ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0.ihx
+FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
# Distribution targets
@@ -77,7 +77,7 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
-LINUX_FILES=$(FAT_FILES) libaltos.so
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
@@ -162,4 +162,4 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
- makensis -Oaltos-windows.log "-XOutFile $@" altos-windows.nsi \ No newline at end of file
+ makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi \ No newline at end of file
diff --git a/ao-tools/altosui/altos-windows.nsi b/ao-tools/altosui/altos-windows.nsi
index 6f38ac0e..c8539a5c 100644
--- a/ao-tools/altosui/altos-windows.nsi
+++ b/ao-tools/altosui/altos-windows.nsi
@@ -69,8 +69,8 @@ Section "TeleMetrum and TeleDongle Firmware"
SetOutPath $INSTDIR
- File "../../src/telemetrum-v1.0/telemetrum-v1.0.ihx"
- File "../../src/teledongle-v0.2/teledongle-v0.2.ihx"
+ File "../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+ File "../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
SectionEnd