diff options
| -rwxr-xr-x | make-version.pl | 6 | ||||
| -rw-r--r-- | packaging/ws-manifest.pl | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/make-version.pl b/make-version.pl index 5956e9d926..8f79c3b7d4 100755 --- a/make-version.pl +++ b/make-version.pl @@ -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 = "."; diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index edb3fb9fb5..f0e3767ea7 100644 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -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 |