CMake: Add support to optionally install the built JavaScript shell

https://bugs.webkit.org/show_bug.cgi?id=71062

Reviewed by Antonio Gomes.

.:

Adds a CMake option, called SHOULD_INSTALL_JS_SHELL, that when
defined will generate an installation rule to install the built
JavaScript shell into /bin (with respect to the prefix path).

By default, we don't define this option and hence don't generate
an installation rule for the JavaScript shell.

* Source/CMakeLists.txt:

Source/JavaScriptCore:

Generate an installation rule for installing the JavaScript shell in
/bin (with respect to the prefix path) when SHOULD_INSTALL_JS_SHELL
is defined.

* shell/CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1a6a0fbd38adfb578218765cb6c2c60c15d11668..4fb665707c1d508bb234a7abd0c405c591e7ad0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-10-27  Daniel Bates  <dbates@rim.com>
+
+        CMake: Add support to optionally install the built JavaScript shell
+        https://bugs.webkit.org/show_bug.cgi?id=71062
+
+        Reviewed by Antonio Gomes.
+
+        Adds a CMake option, called SHOULD_INSTALL_JS_SHELL, that when
+        defined will generate an installation rule to install the built
+        JavaScript shell into /bin (with respect to the prefix path).
+
+        By default, we don't define this option and hence don't generate
+        an installation rule for the JavaScript shell.
+
+        * Source/CMakeLists.txt:
+
 2011-10-27  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r98556.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 93a0fdf9cb69ebaca0647d200f6098a4314f5803..51a66c3657ad3923b2deda2b499d17708cbc596b 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -138,6 +138,11 @@ IF (ENABLE_WEBKIT2)
     ADD_SUBDIRECTORY(WebKit2)
 ENDIF ()
 
+# -----------------------------------------------------------------------------
+# Install JavaScript shell
+# -----------------------------------------------------------------------------
+OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
+
 # -----------------------------------------------------------------------------
 # Add test browser if exists
 # -----------------------------------------------------------------------------

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cf2be0354f54ace44c680bf1d2ddcaa42ace8e5e..bba874866473940b3809c4e13bb93a4da1fd0a44 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-10-27  Daniel Bates  <dbates@rim.com>
+
+        CMake: Add support to optionally install the built JavaScript shell
+        https://bugs.webkit.org/show_bug.cgi?id=71062
+
+        Reviewed by Antonio Gomes.
+
+        Generate an installation rule for installing the JavaScript shell in
+        /bin (with respect to the prefix path) when SHOULD_INSTALL_JS_SHELL
+        is defined.
+
+        * shell/CMakeLists.txt:
+
 2011-10-27  Kentaro Hara  <haraken@chromium.org>
 
         Generate WebKitCSSMatrix constructor for JSC by [Constructor] IDL

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index a3272048b16700e85e3153e2066c2b1f40218085..85fa06c91340f24dc871abc61f69c3ea175bf4ed 100644 (file)
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -23,3 +23,7 @@ ENDIF ()
 IF (SHARED_CORE)
     SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
 ENDIF ()
+
+IF (SHOULD_INSTALL_JS_SHELL)
+    INSTALL(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION bin)
+ENDIF ()