85eec7f603
Our Windows portable packaging environment has a lot of cruft which is no longer relevant. We removed support for U3 packages and the method we use to generate PortableApps packages has been deprecated for a while. Create PortableApps packages using current file formats (AppInfo v3.0) and tools. Generate the PA launcher using the PortableApps.com Launcher generator. Copy files and directories from the top level instead of using a manifest derived from the NSIS installer. The manifest is a good idea, but we should create a central manifest and use that to generate the NSIS and PortableApps packages instead of trying to parse wireshark.nsi. The new package still needs a bit of work but it installs and runs in the current version of the PA Platform. Remove the define for MAKENSIS_UNICODE. It doesn't look like we were using it. Start tearing down makefiles and scripts that we no longer use. Ping-Bug: 4191 Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4 Reviewed-on: https://code.wireshark.org/review/3962 Reviewed-by: Gerald Combs <gerald@wireshark.org>
120 lines
2.9 KiB
Perl
Executable file
120 lines
2.9 KiB
Perl
Executable file
# 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\win32\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;
|
|
}
|