msi: move git.ico so all installers can access it

The git.ico was moved to the main `build-extra` directory so that all installers have access to it from a common, shared location. Updated the `install.iss` file to point to the icon's new location. Also updated the binder arguments passed to `light.exe` in MSI's `release.sh` file--it's no longer necessary to have to "reach into" `../installer` for various files such as the icon and the ReleaseNotes.* files. Signed-off-by: Craig E. Shea <craig.e.shea@gmail.com>
github · May 23, 2016 · 90ac80d · 90ac80d
1 parent 58db638
commit 90ac80d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/installer/git.ico → git.ico b/installer/git.ico → git.ico
diff --git a/installer/install.iss b/installer/install.iss
@@ -73,7 +73,7 @@ VersionInfoVersion={#APP_VERSION}
 #endif
 
 ; Cosmetic
-SetupIconFile={#SourcePath}\git.ico
+SetupIconFile={#SourcePath}\..\git.ico
 WizardImageBackColor=clWhite
 WizardImageStretch=no
 WizardImageFile={#SourcePath}\git.bmp

diff --git a/msi/release.sh b/msi/release.sh
@@ -184,6 +184,6 @@ wix/light.exe \
 	obj/GitProduct.wixobj \
 	obj/GitComponents.wixobj \
 	-o $TARGET -ext WixUtilExtension \
-	-b / -b ../installer &&
+	-b / -b ../ &&
 echo "Success! You will find the new .msi at \"$TARGET\"." ||
 die "Could not generate $TARGET"