diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-09 00:28:14 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-09 00:28:14 +0000 |
| commit | 76420724300c5bd6fb028bf36ab554efa0e3497d (patch) | |
| tree | 3db23878ed8796b7b703956bdbaf9ed37bee65f7 /packaging/win32/macros | |
| parent | Packaging: move NSIS plugins and macros to /plugins and /macros subdirs (diff) | |
| download | inkscape-76420724300c5bd6fb028bf36ab554efa0e3497d.tar.gz inkscape-76420724300c5bd6fb028bf36ab554efa0e3497d.zip | |
Packaging: More fixes for NSIS
- Now supports 32-bit and 64-bit distributions
- Tries to find the compiled Inkscape files for the distribution (btool vs. cmake)
- Fully works with NSIS 3.0 now
(bzr r15244.1.4)
Diffstat (limited to 'packaging/win32/macros')
| -rw-r--r-- | packaging/win32/macros/AdvUninstLog.nsh | 2 | ||||
| -rw-r--r-- | packaging/win32/macros/ifexist.nsh | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packaging/win32/macros/AdvUninstLog.nsh b/packaging/win32/macros/AdvUninstLog.nsh index f48049164..a932aa873 100644 --- a/packaging/win32/macros/AdvUninstLog.nsh +++ b/packaging/win32/macros/AdvUninstLog.nsh @@ -425,7 +425,7 @@ ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR" ${uninstall.log_mergeID} "${UNLOG_PART}${ID}" - !undef ID ${__LINE__} + !undef ID !verbose pop !macroend diff --git a/packaging/win32/macros/ifexist.nsh b/packaging/win32/macros/ifexist.nsh index f14236c2e..466ce7da0 100644 --- a/packaging/win32/macros/ifexist.nsh +++ b/packaging/win32/macros/ifexist.nsh @@ -19,3 +19,18 @@ !undef _FILE_EXISTS !macroend !define !ifnexist "!insertmacro !ifnexist" + +!macro !defineifexist _FILE_NAME _VAR_NAME _VAR_VALUE + !tempfile _TEMPFILE + !ifdef NSIS_WIN32_MAKENSIS + ; Windows - cmd.exe + !system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} ${_VAR_VALUE} > "${_TEMPFILE}"' + !else + ; Posix - sh + !system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME} ${_VAR_VALUE}" > "${_TEMPFILE}"; fi' + !endif + !include '${_TEMPFILE}' + !delfile '${_TEMPFILE}' + !undef _TEMPFILE +!macroend +!define !defineifexist "!insertmacro !defineifexist"
\ No newline at end of file |