Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 Aug 2011 15:08:31 +0000 (15:08 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 Aug 2011 15:08:31 +0000 (15:08 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
Makefile.nmake
packaging/nsis/wireshark.nsi

index b565ac8e0062e467a0d66d8dc316a86b62406531..6016c6807df3941c61b3ccb80ea285fecea0b1bd 100644 (file)
@@ -263,6 +263,13 @@ tpncpdir = $(pkgdatadir)/tpncp
 tpncp_DATA = \
        tpncp/tpncp.dat
 
+#
+# Install the ui directory files in the "ui" subdirectory
+# of that directory
+#
+uidir = $(pkgdatadir)/ui
+ui_DATA = \
+       gtk/ui/bytes-view-ui.xml
 
 #
 # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -803,6 +810,7 @@ EXTRA_DIST = \
        $(dtds_DATA)            \
        $(radius_DATA)          \
        $(tpncp_DATA)           \
+       $(ui_DATA)                      \
        $(wimaxasncp_DATA)      \
        randpkt.c               \
        smi_modules             \
index 478dfeafe6a2bf1acaba32a740e7277e8120b00a..38cb3b0356dac9fa3d4adc42bb394c45e8df81bd 100644 (file)
@@ -1011,6 +1011,8 @@ install-generated-files:
        cd plugins
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
        cd ..
+       if not exist $(INSTALL_DIR)\ui mkdir $(INSTALL_DIR)\ui
+       xcopy "gtk\ui\*.xml" $(INSTALL_DIR)\ui /d
 
 # "install-all" will copy all files needed to run Wireshark/Tshark
 # to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there.
index ce60466aff1d2cc556ad3b9e7b5c4fe3c54f8a1c..2bc2e0cb8c0ef30628d986c2614b3a5230212707 100644 (file)
@@ -671,6 +671,14 @@ SetOutPath $INSTDIR
 SetOutPath $INSTDIR\tpncp
 File "..\..\tpncp\tpncp.dat"
 
+;
+; Install the GUI XML files in the "ui" subdirectory
+; of the installation directory.
+;
+SetOutPath $INSTDIR\ui
+File "..\..\gtk\ui\bytes-view-ui.xml"
+SetOutPath $INSTDIR
+
 ;
 ; install the wimaxasncp TLV definitions in the wimaxasncp subdirectory
 ;
@@ -1097,6 +1105,7 @@ Delete "$INSTDIR\diameter\*.*"
 Delete "$INSTDIR\snmp\mibs\*.*"
 Delete "$INSTDIR\snmp\*.*"
 Delete "$INSTDIR\tpncp\*.*"
+Delete "$INSTDIR\ui\*.*"
 Delete "$INSTDIR\wimaxasncp\*.*"
 Delete "$INSTDIR\*.exe"
 Delete "$INSTDIR\*.dll"
@@ -1161,6 +1170,7 @@ RMDir "$INSTDIR\snmp"
 RMDir "$INSTDIR\radius"
 RMDir "$INSTDIR\dtds"
 RMDir "$INSTDIR\tpncp"
+RMDir "$INSTDIR\ui"
 RMDir "$INSTDIR\wimaxasncp"
 RMDir "$INSTDIR"