diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-11 14:48:28 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-11 14:48:28 +0000 |
| commit | 0e4dd4917cbb3004a67697d6c79fe60b097f9ed1 (patch) | |
| tree | 80063556d641df8af5abbdbf79f15dbb7efa3a7e /packaging/nsis | |
| parent | d9f315c9871a518e37f7e785502b6bb965afacdc (diff) | |
Make it easy to add custom plugins to the installer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31497 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Custom.nmake | 8 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.am | 4 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/custom_plugins.txt | 3 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 |
5 files changed, 20 insertions, 2 deletions
diff --git a/packaging/nsis/Custom.nmake b/packaging/nsis/Custom.nmake new file mode 100644 index 0000000000..cc654063a1 --- /dev/null +++ b/packaging/nsis/Custom.nmake @@ -0,0 +1,8 @@ +# +# $Id$ +# +# Add your csutom plugins here +CUSTOM_PLUGINS= \ +# Example: +# ../../plugins/foo/foo.dll + diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index c62987b819..960404c280 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -9,4 +9,6 @@ EXTRA_DIST = \ AdditionalTasksPage.ini \ WinPcapPage.ini \ WinPcap_4_1_1.exe \ - Makefile.nmake + Makefile.nmake \ + Custom.nmake \ + custom_plugins.txt diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index b0bf33a5f0..25b58251c5 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -8,6 +8,9 @@ # http://www.nullsoft.com/free/nsis/ include ../../config.nmake +# Contains a list of custom plugins(default empty) +include Custom.nmake + UNIX2DOS=$(PERL) ../../tools/unix2dos.pl @@ -60,7 +63,8 @@ PLUGINS= \ ../../plugins/stats_tree/stats_tree.dll \ ../../plugins/unistim/unistim.dll \ ../../plugins/wimax/wimax.dll \ - ../../plugins/wimaxasncp/wimaxasncp.dll + ../../plugins/wimaxasncp/wimaxasncp.dll \ + $(CUSTOM_PLUGINS) NSI=wireshark.nsi \ GetWindowsVersion.nsh \ diff --git a/packaging/nsis/custom_plugins.txt b/packaging/nsis/custom_plugins.txt new file mode 100644 index 0000000000..6c61caab64 --- /dev/null +++ b/packaging/nsis/custom_plugins.txt @@ -0,0 +1,3 @@ +;Add your custom plugins directives here +; Example: +;File "..\..\plugins\foo\foo.dll"
\ No newline at end of file diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 02c9b04ca4..103d8847ac 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -890,6 +890,7 @@ File "..\..\plugins\sercosiii\sercosiii.dll" File "..\..\plugins\unistim\unistim.dll" File "..\..\plugins\wimax\wimax.dll" File "..\..\plugins\wimaxasncp\wimaxasncp.dll" +!include "custom_plugins.txt" SectionEnd Section "Tree Statistics Plugin" SecStatsTree |