!define WEBSITE "www.wireshark.org"
!define DEFAULTEXE "wireshark.exe"
!define DEFAULTAPPDIR "Wireshark"
-!define DEFAULTSETTINGSDIR "settings"
!define DEFAULTWINPCAP "WinPcap_4_0_2.exe"
;=== Program Details
;=== Include
!include "FileFunc.nsh"
!insertmacro GetParameters
-;!insertmacro GetRoot
-;!include "ReplaceInFile.nsh"
-;!include "StrRep.nsh"
;=== Program Icon
Icon "Files/App/AppInfo/${APP}.ico"
Var PROGRAMDIRECTORY
-Var SETTINGSDIRECTORY
Var ADDITIONALPARAMETERS
Var EXECSTRING
Var PROGRAMEXECUTABLE
Var INIPATH
-Var SECONDARYLAUNCH
-Var DISABLESPLASHSCREEN
Var DISABLEWINPCAPINSTALL
Var WINPCAPINSTALLER
Var WINPCAP_UNINSTALL ;declare variable for holding the value of a registry key
Var PDRIVE
Section "Main"
- ;=== Check if already running
+ ;=== Check if another WiresharkPortable already running
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${NAME}") i .r1 ?e'
Pop $0
StrCmp $0 0 CheckINI
- StrCpy $SECONDARYLAUNCH "true"
+ Goto WarnAnotherInstance
CheckINI:
;=== Find the INI file, if there is one
;=== Read the parameters from the INI file
ReadINIStr $0 "$INIPATH\${NAME}.ini" "${NAME}" "${APP}Directory"
StrCpy "$PROGRAMDIRECTORY" "$EXEDIR\$0"
- ReadINIStr $0 "$INIPATH\${NAME}.ini" "${NAME}" "SettingsDirectory"
- StrCpy "$SETTINGSDIRECTORY" "$EXEDIR\$0"
;=== Check that the above required parameters are present
IfErrors NoINI
- ReadINIStr $PROGRAMEXECUTABLE "$INIPATH\${NAME}.ini" "${NAME}" "ProgramExecutable"
+ ReadINIStr $PROGRAMEXECUTABLE "$INIPATH\${NAME}.ini" "${NAME}" "${APP}Executable"
ReadINIStr $ADDITIONALPARAMETERS "$INIPATH\${NAME}.ini" "${NAME}" "AdditionalParameters"
- ReadINIStr $DISABLESPLASHSCREEN "$INIPATH\${NAME}.ini" "${NAME}" "DisableSplashScreen"
+
ReadINIStr $DISABLEWINPCAPINSTALL "$INIPATH\${NAME}.ini" "${NAME}" "DisableWinPcapInstall"
ReadINIStr $WINPCAPINSTALLER "$INIPATH\${NAME}.ini" "${NAME}" "WinPcapInstaller"
IfFileExists "$EXEDIR\App\${DEFAULTAPPDIR}\${DEFAULTEXE}" "" CheckPortableProgramDIR
StrCpy "$PROGRAMDIRECTORY" "$EXEDIR\App\${DEFAULTAPPDIR}"
- StrCpy "$SETTINGSDIRECTORY" "$EXEDIR\Data\${DEFAULTSETTINGSDIR}"
GoTo EndINI
CheckPortableProgramDIR:
IfFileExists "$EXEDIR\${NAME}\App\${DEFAULTAPPDIR}\${DEFAULTEXE}" "" NoProgramEXE
StrCpy "$PROGRAMDIRECTORY" "$EXEDIR\${NAME}\App\${DEFAULTAPPDIR}"
- StrCpy "$SETTINGSDIRECTORY" "$EXEDIR\${NAME}\Data\${DEFAULTSETTINGSDIR}"
GoTo EndINI
EndINI:
- IfFileExists "$PROGRAMDIRECTORY\$PROGRAMEXECUTABLE" FoundProgramEXE
+ IfFileExists "$PROGRAMDIRECTORY\$PROGRAMEXECUTABLE" GetPassedParameters
NoProgramEXE:
;=== Program executable not where expected
Abort
FoundProgramEXE:
- ;=== Check if running
- StrCmp $SECONDARYLAUNCH "true" GetPassedParameters
+ ;=== Check if Wireshark running from somwehere else (e.g. U3 device)
; if the following step fails, you'll need the FindProcDLL plug-in from:
; http://nsis.sourceforge.net/Find_Process_By_Name
- FindProcDLL::FindProc "${DEFAULTEXE}"
- StrCmp $R0 "1" WarnAnotherInstance DisplaySplash
+ FindProcDLL::FindProc "${PROGRAMEXECUTABLE}"
+ StrCmp $R0 "1" WarnAnotherInstance GetPassedParameters
WarnAnotherInstance:
- MessageBox MB_OK|MB_ICONINFORMATION `Another instance of ${APP} is already running. Please close other instances of ${APP} before launching ${FULLNAME}.`
+ MessageBox MB_OK|MB_ICONINFORMATION `Another instance of ${APP} is already running. Please close other instances of ${APP} before launching ${FULLNAME}.`
Abort
- DisplaySplash:
-; StrCmp $DISABLESPLASHSCREEN "true" GetPassedParameters
- ;=== Show the splash screen while processing registry entries
-; InitPluginsDir
-; File /oname=$PLUGINSDIR\splash.jpg "${NAME}.jpg"
-; newadvsplash::show /NOUNLOAD 1000 100 0 -1 /L $PLUGINSDIR\splash.jpg
-
GetPassedParameters:
;=== Get any passed parameters
${GetParameters} $0
System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_EXEC_PATH", "$EXEDIR\App\Wireshark").r0'
System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_VERSION", "1.0").r0'
System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_LANGUAGE", "1033").r0'
-; SettingsDirectory:
- ;=== Set the settings directory if we have a path
-; IfFileExists "$SETTINGSDIRECTORY\*.*" CheckForSettings
-; CreateDirectory $SETTINGSDIRECTORY
-
-; CheckForSettings:
StrCmp $SECONDARYLAUNCH "true" LaunchAndExit
-; IfFileExists "$PROGRAMDIRECTORY\sumatrapdfprefs.txt" AdjustPaths
-; IfFileExists "$SETTINGSDIRECTORY\sumatrapdfprefs.txt" MoveSettings AdjustPaths
- ;IfFileExists "$EXEDIR\App\DefaultData\sumatrapdfprefs.txt" "" LaunchNow
- ; CopyFiles /SILENT "$EXEDIR\App\DefaultData\sumatrapdfprefs.txt" "$PROGRAMDIRECTORY"
- ; Goto LaunchNow
-
-; MoveSettings:
-; Rename "$SETTINGSDIRECTORY\sumatrapdfprefs.txt" "$PROGRAMDIRECTORY\sumatrapdfprefs.txt"
-
-; AdjustPaths:
-; ReadINIStr $LASTDRIVE "$SETTINGSDIRECTORY\${NAME}Settings.ini" "${NAME}Settings" "LastDrive"
-; ${GetRoot} $EXEDIR $CURRENTDRIVE
-; StrCmp $LASTDRIVE $CURRENTDRIVE RememberPath
-; IfFileExists "$PROGRAMDIRECTORY\sumatrapdfprefs.txt" "" RememberPath
-; ${ReplaceInFile} "$PROGRAMDIRECTORY\sumatrapdfprefs.txt" 'File: $LASTDRIVE' 'File: $CURRENTDRIVE'
-; Delete "$PROGRAMDIRECTORY\sumatrapdfprefs.txt.old"
-
-; RememberPath:
-; WriteINIStr "$SETTINGSDIRECTORY\${NAME}Settings.ini" "${NAME}Settings" "LastDrive" "$CURRENTDRIVE"
- ;LaunchNow:
ExecWait $EXECSTRING
CheckRunning:
FindProcDLL::FindProc "${DEFAULTEXE}"
StrCmp $R0 "1" CheckRunning
- ;UninstallWinPcap:
StrCmp $WINPCAP_UNINSTALL "" TheEnd ;=== if we installed it, uninstall it
ExecWait $WINPCAP_UNINSTALL
- ;=== Put the settings file back
-; Sleep 500
-; Rename "$PROGRAMDIRECTORY\sumatrapdfprefs.txt" "$SETTINGSDIRECTORY\sumatrapdfprefs.txt"
Goto TheEnd
LaunchAndExit:
Exec $EXECSTRING
TheEnd:
-; newadvsplash::wait
SectionEnd
WIRESHARK = Wireshark
SOURCE = WiresharkPortableSource
+WSMANIFEST = ../../wireshark.manifest
+
FINDPROCDLL = $(MAKENSIS)\..\Plugins\FindProcDLL.dll
TOPDIR = ..\..\..
WIN32_SETUP_OPT=--download
!ENDIF
+UPX_FLAGS = -q
+
PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0
all: package
if not exist $(FILES)\$(OTHER) $(MKDIR) $(FILES)\$(OTHER)
if not exist $(FILES)\$(OTHER)\$(SOURCE) $(MKDIR) $(FILES)\$(OTHER)\$(SOURCE)
-wireshark:
- cd $(U3DIST)
- nmake -f makefile.nmake test
- cd ../../portableapps/win32
- $(COPY) $(U3DIST)\device\* $(FILES)\$(APP)\$(WIRESHARK) /S $(COPY_FLAGS)
- $(COPY) $(U3DIST)\host\* $(FILES)\$(APP)\$(WIRESHARK) /S $(COPY_FLAGS)
-# $(UPX) $(FILES)\$(APP)\$(WIRESHARK)\*.dll
+nsis-bits:
+ cd ../../nsis
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm NEWS.txt
+ cd ../u3/win32
+
+$(WSMANIFEST):
+ cd ../..
+ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest
+ cd portableapps/win32
+
+distribution.nmake: $(WSMANIFEST) makenmake.pl
+ $(PERL) makenmake.pl $(WSMANIFEST) > $@
+
+distribution: distribution.nmake
+ nmake -f distribution.nmake
+
+pack: distribution
+!IFDEF UPX
+ -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.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
+ -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\$(GTK_WIMP_DLLDST_DIR)\*.dll
+!ENDIF
+
appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake
sed -e 's/$$(PAPPS_VERSION)/$(PAPPS_VERSION)/g' \
@$(SH) $(TOPDIR)\tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(MAKENSIS)\.." \
Plugins FindProc.zip
-WiresharkPortable-$(VERSION).paf.exe : dirs appinfo wireshark source Files/WiresharkPortable.exe Installer.nsi
+WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi
$(MAKENSIS) \
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
WiresharkPortable.nsi
clean:
+ cd ../../
+ $(MAKE) -f makefile.nmake $@
+ cd portableapps/win32
rm -rf $(FILES)
rm -rf appinfo.ini
+ rm -rf distribution.nmake
rm -rf WiresharkPortable-$(VERSION).paf.exe
rm -rf *~ *.*~
--- /dev/null
+#
+# makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate PortableApp structure
+# $Id$
+#
+
+print "
+include ../../../config.nmake
+include <win32.mak>
+
+FILES = Files
+APP = App
+WIRESHARK = Wireshark
+
+TOPDIR = ..\\..\\..
+COPY = xcopy
+MOVE = mv
+MKDIR = mkdir
+COPY_FLAGS = /d /y
+
+distribution:
+";
+
+while($line = <>) {
+
+ if($line =~ /^\#/) { # comment
+ next;
+ } elsif($line =~ /^\[(\S+)/) { # new directory
+ $dir = $1;
+
+ $dir =~ s/\$INSTDIR?//; # remove $INSTDIR
+
+ $dir =~ s/\{/\(/g; $dir =~ s/\}/\)/g; # convert curlies to round brackets
+
+ if($dir ne '') {
+ print "\tif not exist \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir \$(MKDIR) \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\n";
+ }
+
+ } else { # this is a file
+
+ $line =~ /^\s+(\S+)/;
+ $file = $1;
+
+ $file =~ s/\{/\(/g; $file =~ s/\}/\)/g; # convert curlies to round brackets
+
+ if($file =~ /^[^\$]/) {
+ $file = "\$(TOPDIR)\\" . $file;
+ }
+
+ if($line =~ /ifdef=(\w+)/) { # dependency
+ if($define ne $1) {
+ if(defined $define) {
+ print "!ENDIF\n";
+ }
+ $define = $1;
+ print "!IF DEFINED($define)";
+
+ if($define eq "GTK1_DIR") {
+ # only include this if GTK2_DIR is not defined
+ print "& !DEFINED(GTK2_DIR)";
+ }
+
+ print "\n";
+ }
+ } else {
+
+ if(defined $define) {
+ print "!ENDIF\n";
+ }
+ undef $define;
+ }
+
+ $oname = "";
+
+ print "\t\$(COPY) $file \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir \$(COPY_FLAGS)\n";
+
+ if($line =~ /oname=(\S+)/) { # override this filename
+ $oname = $1;
+ $file =~ /\\(.*)$/;
+ $name = $1;
+
+ print "\t\$(MOVE) \$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name \$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\n";
+
+ }
+
+ }
+}
git.samba.org / obnox / wireshark / wip.git / commitdiff