diff options
Diffstat (limited to 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 16 | ||||
| -rw-r--r-- | packaging/portableapps/win32/WiresharkPortable.tmpl | 16 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/makenmake.pl | 113 |
3 files changed, 0 insertions, 145 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index 311e44c997..29c8f9c9d7 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -71,17 +71,6 @@ dirs: if not exist $(OTHER) $(MKDIR) $(OTHER) if not exist $(SOURCE) $(MKDIR) $(SOURCE) -#nsis-bits: -# cd ../../nsis -# $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm -# cd ../portableapps/win32 - -#distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl -# $(PERL) makenmake.pl $(WSMANIFEST) > $@ - -#distribution: distribution.nmake -# nmake -f distribution.nmake - #pack: distribution #!IFDEF UPX # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe @@ -129,11 +118,6 @@ appbinaries: applauncher xcopy $(TOPDIR)\tfshark.exe $(WIRESHARK_DIR) /d xcopy $(TOPDIR)\tshark.exe $(WIRESHARK_DIR) /d -#WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake -# sed -e 's/$$(WINPCAP_VERSION)/$(WINPCAP_VERSION)/g' \ -# -e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \ -# < WiresharkPortable.tmpl > WiresharkPortable.ini - source: dirs $(COPY) readme.txt $(SOURCE) $(COPY_FLAGS) $(TEXTIFY) -Destination $(SOURCE) \ diff --git a/packaging/portableapps/win32/WiresharkPortable.tmpl b/packaging/portableapps/win32/WiresharkPortable.tmpl deleted file mode 100644 index 6e26dd1395..0000000000 --- a/packaging/portableapps/win32/WiresharkPortable.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -# -# WirersharkPortable.ini - settings for configure the running of WiresharkPortable -# -[WiresharkPortable] - -WiresharkDirectory=App/Wireshark -WiresharkExecutable=wireshark.exe -AdditionalParameters= - -DisableWinPcapInstall=false -WinPcapInstaller=WinPcap_$(WINPCAP_VERSION).exe - -MSVCRedist=vcredist_$(TARGET_MACHINE).exe - -# This INI is an example only and will not work until placed according to the directions in readme.txt -# The above options are explained in the included readme.txt diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl deleted file mode 100755 index 47dc8a5e2c..0000000000 --- a/packaging/portableapps/win32/makenmake.pl +++ /dev/null @@ -1,113 +0,0 @@ -# -# makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate PortableApp structure - -print q{ -# -# DO NOT EDIT - autogenerated from makenmake.pl and ../../wireshark.manifest -# - -include ../../../config.nmake -include <win32.mak> - -FILES = Files -APP = App -WIRESHARK = Wireshark - -TOPDIR = ..\..\.. -STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR) -COPY = xcopy -MOVE = mv -MKDIR = mkdir -COPY_FLAGS = /d /y -PROGRAM_NAME_PATH_GTK = $(PROGRAM_NAME).exe - -# XXX This should be defined in config.nmake. -!IF EXIST("$(TOPDIR)\wireshark-qt-release\qtshark.exe") -QT_DIR= "$(TOPDIR)\wireshark-qt-release" -PROGRAM_NAME_PATH_QT = "qtshark.exe" -!ENDIF -!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll") -NEED_QT5_DLL= USE -!ENDIF -!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll") -NEED_QT4_DLL= USE -!ENDIF - -distribution: -}; - -while($line = <>) { - - if($line =~ /^\#/) { # comment - next; - } elsif($line =~ /^\[(\S+)/) { # new directory - if(defined $define) { # Clear out any leftover defines. - print "!ENDIF\n"; - undef($define); - } - - $dir = $1; - - $dir =~ s/\$INSTDIR?//; # remove $INSTDIR - - $dir =~ s/\{/\(/g; $dir =~ s/\}/\)/g; # convert curlies to round brackets - - if($dir ne '') { - print " if 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)\n"; - } - } else { - - if(defined $define) { - print "!ENDIF\n"; - } - undef $define; - } - - $oname = ""; - - print " \$(COPY) \"$file\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\" \$(COPY_FLAGS)\n"; - - if($line =~ /oname=(\S+)/) { # override this filename - $oname = $1; - $file =~ /\\(.*)$/; - $name = $1; - - print " \$(MOVE) \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\"\n"; - - } - - } -} - -# -# Editor modelines -# -# Local Variables: -# c-basic-offset: 4 -# tab-width: 8 -# indent-tabs-mode: nil -# End: -# -# ex: set shiftwidth=4 tabstop=8 expandtab: -# :indentSize=4:tabSize=8:noTabs=true: -# |