summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ao-tools/altosui/Makefile.am8
-rw-r--r--ao-tools/altosui/altos-windows.nsi4
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile2
-rw-r--r--src/Makefile.proto6
-rw-r--r--src/Version.in1
-rw-r--r--src/teledongle-v0.1/.gitignore2
-rw-r--r--src/teledongle-v0.1/Makefile.defs2
-rw-r--r--src/teledongle-v0.2/.gitignore2
-rw-r--r--src/teledongle-v0.2/Makefile.defs2
-rw-r--r--src/telemetrum-v0.1-sirf/.gitignore2
-rw-r--r--src/telemetrum-v0.1-sirf/Makefile.defs2
-rw-r--r--src/telemetrum-v0.1-sky/.gitignore2
-rw-r--r--src/telemetrum-v0.1-sky/Makefile.defs2
-rw-r--r--src/telemetrum-v1.0/.gitignore2
-rw-r--r--src/telemetrum-v1.0/Makefile.defs2
-rw-r--r--src/tidongle/.gitignore2
-rw-r--r--src/tidongle/Makefile.defs2
18 files changed, 24 insertions, 23 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
diff --git a/configure.ac b/configure.ac
index 19ae0ac8..d376af3f 100644
--- 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 24f562e1..95d24425 100644
--- 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 59a3b8a6..b23eb257 100644
--- 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
index 00000000..aff9490b
--- /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 96c802bd..9826814b 100644
--- 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 be7741d8..ceb80b7a 100644
--- 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 af79a766..f6ea8c6c 100644
--- 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 cbec7805..ea9713b6 100644
--- 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 6d584f36..7698f5aa 100644
--- 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 2ce6e6ed..a7310fbc 100644
--- 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 5a9fafb5..d25d7ad9 100644
--- 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 098ac547..000287ba 100644
--- 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 76228093..c2212151 100644
--- 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 624ce6e8..010578df 100644
--- 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 3323f640..3888a0f9 100644
--- 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 fdd51732..0e13cb20 100644
--- a/src/tidongle/Makefile.defs
+++ b/src/tidongle/Makefile.defs
@@ -1,4 +1,4 @@
-PROG = tidongle.ihx
+PROG = tidongle-$(VERSION).ihx
SRC = \
$(TI_SRC)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-15 22:17:15 +0000