osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't add uninstall.exe to the U3/PortableApps manifest. Define 

STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
This commit is contained in:
Gerald Combs 2012-06-13 22:28:28 +00:00
parent b9debc4467
commit b5e5d6ac35
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/portableapps/win32/Makefile.nmake
View File

@ -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

7
packaging/portableapps/win32/makenmake.pl
View File

@ -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 = <>) {

2
packaging/u3/win32/Makefile.nmake
View File

@ -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

8
packaging/u3/win32/makenmake.pl
View File

@ -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 = <>) {

2
packaging/ws-manifest.pl
View File

@ -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