Bläddra i källkod

Pass the NSIS scripts their own version

Fixes CLIENT-163

Change-Id: I289924af7016878df3fa2b8ba9e9240f5528e5c7
Reviewed-on: http://gerrit.dmdirc.com/1771
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.6.5rc1
Chris Smith 13 år sedan
förälder
incheckning
5747dc82ea
1 ändrade filer med 7 tillägg och 5 borttagningar
  1. 7
    5
      installer/windows/makeInstallerNSIS.sh

+ 7
- 5
installer/windows/makeInstallerNSIS.sh Visa fil

@@ -64,12 +64,14 @@ cp ../../../../src/com/dmdirc/res/icon.ico icon.ico
64 64
 
65 65
 cd ..
66 66
 
67
-makensis -DVERSION="${TAGGED}" -V2 updater.nsi
68
-makensis -DVERSION="${TAGGED}" -V2 launcher.nsi
69
-makensis -DVERSION="${TAGGED}" -V2 installer.nsi
67
+for NSI in updater.nsi launcher.nsi installer.nsi; do
68
+	LASTCOMMIT=`git rev-list --max-count=1 HEAD -- $NSI`
69
+	NSISVERSION=`git describe --tags --always $LASTCOMMIT`
70
+	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
71
+done
70 72
 
71 73
 cd "${OLDDIR}"
72
-SRC="../../modules/installer/output/DMDirc-${TAGGED}-Setup.exe"
74
+SRC="../../modules/installer/output/DMDirc-Setup.exe"
73 75
 
74 76
 doRename=0
75 77
 if [ "${TAGGED}" != "" ]; then
@@ -119,4 +121,4 @@ if [ "${signEXE}" = "true" ]; then
119 121
 	signexe ${FULLINSTALLER}
120 122
 else
121 123
 	echo "Not Signing.."
122
-fi;
124
+fi;

Laddar…
Avbryt
Spara