diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-19 17:47:34 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-19 17:47:34 +0000 |
| commit | b924cfed2ba992a10920da50842c2cf16ad3675d (patch) | |
| tree | 0e057e6a5ef86a638a374113627048402a4cb698 /packaging/ws-manifest.pl | |
| parent | 17f959dc74941e6f54782f701354e482bc7240a1 (diff) | |
The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.
svn path=/trunk/; revision=45659
Diffstat (limited to 'packaging/ws-manifest.pl')
| -rwxr-xr-x | packaging/ws-manifest.pl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index ed228fd394..0df2584a02 100755 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -7,19 +7,14 @@ my %u3locs = qw( $INSTDIR device - $INSTDIR\${GTK_WIMP_DLLDST_DIR} host - $INSTDIR\${GTK_WIMP_RCDST_DIR} host $INSTDIR\diameter device $INSTDIR\dtds device - $INSTDIR\etc\gtk-2.0 host - $INSTDIR\etc\gtk-3.0 host - $INSTDIR\share\glib-2.0\schemas + $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\lib\gtk-2.0\${GTK_LIB_DIR}\engines host - $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\immodules host - $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders host - $INSTDIR\lib\gtk-2.0\modules host $INSTDIR\plugins\${VERSION} device $INSTDIR\radius device $INSTDIR\snmp\mibs device @@ -70,6 +65,7 @@ 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) { |