diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-08 21:53:08 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-08 21:53:08 +0000 |
| commit | 65a05a3075e9aa3c8ff25b80f4865ca2efebcfca (patch) | |
| tree | 6068b13f2f025b7cdbb42fcbc927fd2665b828c5 /packaging | |
| parent | Packaging: Some initial fixes for NSIS (diff) | |
| download | inkscape-65a05a3075e9aa3c8ff25b80f4865ca2efebcfca.tar.gz inkscape-65a05a3075e9aa3c8ff25b80f4865ca2efebcfca.zip | |
Packaging: move NSIS plugins and macros to /plugins and /macros subdirs
(bzr r15244.1.3)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/win32/inkscape.nsi | 10 | ||||
| -rw-r--r-- | packaging/win32/macros/AdvUninstLog.nsh (renamed from packaging/win32/AdvUninstLog.nsh) | 0 | ||||
| -rw-r--r-- | packaging/win32/macros/AdvUninstLog.txt (renamed from packaging/win32/AdvUninstLog.txt) | 0 | ||||
| -rw-r--r-- | packaging/win32/macros/RequireLatestNSIS.nsh (renamed from packaging/win32/RequireLatestNSIS.nsh) | 0 | ||||
| -rw-r--r-- | packaging/win32/macros/VersionCompleteXXXX.nsh (renamed from packaging/win32/VersionCompleteXXXX.nsh) | 0 | ||||
| -rw-r--r-- | packaging/win32/macros/ifexist.nsh (renamed from packaging/win32/ifexist.nsh) | 0 | ||||
| -rw-r--r-- | packaging/win32/plugins/MessageBox.txt (renamed from packaging/win32/MessageBox.txt) | 0 | ||||
| -rw-r--r-- | packaging/win32/plugins/md5dll.dll (renamed from packaging/win32/md5dll.dll) | bin | 8192 -> 8192 bytes | |||
| -rw-r--r-- | packaging/win32/plugins/md5dll.txt (renamed from packaging/win32/md5dll.txt) | 0 | ||||
| -rw-r--r-- | packaging/win32/plugins/messagebox.dll (renamed from packaging/win32/messagebox.dll) | bin | 6144 -> 6144 bytes |
10 files changed, 5 insertions, 5 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 9646ee2f4..8f5d067c5 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -27,9 +27,9 @@ SetCompressorDictSize 32 RequestExecutionLevel admin ; Include required files {{{2 -!include RequireLatestNSIS.nsh -!include ifexist.nsh -!include VersionCompleteXXXX.nsh +!include macros\RequireLatestNSIS.nsh +!include macros\ifexist.nsh +!include macros\VersionCompleteXXXX.nsh !include LogicLib.nsh !include Sections.nsh @@ -48,12 +48,12 @@ RequestExecutionLevel admin ; However, for the moment, this is what we're using. !define INSTDIR_REG_ROOT HKLM !define INSTDIR_REG_KEY "${UNINST_KEY}" -!include AdvUninstLog.nsh +!include macros\AdvUninstLog.nsh !insertmacro INTERACTIVE_UNINSTALL ; Initialise NSIS plug-ins {{{3 ; The plugins used are md5dll and messagebox -!addplugindir . +!addplugindir plugins ; FileFunc bits and pieces {{{3 !include FileFunc.nsh diff --git a/packaging/win32/AdvUninstLog.nsh b/packaging/win32/macros/AdvUninstLog.nsh index f48049164..f48049164 100644 --- a/packaging/win32/AdvUninstLog.nsh +++ b/packaging/win32/macros/AdvUninstLog.nsh diff --git a/packaging/win32/AdvUninstLog.txt b/packaging/win32/macros/AdvUninstLog.txt index c294c3df2..c294c3df2 100644 --- a/packaging/win32/AdvUninstLog.txt +++ b/packaging/win32/macros/AdvUninstLog.txt diff --git a/packaging/win32/RequireLatestNSIS.nsh b/packaging/win32/macros/RequireLatestNSIS.nsh index 70371552a..70371552a 100644 --- a/packaging/win32/RequireLatestNSIS.nsh +++ b/packaging/win32/macros/RequireLatestNSIS.nsh diff --git a/packaging/win32/VersionCompleteXXXX.nsh b/packaging/win32/macros/VersionCompleteXXXX.nsh index 6ea780508..6ea780508 100644 --- a/packaging/win32/VersionCompleteXXXX.nsh +++ b/packaging/win32/macros/VersionCompleteXXXX.nsh diff --git a/packaging/win32/ifexist.nsh b/packaging/win32/macros/ifexist.nsh index f14236c2e..f14236c2e 100644 --- a/packaging/win32/ifexist.nsh +++ b/packaging/win32/macros/ifexist.nsh diff --git a/packaging/win32/MessageBox.txt b/packaging/win32/plugins/MessageBox.txt index c2aa963d6..c2aa963d6 100644 --- a/packaging/win32/MessageBox.txt +++ b/packaging/win32/plugins/MessageBox.txt diff --git a/packaging/win32/md5dll.dll b/packaging/win32/plugins/md5dll.dll Binary files differindex abefbb038..abefbb038 100644 --- a/packaging/win32/md5dll.dll +++ b/packaging/win32/plugins/md5dll.dll diff --git a/packaging/win32/md5dll.txt b/packaging/win32/plugins/md5dll.txt index a8d3572c7..a8d3572c7 100644 --- a/packaging/win32/md5dll.txt +++ b/packaging/win32/plugins/md5dll.txt diff --git a/packaging/win32/messagebox.dll b/packaging/win32/plugins/messagebox.dll Binary files differindex 97407fa1a..97407fa1a 100644 --- a/packaging/win32/messagebox.dll +++ b/packaging/win32/plugins/messagebox.dll |