From 064dc44ce236b94c7a9c83c715d97222e17328d4 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sat, 12 Jun 2010 12:22:49 +0200 Subject: [PATCH] Installer: Set OutputDir correctly even if compiling from within the IDE Previously, if compiling from within the Inno Setup IDE, a directory named "%OUTPUTDIR%" was created below SourceDir and the compiled setup was written to it, resulting in subsequent compiles to fail because the output file could not be overwritten as everything below SourceDir (including the compiled setup from the previous run) was included into the new setup. Signed-off-by: Sebastian Schuberth --- share/WinGit/install.iss | 2 +- share/WinGit/release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index cc04a391..83fe4e90 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -8,7 +8,7 @@ Compression=lzma2/ultra LZMAUseSeparateProcess=yes OutputBaseFilename={#emit APP_NAME+'-'+APP_VERSION} -OutputDir=%OUTPUTDIR% +OutputDir={#GetEnv('USERPROFILE')} SolidCompression=yes ; Uncomment the line below to be able to compile the script from within the IDE. diff --git a/share/WinGit/release.sh b/share/WinGit/release.sh index 642666f8..60af31ca 100644 --- a/share/WinGit/release.sh +++ b/share/WinGit/release.sh @@ -125,7 +125,7 @@ sed -e '/share\/msysGit/d' -e "s/msysGit/Git (version $version)/" \ < /etc/motd > $TMPDIR/etc/motd && cp /share/resources/gpl-2.0.rtf /share/resources/git.bmp /share/resources/gitsmall.bmp $TMPDIR && homewinpath=$(cd ~ ; pwd -W) && -sed -e "s/%APPVERSION%/$version/" -e "s@%OUTPUTDIR%@$homewinpath@" \ +sed -e "s/%APPVERSION%/$version/" \ < /share/WinGit/install.iss > $TMPDIR/install.iss && cp /share/WinGit/*.inc.iss $TMPDIR && echo "Launching Inno Setup compiler ..." && -- 2.11.4.GIT