Title: [199530] trunk
- Revision
- 199530
- Author
- [email protected]
- Date
- 2016-04-13 22:56:45 -0700 (Wed, 13 Apr 2016)
Log Message
CMake MiniBrowser should be an app bundle
https://bugs.webkit.org/show_bug.cgi?id=156521
Reviewed by Brent Fulgham.
Source/_javascript_Core:
* PlatformMac.cmake:
Unreviewed build fix. Define __STDC_WANT_LIB_EXT1__ so we can find memset_s.
Tools:
* MiniBrowser/mac/CMakeLists.txt:
Make an app bundle and compile nibs.
* MiniBrowser/mac/Info.plist:
CMake doesn't know what to do with :rfc1034identifier and there's no reason to keep it. This is just MiniBrowser.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (199529 => 199530)
--- trunk/Source/_javascript_Core/ChangeLog 2016-04-14 04:59:49 UTC (rev 199529)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-14 05:56:45 UTC (rev 199530)
@@ -1,3 +1,13 @@
+2016-04-13 Alex Christensen <[email protected]>
+
+ CMake MiniBrowser should be an app bundle
+ https://bugs.webkit.org/show_bug.cgi?id=156521
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformMac.cmake:
+ Unreviewed build fix. Define __STDC_WANT_LIB_EXT1__ so we can find memset_s.
+
2016-04-13 Joseph Pecoraro <[email protected]>
JSContext Inspector: Improve Class instances and JSC API Exported Values view in Console / ObjectTree
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (199529 => 199530)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2016-04-14 04:59:49 UTC (rev 199529)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2016-04-14 05:56:45 UTC (rev 199530)
@@ -16,7 +16,7 @@
inspector/remote/RemoteInspector.mm
inspector/remote/RemoteInspectorXPCConnection.mm
)
-add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF -D__STDC_WANT_LIB_EXT1__)
find_library(SECURITY_LIBRARY Security)
list(APPEND _javascript_Core_LIBRARIES
Modified: trunk/Tools/ChangeLog (199529 => 199530)
--- trunk/Tools/ChangeLog 2016-04-14 04:59:49 UTC (rev 199529)
+++ trunk/Tools/ChangeLog 2016-04-14 05:56:45 UTC (rev 199530)
@@ -1,3 +1,15 @@
+2016-04-13 Alex Christensen <[email protected]>
+
+ CMake MiniBrowser should be an app bundle
+ https://bugs.webkit.org/show_bug.cgi?id=156521
+
+ Reviewed by Brent Fulgham.
+
+ * MiniBrowser/mac/CMakeLists.txt:
+ Make an app bundle and compile nibs.
+ * MiniBrowser/mac/Info.plist:
+ CMake doesn't know what to do with :rfc1034identifier and there's no reason to keep it. This is just MiniBrowser.
+
2016-04-13 Chris Dumez <[email protected]>
We should not speculatively revalidate cached redirects
Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (199529 => 199530)
--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-04-14 04:59:49 UTC (rev 199529)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-04-14 05:56:45 UTC (rev 199530)
@@ -28,6 +28,17 @@
WebKit2
)
+set(EXECUTABLE_NAME MiniBrowser)
+set(PRODUCT_NAME MiniBrowser)
+
+set(MiniBrowser_Contents_Directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/MiniBrowser.app/Contents)
+make_directory(${MiniBrowser_Contents_Directory}/Resources)
+add_custom_target(BrowserWindowNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/BrowserWindow.nib ${MINIBROWSER_DIR}/BrowserWindow.xib VERBATIM)
+add_custom_target(ExtensionManagerWindowControllerNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/ExtensionManagerWindowController.nib ${MINIBROWSER_DIR}/ExtensionManagerWindowController.xib VERBATIM)
+add_custom_target(MainMenuNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/MainMenu.nib ${MINIBROWSER_DIR}/MainMenu.xib VERBATIM)
+
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
-add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+add_executable(MiniBrowser MACOSX_BUNDLE ${MiniBrowser_SOURCES})
+set_target_properties(MiniBrowser PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MINIBROWSER_DIR}/Info.plist)
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+add_dependencies(MiniBrowser BrowserWindowNib ExtensionManagerWindowControllerNib MainMenuNib)
Modified: trunk/Tools/MiniBrowser/mac/Info.plist (199529 => 199530)
--- trunk/Tools/MiniBrowser/mac/Info.plist 2016-04-14 04:59:49 UTC (rev 199529)
+++ trunk/Tools/MiniBrowser/mac/Info.plist 2016-04-14 05:56:45 UTC (rev 199530)
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string>MiniBrowser</string>
<key>CFBundleIdentifier</key>
- <string>org.webkit.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>org.webkit.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
