innosetup: build edit-git-bash.dll in release.sh

The Makefile was modified to ensure that `edit-git-bash.c` is always
compiled as a 32-bit DLL when the `edit-git-bash.dll` target is invoked.
InnoSetup in only 32-bit "aware", so even for the 64-bit distribution, a
32-bit DLL needs to be used.

The InnoSetup `release.sh` script was updated to include building
`edit-git-bash.dll`. The rendering of release notes was moved until after
all argument processing; this also had the advantage of placing the call
to `make` directly after it--these activities are sort of "pre-processing"
before the actual generation of the installer and made logical sense to
this developer.

Lastly, the `install.iss` file was updated to source the DLL from it's new
location in `build-extra`; the old edit-git-bash.dll in the `installer`
directory was deleted.

Signed-off-by: Craig E. Shea <[email protected]>

Author: fourpastmidnight

Makefile

@@ -1,10 +1,20 @@
+ARCH=
+CC=gcc
 CFLAGS=-O2 -Wall
 DLLINKFLAGS=-Wl,--kill-at -static-libgcc -shared
 
+ifeq ($(shell uname -m),x86_64)
+ifeq ($(ARCH),i686)
+CC = PATH=/mingw32/bin:$$PATH i686-w64-mingw32-gcc -march=i686
+endif
+endif
+
 all: edit-git-bash.dll
 
+# InnoSetup always uses the DLL target, and it must always be 32-bit
+# because InnoSetup is only 32-bit aware.
 edit-git-bash.dll: edit-git-bash.c
-	gcc $(CFLAGS) $(DLLINKFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) $(DLLINKFLAGS) -o $@ $^
 
 edit-git-bash.exe: edit-git-bash.c
-	gcc -DSTANDALONE_EXE $(CFLAGS) -o $@ $^
+	gcc -DSTANDALONE_EXE $(CFLAGS) -o $@ $^

installer/edit-git-bash.dll

@@ -105,7 +105,7 @@ Filename: {app}\ReleaseNotes.html; Description: View Release Notes; Flags: shell
 Source: {#SourcePath}\ReleaseNotes.html; DestDir: {app}; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore
 Source: {#SourcePath}\LICENSE.txt; DestDir: {app}; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore
 Source: {#SourcePath}\NOTICE.txt; DestDir: {app}; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore; Check: ParamIsSet('VSNOTICE')
-Source: {#SourcePath}\edit-git-bash.dll; Flags: dontcopy
+Source: {#SourcePath}\..\edit-git-bash.dll; Flags: dontcopy
 
 [Dirs]
 Name: "{app}\tmp"

installer/install.iss

@@ -51,8 +51,6 @@ case "$version" in
 *) die "InnoSetup requires a version that begins with a digit";;
 esac
 
-../render-release-notes.sh --css usr/share/git/
-
 # Evaluate architecture
 ARCH="$(uname -m)"
 
@@ -68,6 +66,12 @@ x86_64)
 	;;
 esac
 
+echo "Generating release notes to be included in the installer ..."
+../render-release-notes.sh --css usr/share/git/
+
+echo "Compiling edit-git-bash.dll ..."
+make -C ../ edit-git-bash.dll
+
 if test t = "$skip_files"
 then
 	LIST=