autofill nsi files with lasso version number

6 files changed, 17 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 688292fd..af01d940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,9 @@ VERSION_MAJOR=`echo $VERSION | $SED -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\1/'`
 VERSION_MINOR=`echo $VERSION | $SED -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\2/'`
 VERSION_RELEASE=`echo $VERSION | $SED -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\3/'`
 changequote([, ])dnl
+VERSION_UNDERSCORED=`echo $VERSION | $SED -e 's/\./_/g'`
+AC_SUBST(VERSION_UNDERSCORED)
+
 
 version_decimal=`expr $VERSION_MAJOR \* 10000 + $VERSION_MINOR \* 100 + $VERSION_RELEASE`
 windows_version=`echo $VERSION_MAJOR,$VERSION_MINOR,$VERSION_RELEASE,0`
@@ -755,6 +758,10 @@ tests/data/sp1-la/Makefile
 lasso.pc
 win32/Makefile
 win32/nsis/Makefile
+win32/nsis/jlasso-lite.nsi
+win32/nsis/lasso-deps.nsi
+win32/nsis/lasso-full.nsi
+win32/nsis/lasso-lite.nsi
 ])
 
 languages_available=`echo $languages_available | sed -e "s/^ //" `
diff --git a/win32/nsis/Makefile.am b/win32/nsis/Makefile.am
index 4affa52c..6aaf07ad 100644
--- a/win32/nsis/Makefile.am
+++ b/win32/nsis/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST =  lasso-deps.nsi lasso-full.nsi jlasso-lite.nsi lasso-lite.nsi lasso.ico
+EXTRA_DIST =  lasso-deps.nsi.in lasso-full.nsi.in jlasso-lite.nsi.in lasso-lite.nsi.in lasso.ico
diff --git a/win32/nsis/jlasso-lite.nsi b/win32/nsis/jlasso-lite.nsi.in
index ec342c3a..04842d5b 100755..100644
--- a/win32/nsis/jlasso-lite.nsi
+++ b/win32/nsis/jlasso-lite.nsi.in
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Liberty Alliance Single Sign On Java"
-!define PRODUCT_VERSION "0.6.0"
+!define PRODUCT_VERSION "@VERSION@"
 !define PRODUCT_PUBLISHER "Entr'ouvert"
 !define PRODUCT_WEB_SITE "http://lasso.entrouvert.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
diff --git a/win32/nsis/lasso-deps.nsi b/win32/nsis/lasso-deps.nsi.in
index b6309a4f..a11a09c7 100644
--- a/win32/nsis/lasso-deps.nsi
+++ b/win32/nsis/lasso-deps.nsi.in
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "LASSO dependencies"
-!define PRODUCT_VERSION "0.6.0"
+!define PRODUCT_VERSION "@VERSION@"
 !define PRODUCT_PUBLISHER "Entr'ouvert"
 !define PRODUCT_WEB_SITE "http://lasso.entrouvert.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -48,7 +48,7 @@ SetCompressor bzip2
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Install-deps-0_6_0.exe"
+OutFile "Install-deps-@VERSION_UNDERSCORED@.exe"
 InstallDir "$SYSDIR"
 ShowInstDetails show
 ShowUnInstDetails show
diff --git a/win32/nsis/lasso-full.nsi b/win32/nsis/lasso-full.nsi.in
index c079b063..98980b05 100644
--- a/win32/nsis/lasso-full.nsi
+++ b/win32/nsis/lasso-full.nsi.in
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Liberty Alliance Single Sign On and all dependencies"
-!define PRODUCT_VERSION "0.6.0"
+!define PRODUCT_VERSION "@VERSION@"
 !define PRODUCT_PUBLISHER "Entr'ouvert"
 !define PRODUCT_WEB_SITE "http://www.entrouvert.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -48,7 +48,7 @@ SetCompressor bzip2
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Install-full-0_6_0.exe"
+OutFile "Install-full-@VERSION_UNDERSCORED@.exe"
 InstallDir "$SYSDIR"
 ShowInstDetails show
 ShowUnInstDetails show
@@ -99,7 +99,7 @@ Section "LIBINTL: Library for native language support." SEC08
   File "c:\cygwin\usr\local\lib\intl.dll"
 SectionEnd
 
-Section "L.A.S.S.O. version 0.6.0" SEC09
+Section "Lasso version @VERSION@" SEC09
   File  "..\..\lasso\.libs\liblasso-3.dll"
 SectionEnd
 
diff --git a/win32/nsis/lasso-lite.nsi b/win32/nsis/lasso-lite.nsi.in
index 4f708320..7f2a3255 100644
--- a/win32/nsis/lasso-lite.nsi
+++ b/win32/nsis/lasso-lite.nsi.in
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Liberty Alliance Single Sign On"
-!define PRODUCT_VERSION "0.6.0"
+!define PRODUCT_VERSION "@VERSION@"
 !define PRODUCT_PUBLISHER "Entr'ouvert"
 !define PRODUCT_WEB_SITE "http://www.entrouvert.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -48,7 +48,7 @@ SetCompressor bzip2
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Install-lite-0_6_0.exe"
+OutFile "Install-lite-@VERSION_UNDERSCORED@.exe"
 InstallDir "$SYSDIR"
 ShowInstDetails show
 ShowUnInstDetails show
@@ -58,7 +58,7 @@ Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
 
-Section "L.A.S.S.O. version 0.6.0" SEC01
+Section "Lasso version @VERSION@" SEC01
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   File "..\..\lasso\.libs\liblasso-3.dll"