summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-02-10 19:01:41 -0800
committerKeith Packard <keithp@keithp.com>2013-02-10 19:01:41 -0800
commit64399500ad1a7ad70452cbda4d60723b5904ca3d (patch)
tree0a5027120af54ccf17e19e9a0404497eb7070af7
parentcbd9dd989a662f41ddcb0c9e0f4453840687fd4a (diff)
Build Windows .nsi files in configure script
These need the library version numbers embedded in them. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--altosui/altos-windows.nsi.in (renamed from altosui/altos-windows.nsi)3
-rw-r--r--configure.ac2
-rw-r--r--micropeak/micropeak-windows.nsi.in (renamed from micropeak/micropeak-windows.nsi)4
3 files changed, 6 insertions, 3 deletions
diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi.in
index 20dd65f0..cde54b41 100644
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi.in
@@ -88,7 +88,8 @@ Section "AltosUI Application"
SetOutPath $INSTDIR
File "altosui-fat.jar"
- File "AltosLib.jar"
+ File "altoslib_@ALTOSLIB_VERSION@.jar"
+ File "altosuilib_@ALTOSUILIB_VERSION@.jar"
File "cmudict04.jar"
File "cmulex.jar"
File "cmu_time_awb.jar"
diff --git a/configure.ac b/configure.ac
index 354926c8..a1c8c4fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,9 +162,11 @@ altosuilib/Makefile
altosuilib/AltosUIVersion.java
altosui/Makefile
altosui/Info.plist
+altosui/altos-windows.nsi
libaltos/Makefile
micropeak/Makefile
micropeak/Info.plist
+micropeak/micropeak-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
ao-tools/Makefile
diff --git a/micropeak/micropeak-windows.nsi b/micropeak/micropeak-windows.nsi.in
index 4313ac28..656f8af3 100644
--- a/micropeak/micropeak-windows.nsi
+++ b/micropeak/micropeak-windows.nsi.in
@@ -68,8 +68,8 @@ Section "MicroPeak Application"
SetOutPath $INSTDIR
File "micropeak-fat.jar"
- File "AltosLib.jar"
- File "AltosUILib.jar"
+ File "altoslib_@ALTOSLIB_VERSION@.jar"
+ File "altosuilib_@ALTOSUILIB_VERSION@.jar"
File "jfreechart.jar"
File "jcommon.jar"