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>

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 20c8b26d4bdbf0d014fa788c40ab667c7d081f6b..ed7e2f762292e87c9e89c539dd21c768f379cf28 100644 (file)
--- 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 6f38ac0e17c7bdbecc5191f31766be75180633db..c8539a5cb6835284bd0405216bfbfcbf41ff194b 100644 (file)
--- 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
 

diff --git a/configure.ac b/configure.ac
index 19ae0ac8c877553d62ab77e919604252f17881a5..d376af3f6dc66826f521bbffd49afc70146adb08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ fi
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
@@ -126,4 +125,5 @@ ao-tools/ao-view/Makefile
 ao-tools/libaltos/Makefile
 ao-tools/altosui/Makefile
 ao-utils/Makefile
+src/Version
 ])

diff --git a/src/Makefile b/src/Makefile
index 24f562e1062e109002cd6eafc2ba62b2f1dea33a..95d24425df9212f58ffe6a05897f8af9f83efa84 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,6 +4,8 @@
 #
 CC=sdcc
 
+include Version
+
 SUBDIRS=telemetrum-v1.0 teledongle-v0.2 telemetrum-v0.1-sky telemetrum-v0.1-sirf teledongle-v0.1 tidongle test
 
 all: all-recursive

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 59a3b8a616d7969a80f0ba24f12f85703aa6b6a3..b23eb2571255cdfea257e88c386393b0869a4ab7 100644 (file)
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -10,7 +10,7 @@ vpath ao-make-product.5c ..
 CC=sdcc
 
 ifndef VERSION
-VERSION=$(shell git describe)
+include ../Version
 endif
 
 CFLAGS=--model-small --debug --opt-code-speed
@@ -214,11 +214,9 @@ all: ../$(PROG)
 ../altitude.h: make-altitude
        nickle $< > $@
 
-ao_product.h: ao-make-product.5c always
+ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
-always:
-
 ao_product.rel: ao_product.c ao_product.h
        $(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<
 

diff --git a/src/Version.in b/src/Version.in
new file mode 100644 (file)
index 0000000..aff9490
--- /dev/null
+++ b/src/Version.in
@@ -0,0 +1 @@
+VERSION=@VERSION@

diff --git a/src/teledongle-v0.1/.gitignore b/src/teledongle-v0.1/.gitignore
index 96c802bd974bbb241970aef417d237d8a985e63d..9826814b390b237857bb99f96fcca7dc69db26e4 100644 (file)
--- a/src/teledongle-v0.1/.gitignore
+++ b/src/teledongle-v0.1/.gitignore
@@ -1,2 +1,2 @@
-teledongle-v0.1
+teledongle-v0.1*
 ao_product.h

diff --git a/src/teledongle-v0.1/Makefile.defs b/src/teledongle-v0.1/Makefile.defs
index be7741d889798be64b6577c83ba54131fdb31493..ceb80b7acd31a9da91af2243d7ee3b0cd2bb244f 100644 (file)
--- a/src/teledongle-v0.1/Makefile.defs
+++ b/src/teledongle-v0.1/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = teledongle-v0.1.ihx
+PROG = teledongle-v0.1-$(VERSION).ihx
 
 SRC = \
        $(TD_SRC) \

diff --git a/src/teledongle-v0.2/.gitignore b/src/teledongle-v0.2/.gitignore
index af79a7661cb2f4826e089b50f6626316cca58d05..f6ea8c6c74be76693d96dc6a2a1cbeec4036ef49 100644 (file)
--- a/src/teledongle-v0.2/.gitignore
+++ b/src/teledongle-v0.2/.gitignore
@@ -1,2 +1,2 @@
-teledongle-v0.2
+teledongle-v0.2*
 ao_product.h

diff --git a/src/teledongle-v0.2/Makefile.defs b/src/teledongle-v0.2/Makefile.defs
index cbec7805df5b45f651ab6b4f57b2b0a08e645e98..ea9713b6bb7a914715a326fb23a4ad0f735dc276 100644 (file)
--- a/src/teledongle-v0.2/Makefile.defs
+++ b/src/teledongle-v0.2/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = teledongle-v0.2.ihx
+PROG = teledongle-v0.2-$(VERSION).ihx
 
 SRC = \
        $(TD_SRC) \

diff --git a/src/telemetrum-v0.1-sirf/.gitignore b/src/telemetrum-v0.1-sirf/.gitignore
index 6d584f361708cbc5a36bdb25b3f8e6448057cdec..7698f5aac1813433ecb8f2d24ddd7ad4293bba45 100644 (file)
--- a/src/telemetrum-v0.1-sirf/.gitignore
+++ b/src/telemetrum-v0.1-sirf/.gitignore
@@ -1,2 +1,2 @@
-telemetrum-v0.1-sirf
+telemetrum-v0.1-sirf*
 ao_product.h

diff --git a/src/telemetrum-v0.1-sirf/Makefile.defs b/src/telemetrum-v0.1-sirf/Makefile.defs
index 2ce6e6ed2cdf31b5c821b00054d23ae8fc3d8d07..a7310fbc8ac6d00bbddc408d4531afa73e634fa4 100644 (file)
--- a/src/telemetrum-v0.1-sirf/Makefile.defs
+++ b/src/telemetrum-v0.1-sirf/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = telemetrum-v0.1-sirf.ihx
+PROG = telemetrum-v0.1-sirf-$(VERSION).ihx
 
 SRC = \
        $(TM_BASE_SRC) \

diff --git a/src/telemetrum-v0.1-sky/.gitignore b/src/telemetrum-v0.1-sky/.gitignore
index 5a9fafb5e50aa60cea427ce02e3d977161e21391..d25d7ad9f05b64370e5052c4b65fa986afed6ed0 100644 (file)
--- a/src/telemetrum-v0.1-sky/.gitignore
+++ b/src/telemetrum-v0.1-sky/.gitignore
@@ -1,2 +1,2 @@
-telemetrum-v0.1-sky
+telemetrum-v0.1-sky*
 ao_product.h

diff --git a/src/telemetrum-v0.1-sky/Makefile.defs b/src/telemetrum-v0.1-sky/Makefile.defs
index 098ac547aa8bebe5f735e6814f2f84f9afb29a62..000287ba2a983ac4c4f28f32afc2f1d3ec099149 100644 (file)
--- a/src/telemetrum-v0.1-sky/Makefile.defs
+++ b/src/telemetrum-v0.1-sky/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = telemetrum-v0.1-sky.ihx
+PROG = telemetrum-v0.1-sky-$(VERSION).ihx
 
 SRC = \
        $(TM_BASE_SRC) \

diff --git a/src/telemetrum-v1.0/.gitignore b/src/telemetrum-v1.0/.gitignore
index 762280930c7c6c8e142c834bb1142458792ab7b3..c2212151c7bc4630a9ce0c53d3a33079072cd7a6 100644 (file)
--- a/src/telemetrum-v1.0/.gitignore
+++ b/src/telemetrum-v1.0/.gitignore
@@ -1,2 +1,2 @@
-telemetrum-v0.2
+telemetrum-*
 ao_product.h

diff --git a/src/telemetrum-v1.0/Makefile.defs b/src/telemetrum-v1.0/Makefile.defs
index 624ce6e84e5febd303816cdd358df31ce6c7fe92..010578df6bad6ec0928d5fecd79a8658302f7cd2 100644 (file)
--- a/src/telemetrum-v1.0/Makefile.defs
+++ b/src/telemetrum-v1.0/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = telemetrum-v1.0.ihx
+PROG = telemetrum-v1.0-$(VERSION).ihx
 
 SRC = \
        $(TM_BASE_SRC) \

diff --git a/src/tidongle/.gitignore b/src/tidongle/.gitignore
index 3323f640646f02c957f739913c8c3e7f8d88656b..3888a0f9a2b82b73c971368f8af13fbca7daf6ca 100644 (file)
--- a/src/tidongle/.gitignore
+++ b/src/tidongle/.gitignore
@@ -1,2 +1,2 @@
-tidongle
+tidongle*
 ao_product.h

diff --git a/src/tidongle/Makefile.defs b/src/tidongle/Makefile.defs
index fdd517327b55e0336a5938c4c2654fac8a975872..0e13cb20e61efc27f2160bd4c6135077b5724129 100644 (file)
--- a/src/tidongle/Makefile.defs
+++ b/src/tidongle/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = tidongle.ihx
+PROG = tidongle-$(VERSION).ihx
 
 SRC = \
        $(TI_SRC)