diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-22 00:19:02 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-22 02:57:27 +0000 |
| commit | 0e545444e93b019154e4f289d2431cc9342c0be9 (patch) | |
| tree | 4c987b213866a3a46537082dea291acdcc6487fe /packaging | |
| parent | NSIS: update for git and cmake (diff) | |
| download | inkscape-0e545444e93b019154e4f289d2431cc9342c0be9.tar.gz inkscape-0e545444e93b019154e4f289d2431cc9342c0be9.zip | |
NSIS: Allow to set output filenanme on command line
Use 'makensis /DOutPath=C:\full\path\output.exe inkscape.nsi'.
(cherry picked from commit 3b5261b9a77db009a279918356e8f71bcd7fe640)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/win32/inkscape.nsi | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 2f116b581..497a31a64 100644 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -180,10 +180,11 @@ ReserveFile /plugin UserInfo.dll ; Detect architecture of the build ${!ifexist} ${INKSCAPE_DIST_DIR}\gspawn-win32-helper.exe !define BITNESS 32 + !define /redef FILENAME `${FILENAME}-x86` !endif ${!ifexist} ${INKSCAPE_DIST_DIR}\gspawn-win64-helper.exe !define BITNESS 64 - !define /redef FILENAME `${FILENAME}-x64` ; add architecture to filename for 64-bit builds + !define /redef FILENAME `${FILENAME}-x64` !endif !ifndef BITNESS !error "Could not detect architecture (BITNESS) of the Inkscape build" @@ -193,10 +194,14 @@ ${!ifexist} ${INKSCAPE_DIST_DIR}\gspawn-win64-helper.exe !define PRODUCT_NAME "Inkscape" ; TODO: fix up the language files to not use this and kill this line !define INSTDIR_KEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe" !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" -!define _FILENAME ${FILENAME}.exe -!undef FILENAME -!define FILENAME ${_FILENAME} -!undef _FILENAME + +!ifdef OutFile + ; allow to set different output filename by defining 'OutFile' on command line + !define /redef FILENAME ${OutFile} +!else + !define /redef FILENAME ${FILENAME}.exe +!endif + ; Product information {{{3 Name `Inkscape` |