diff options
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 2 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/makenmake.pl | 7 | ||||
| -rw-r--r-- | packaging/u3/win32/Makefile.nmake | 2 | ||||
| -rwxr-xr-x | packaging/u3/win32/makenmake.pl | 8 | ||||
| -rwxr-xr-x | packaging/ws-manifest.pl | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index de90f8e157..ec4063cdba 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -54,7 +54,7 @@ $(WSMANIFEST): $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest cd portableapps/win32 -distribution.nmake: $(WSMANIFEST) makenmake.pl +distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl $(PERL) makenmake.pl $(WSMANIFEST) > $@ distribution: distribution.nmake diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl index f9bb348331..f96dda78c2 100755 --- a/packaging/portableapps/win32/makenmake.pl +++ b/packaging/portableapps/win32/makenmake.pl @@ -3,7 +3,7 @@ # $Id$ # -print " +print q{ include ../../../config.nmake include <win32.mak> @@ -11,14 +11,15 @@ FILES = Files APP = App WIRESHARK = Wireshark -TOPDIR = ..\\..\\.. +TOPDIR = ..\..\.. +STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR) COPY = xcopy MOVE = mv MKDIR = mkdir COPY_FLAGS = /d /y distribution: -"; +}; while($line = <>) { diff --git a/packaging/u3/win32/Makefile.nmake b/packaging/u3/win32/Makefile.nmake index 749e692337..56caecb320 100644 --- a/packaging/u3/win32/Makefile.nmake +++ b/packaging/u3/win32/Makefile.nmake @@ -59,7 +59,7 @@ nsis-bits: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm cd ../u3/win32 -distribution.nmake: makenmake.pl +distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl cd ../.. $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest cd u3/win32 diff --git a/packaging/u3/win32/makenmake.pl b/packaging/u3/win32/makenmake.pl index 781c878a8b..56a1273e9a 100755 --- a/packaging/u3/win32/makenmake.pl +++ b/packaging/u3/win32/makenmake.pl @@ -3,7 +3,7 @@ # $Id$ # -print " +print q{ include ../../../config.nmake include <win32.mak> @@ -12,14 +12,16 @@ HOST = host MANIFEST= manifest DATA = data -TOPDIR = ..\\..\\.. +TOPDIR = ..\..\.. +STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR) + COPY = xcopy MOVE = mv MKDIR = mkdir COPY_FLAGS = /d /y distribution: -"; +}; while($line = <>) { diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index 2c5c216cbc..98af01b99d 100755 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -43,6 +43,8 @@ while ($line = <>) { if(scalar(@defines) == 0) { undef @defines; } + } elsif ($line =~/^File.*uninstall/) { + next; } elsif ($line =~ /^File[^\"]+\"([^\"]+)\"/) { $file = $1; # make things relative to the root rather than the NSIS directory |