Retire ws-manifest.pl.
We haven't used it in a while and we won't use in the CMake environment. Change-Id: Iecfb8c418bddf1ed1fcd38b189babf082101662e Reviewed-on: https://code.wireshark.org/review/8014 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs
parent
fd72024bc2
commit
0394b01479
|
|
@ -235,8 +235,8 @@ File "${STAGING_DIR}\plugins\${VERSION}\irda.dll"
|
|||
|
||||
3.2.7.3 Other installers
|
||||
|
||||
The U3 and PortableApps installers build their manifests, including
|
||||
plugins, from wireshark.nsi via the packaging/ws-manifest.pl script.
|
||||
The PortableApps installer copies plugins from the build directory
|
||||
and should not require configuration.
|
||||
|
||||
4. Development and plugins on Unix
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ MAINTAINERCLEANFILES = \
|
|||
EXTRA_DIST = \
|
||||
Makefile.nmake \
|
||||
macosx/Info.plist.in \
|
||||
ws-manifest.pl \
|
||||
portableapps/appinfo.tmpl \
|
||||
portableapps/help.html \
|
||||
portableapps/Makefile.nmake \
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
include ../config.nmake
|
||||
|
||||
#wireshark.manifest: nsis/wireshark.nsi ws-manifest.pl
|
||||
# $(PERL) ws-manifest.pl nsis/wireshark.nsi > $@
|
||||
|
||||
clean:
|
||||
rm -rf wireshark.manifest
|
||||
|
||||
|
|
|
|||
|
|
@ -1,119 +0,0 @@
|
|||
# This is no longer used and should probably be replaced. For example, we could
|
||||
# replace most of the copy/xcopy commands for the install-generated-files target
|
||||
# in ../Makefile.nmake with echo commands that append to a deployment manifest.
|
||||
# We could then use that manifest to fill in the section includes in
|
||||
# nsis\wireshark.nsi, copy files to wireshark-gtk2, and copy files to
|
||||
# portableapps\WiresharkPortable\App\Wireshark.
|
||||
|
||||
#
|
||||
# ws-manifest.pl - create a generic manifest file (including u3 information) from the wireshark.nsi
|
||||
|
||||
# These are the known directories in the distribution and where they should live on a U3 device
|
||||
|
||||
my %u3locs = qw(
|
||||
$INSTDIR device
|
||||
$INSTDIR\diameter device
|
||||
$INSTDIR\dtds device
|
||||
$INSTDIR\${GTK_ETC_DIR} host
|
||||
$INSTDIR\${GTK_SCHEMAS_DIR} host
|
||||
$INSTDIR\${GTK_ENGINES_DIR} host
|
||||
$INSTDIR\${GTK_MODULES_DIR} host
|
||||
$INSTDIR\etc\pango host
|
||||
$INSTDIR\help device
|
||||
$INSTDIR\platforms host
|
||||
$INSTDIR\plugins\${VERSION} device
|
||||
$INSTDIR\profiles\Bluetooth device
|
||||
$INSTDIR\profiles\Classic device
|
||||
$INSTDIR\radius device
|
||||
$INSTDIR\snmp\mibs device
|
||||
$INSTDIR\tpncp device
|
||||
$INSTDIR\ui device
|
||||
$INSTDIR\wimaxasncp device
|
||||
);
|
||||
|
||||
my @dirs; # the directories in the manifest
|
||||
my @defines; # stack of defines
|
||||
|
||||
while ($line = <>) {
|
||||
$line =~ s/\r//g; # remove CR on Windows
|
||||
if($line =~ /^SetOutPath (.+)$/) {
|
||||
$outpath = $1;
|
||||
$outpath =~ s/^'(.*)'$/$1/;
|
||||
if($outpath ne '$PROFILE') { # ignore the PROFILE
|
||||
push(@dirs, $outpath);
|
||||
}
|
||||
} elsif ($line =~ /!ifdef (.*)$/) {
|
||||
push(@defines, $1);
|
||||
} elsif ($line =~ /!endif/) {
|
||||
pop(@defines);
|
||||
if(scalar(@defines) == 0) {
|
||||
undef @defines;
|
||||
}
|
||||
} elsif ($line =~/^File.*uninstall/i) {
|
||||
next;
|
||||
} elsif ($line =~ /^File[^\"]+\"([^\"]+)\"/) {
|
||||
$file = $1;
|
||||
# make things relative to the root rather than the NSIS directory
|
||||
if($file =~ /^[^\.\$]/) { $file = "packaging\\nsis\\" . $file; }
|
||||
$file =~ s/\.\.\\\.\.\\//; # remove ../../
|
||||
push(@$outpath, $file);
|
||||
|
||||
if(defined @defines) {
|
||||
push(@$file, "ifdef=" . $defines[-1]);
|
||||
}
|
||||
|
||||
# there may be a parameter - copy it across
|
||||
if($line =~ /\/(\S+)/) {
|
||||
push(@$file, $1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
print "#\n# DO NOT EDIT - autogenerated from wireshark.nsi\n#\n";
|
||||
|
||||
foreach $dir(sort @dirs) {
|
||||
|
||||
if($prev ne $dir) {
|
||||
print STDERR "looking for $dir\n";
|
||||
$loc = $u3locs{$dir};
|
||||
|
||||
if(defined $loc) {
|
||||
|
||||
print "[". $dir . " u3loc=" . $loc . "]\n";
|
||||
|
||||
foreach $file(sort @$dir) {
|
||||
print "\t" . $file;
|
||||
|
||||
foreach $param (sort(@$file)) {
|
||||
print " " . $param;
|
||||
}
|
||||
|
||||
if($dir eq '$INSTDIR') { # try and find a better location
|
||||
if($file =~ /\.dll$|\.exe$|EXE}$|DLL}$/ && !($file =~ /WinPcap/) && !($file =~ /VCREDIST_EXE/)) {
|
||||
print " u3loc=host";
|
||||
}
|
||||
}
|
||||
|
||||
print "\n";
|
||||
}
|
||||
} else {
|
||||
|
||||
push(@ignored, $dir);
|
||||
|
||||
}
|
||||
}
|
||||
$prev = $dir;
|
||||
}
|
||||
|
||||
if(defined @ignored) {
|
||||
|
||||
print STDERR "ERROR\nThe following directories have no known location on a U3 device:\n";
|
||||
|
||||
foreach $dir(sort @ignored) {
|
||||
print STDERR "\t" . $dir . " ";
|
||||
}
|
||||
|
||||
print STDERR "\n";
|
||||
|
||||
exit -1;
|
||||
}
|
||||
Loading…
Reference in New Issue