diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-28 15:08:31 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-28 15:08:31 +0000 |
| commit | f1b378e4171798e5c3e8fa7e5aaad91214e1619d (patch) | |
| tree | b5878c42550af3cb49c7d7abbb5a2a689a823bb9 | |
| parent | c2b3a8267bbc1eff654d6eb4bbefd69aa0eca1dd (diff) | |
Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index b565ac8e00..6016c6807d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/Makefile.nmake b/Makefile.nmake index 478dfeafe6..38cb3b0356 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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. diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ce60466aff..2bc2e0cb8c 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -672,6 +672,14 @@ 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 ; SetOutPath $INSTDIR\wimaxasncp @@ -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" |