aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-10-15 08:03:44 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-10-15 08:03:44 +0000
commit58066cd222af2ec57be7ca203d958cf3e5527602 (patch)
treebee9f2549000792570f83a449da933332abfd13f /packaging
parenta3f65d3680e87abd830ca8b292b88908b95c838a (diff)
See if we can build u3 pacakage with GTK3.
svn path=/trunk/; revision=45552
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/wireshark.nsi5
-rwxr-xr-xpackaging/ws-manifest.pl2
2 files changed, 6 insertions, 1 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 5869ecf4d4..7a6dc70b25 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -19,8 +19,11 @@ SetCompressor /SOLID lzma
; ============================================================================
; The file to write
+!if ${GTK_NAME} == "gtk3"
+OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
+!else
OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-gtk3-${VERSION}.exe"
-
+!endif
; Installer icon
Icon "..\..\image\wiresharkinst.ico"
diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl
index fd9a0e20ea..ed228fd394 100755
--- a/packaging/ws-manifest.pl
+++ b/packaging/ws-manifest.pl
@@ -12,6 +12,8 @@ my %u3locs = qw(
$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\etc\pango host
$INSTDIR\help device
$INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines host