osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix U3 packaging. Build 1.1.0 again in order to pick up the new GLib/GTK+ 

libraries.

svn path=/trunk/; revision=26168
This commit is contained in:
Gerald Combs 2008-09-09 17:16:41 +00:00
parent d7304a880b
commit e953bf064a
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make-version.pl
View File

@ -70,8 +70,10 @@ my %version_pref = (
"enable" => 1,
"svn_client" => 0,
"format" => "SVN %Y%m%d%H%M%S",
"pkg_enable" => 1,
"pkg_format" => "-SVN-%#",
#"pkg_enable" => 1,
#"pkg_format" => "-SVN-%#",
"pkg_enable" => 0,
"pkg_format" => "",
);
my $srcdir = ".";

34
packaging/ws-manifest.pl
View File

@ -4,21 +4,25 @@
#
# These are the known directories in the distribution and where they should live on a U3 device
my %u3locs = qw($INSTDIR device
$INSTDIR\plugins\${VERSION} device
$INSTDIR\help device
$INSTDIR\snmp\mibs device
$INSTDIR\diameter device
$INSTDIR\dtds device
$INSTDIR\radius device
$INSTDIR\wimaxasncp device
$INSTDIR\tpncp device
$INSTDIR\${GTK_WIMP_RCDST_DIR} host
$INSTDIR\etc\gtk-2.0 host
$INSTDIR\etc\pango host
$INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders host
$INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\immodules host
$INSTDIR\${GTK_WIMP_DLLDST_DIR} host);
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\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
$INSTDIR\tpncp device
$INSTDIR\wimaxasncp device
);
my @dirs; # the directories in the manifest
my @defines; # stack of defines