diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-17 21:54:26 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-17 21:54:26 +0000 |
| commit | c05bf4e6e04a935fde9888e469bbdfff28e9cc25 (patch) | |
| tree | 07f3af1e7de3b01fa24398aaf6ba413fcd5b5f23 /packaging/win32/macros | |
| parent | Packaging: Restore original Simplified Chinese translation from original bug ... (diff) | |
| download | inkscape-c05bf4e6e04a935fde9888e469bbdfff28e9cc25.tar.gz inkscape-c05bf4e6e04a935fde9888e469bbdfff28e9cc25.zip | |
Packaging: A whole lot of improvements for NSIS
- Make the installation components much more robust (i.e. only install what they're supposed to and do not include the same files in different components)
- As a result speed up installation times drastically
- Offer "Python", "Extensions" and "Dictionaries" as additional (optional) components
- A minimal installation can now be as small as 150 MB (compared to the full installation size of 300 MB; typical installation size is 230 MB)
- update verision check to require NSIS 3.0
(bzr r15244.1.11)
Diffstat (limited to 'packaging/win32/macros')
| -rw-r--r-- | packaging/win32/macros/RequireLatestNSIS.nsh | 9 | ||||
| -rw-r--r-- | packaging/win32/macros/ifexist.nsh | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/packaging/win32/macros/RequireLatestNSIS.nsh b/packaging/win32/macros/RequireLatestNSIS.nsh index 70371552a..7d6308e58 100644 --- a/packaging/win32/macros/RequireLatestNSIS.nsh +++ b/packaging/win32/macros/RequireLatestNSIS.nsh @@ -1,9 +1,4 @@ -!if `${NSIS_VERSION}` == `v2.45` - !error "There is a bug in !searchparse which makes this script not compile in NSIS 2.45. Please upgrade to NSIS 2.46 or later and try again." -!else - !echo "(If you get a compile error with !searchparse, please upgrade to NSIS 2.46 or later and try again.)" -!endif !searchparse ${NSIS_VERSION} "v" V -!if ${V} < 2.46 - !error "You only have NSIS ${V}, but NSIS 2.46 or later is required for proper Windows 7 support. Please upgrade to NSIS 2.46 or later and try again." +!if ${V} < 3.0 + !error "You only have NSIS ${V}, but NSIS 3.0 or later is required to support Unicode and Windows 10. Please upgrade to NSIS 3.0 or later and try again." !endif diff --git a/packaging/win32/macros/ifexist.nsh b/packaging/win32/macros/ifexist.nsh index 466ce7da0..5a0ea62b9 100644 --- a/packaging/win32/macros/ifexist.nsh +++ b/packaging/win32/macros/ifexist.nsh @@ -33,4 +33,4 @@ !delfile '${_TEMPFILE}' !undef _TEMPFILE !macroend -!define !defineifexist "!insertmacro !defineifexist"
\ No newline at end of file +!define !defineifexist "!insertmacro !defineifexist" |