diff --git a/msvc/Makefile b/msvc/Makefile index 9163d5b98..d1b073952 100644 --- a/msvc/Makefile +++ b/msvc/Makefile @@ -321,7 +321,7 @@ windows-nsi: IF EXIST $(TAR_DIR) $(RMDIR) $(TAR_DIR) $(MKDIR) $(TAR_DIR) $(MAKE) flatinstall prefix=$(TAR_DIR) - util\ecl_nsi.bat %%CD%%\$(srcdir)\util\ecl.nsi $(TAR_DIR) + util\ecl_nsi.bat %%CD%%\$(srcdir)\util\ecl.nsi $(TAR_DIR) $(ECL_VERSION) $(MKNSI) $(TAR_DIR)/ecl.nsi $(MV) $(TAR_DIR)\Setup.exe ecl-$(ECL_VERSION).exe $(RMDIR) $(TAR_DIR) diff --git a/msvc/util/ecl_nsi.bat b/msvc/util/ecl_nsi.bat index 9c3fa48ef..c1b092288 100644 --- a/msvc/util/ecl_nsi.bat +++ b/msvc/util/ecl_nsi.bat @@ -7,10 +7,11 @@ SET source=%1 SET where=%2 CD %where% SET dest=ecl.nsi +SET version=%3 -type %source%1 | ..\c\cut.exe "@ECLDIR@" "%where%" > %dest% -dir /s /b /a:-d | ..\c\cut.exe "ecl.exe" "/DELETE/" "ecl.nsi" "/DELETE/" "%where%\\" "" > ../aux_files -dir /s /b /a:d | ..\c\cut.exe "ecl.exe" "/DELETE/" "ecl.nsi" "/DELETE/" "%where%\\" "" > ../aux_dirs +type %source%1 | ..\c\cut.exe "@ECLDIR@" "%where%" "@ECLVERSION@" "%version%" > %dest% +dir /b /a:-d | ..\c\cut.exe "ecl.exe" "/DELETE/" "ecl.nsi" "/DELETE/" "%where%\\" "" > ../aux_files +dir /b /a:d | ..\c\cut.exe "ecl.exe" "/DELETE/" "ecl.nsi" "/DELETE/" "%where%\\" "" > ../aux_dirs echo HOLA for /f %%i in (../aux_dirs) do @echo %%i for /f %%i in (../aux_dirs) do @echo File /r "${ECLDIR}\%%i" >> %dest% diff --git a/src/util/ecl.nsi1 b/src/util/ecl.nsi1 index a41770710..ef4783997 100644 --- a/src/util/ecl.nsi1 +++ b/src/util/ecl.nsi1 @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "ECL" -!define PRODUCT_VERSION "0.9d" +!define PRODUCT_VERSION "@ECLVERSION@" !define PRODUCT_PUBLISHER "Juan Jose Garcia Ripoll" !define PRODUCT_WEB_SITE "http://ecls.sourceforge.net" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\ecl.exe"