diff options
author | Gerald Combs <gerald@wireshark.org> | 2008-01-23 01:23:06 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2008-01-23 01:23:06 +0000 |
commit | 56ae79a3fd245eadc73990367c8c344a36f46191 (patch) | |
tree | 478194e55a285439e8ca6704ce4224f6dffbc47c /packaging/portableapps | |
parent | 8cd88c89125925a6500bea23677b8c9aa9a3494a (diff) |
Unpack FindProcDLL.dll into $(WIRESHARK_LIBS\nsis-plugins, and tell NSIS
where it is using "!addplugindir".
svn path=/trunk/; revision=24166
Diffstat (limited to 'packaging/portableapps')
-rwxr-xr-x | packaging/portableapps/win32/Installer.nsi | 4 | ||||
-rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 2 | ||||
-rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 20 |
3 files changed, 17 insertions, 9 deletions
diff --git a/packaging/portableapps/win32/Installer.nsi b/packaging/portableapps/win32/Installer.nsi index 9e56e240da..f6bf0adef4 100755 --- a/packaging/portableapps/win32/Installer.nsi +++ b/packaging/portableapps/win32/Installer.nsi @@ -34,6 +34,8 @@ !define CLOSENAME "Wireshark Portable" !define ADDONSDIRECTORYPRESERVE "NONE" +!addplugindir "${EXTRA_PLUGINS}" + ;=== Program Details Name "${NAME}" OutFile "${FILENAME}-${WSVERSION}.paf.exe" @@ -200,4 +202,4 @@ FunctionEnd Section "!App Portable (required)" SetOutPath $INSTDIR File /r "Files\*.*" -SectionEnd
\ No newline at end of file +SectionEnd diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index 7b29822a4c..97cf4b6c20 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -32,6 +32,8 @@ !define DEFAULTAPPDIR "Wireshark" !define DEFAULTWINPCAP "WinPcap_4_0_2.exe" +!addplugindir "${EXTRA_PLUGINS}" + ;=== Program Details Name "${FULLNAME}" OutFile "Files\${NAME}.exe" diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index 7958054465..d7078f7fea 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -15,7 +15,8 @@ SOURCE = WiresharkPortableSource WSMANIFEST = ../../wireshark.manifest -FINDPROCDLL = $(MAKENSIS)\..\Plugins\FindProcDLL.dll +NSIS_PLUGINS = nsis-plugins +FINDPROCDLL = $(WIRESHARK_LIBS)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. U3DIST = ..\..\u3\win32 @@ -54,14 +55,14 @@ $(WSMANIFEST): cd portableapps/win32 distribution.nmake: $(WSMANIFEST) makenmake.pl - $(PERL) makenmake.pl $(WSMANIFEST) > $@ + $(PERL) makenmake.pl $(WSMANIFEST) > $@ distribution: distribution.nmake nmake -f distribution.nmake pack: distribution !IFDEF UPX - -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe + -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll @@ -76,29 +77,32 @@ appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake < appinfo.tmpl > appinfo.ini appinfo: appinfo.ini - $(COPY) appinfo.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) - $(COPY) $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) + $(COPY) appinfo.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) + $(COPY) $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) source: $(COPY) WiresharkPortable.ini $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) WiresharkPortable.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) Installer.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) -findprocdll: +findprocdll: if not exist $(FINDPROCDLL) \ - @$(SH) $(TOPDIR)\tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(MAKENSIS)\.." \ - Plugins FindProc.zip + @$(SH) $(TOPDIR)\tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + $(NSIS_PLUGINS) FindProc.zip + WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ + /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ Installer.nsi Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ + /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ WiresharkPortable.nsi clean: |