Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
authorGerald Combs <gerald@wireshark.org>
Fri, 18 Jan 2013 01:37:27 +0000 (01:37 -0000)
committerGerald Combs <gerald@wireshark.org>
Fri, 18 Jan 2013 01:37:27 +0000 (01:37 -0000)
svn path=/trunk/; revision=47143

CMakeLists.txt
packaging/macosx/Info.plist.in
ui/qt/QtShark.pro

index 6810dcbca61b47fe62686aa6058171f54c2c2ad4..495f0504b29c2109cde469f8c7564704d41696a1 100644 (file)
@@ -543,6 +543,14 @@ endif()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
+set( configure_input "Built with ${CMAKE_COMMAND}" )
+set( VERSION ${PROJECT_VERSION} )
+
+configure_file(
+       ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in
+       ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist
+       @ONLY)
+
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
 #FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
index 19beb7a57f0b4fbdb74f76a8896440dd86bf9851..bfb32b0242b8a889c0240201f4b4d5890b3cc61e 100644 (file)
@@ -9,7 +9,7 @@
     <key>CFBundleExecutable</key>
     <string>Wireshark</string>
     <key>CFBundleGetInfoString</key>
-    <string>@VERSION@, Copyright 1998-2012 Wireshark Development Team</string>
+    <string>@VERSION@, Copyright 1998-2013 Wireshark Development Team</string>
     <key>CFBundleIconFile</key>
     <string>Wireshark.icns</string>
     <key>CFBundleIdentifier</key>
@@ -62,7 +62,7 @@
     <key>CFBundleVersion</key>
     <string>@VERSION@</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string>
+    <string>Copyright 1998-2013 Wireshark Developers, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.3</string>
 </dict>
index fa3bf6f5d378ed3b37a7770ac154c32dccdfee71..d29c0315b9e0c2c938d5716e23187a9714b1bb28 100644 (file)
@@ -32,8 +32,7 @@ QT += core gui
 TARGET = qtshark
 TEMPLATE = app
 
-# XXX - Need to autogenerate Info.plist from Info.plist.in
-# QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist
+QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist
 
 xxx {
     message( )