[CMAKE] Use *bin* and *lib* directories for executable and libraries.

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

Reviewed by Daniel Bates.

CMake has used *Programs* directory for executable. In addition, shared libraries are being
built in source directory. It is better to set common places in order to maintain executable
and libraries. *bin* is for executable and *lib* is for library.

.:

* CMakeLists.txt: Set library output path.
* Source/cmake/WebKitFS.cmake: Remove *Programs* creation.

Source/JavaScriptCore:

* shell/CMakeLists.txt: Change *Programs* with *bin*.

Source/WebKit2:

* CMakeLists.txt:

Tools:

* DumpRenderTree/efl/CMakeLists.txt:
* EWebLauncher/CMakeLists.txt:
* Scripts/run-launcher:
* Scripts/webkitdirs.pm:
(jscProductDir):
* Scripts/webkitpy/layout_tests/port/efl.py:
(EflPort._path_to_driver):
(EflPort._path_to_image_diff):

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bc473d..e95b39a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,9 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)

diff --git a/ChangeLog b/ChangeLog
index e166730..28ee8fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Use *bin* and *lib* directories for executable and libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=77928
+
+        Reviewed by Daniel Bates.
+
+        CMake has used *Programs* directory for executable. In addition, shared libraries are being
+        built in source directory. It is better to set common places in order to maintain executable
+        and libraries. *bin* is for executable and *lib* is for library.
+
+        * CMakeLists.txt: Set library output path.
+        * Source/cmake/WebKitFS.cmake: Remove *Programs* creation.
+
 2012-02-07  Priit Laes  <plaes@plaes.org>
 
         Get rid of Source/autotools/webkit.m4

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 208345c..971ac33 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Use *bin* and *lib* directories for executable and libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=77928
+
+        Reviewed by Daniel Bates.
+
+        CMake has used *Programs* directory for executable. In addition, shared libraries are being
+        built in source directory. It is better to set common places in order to maintain executable
+        and libraries. *bin* is for executable and *lib* is for library.
+
+        * shell/CMakeLists.txt: Change *Programs* with *bin*.
+
 2012-02-07  Gavin Barraclough  <barraclough@apple.com>
 
         Crash on http://www.rickshawbags.com/

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index 0b273c5..44f02b9 100644 (file)
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -21,7 +21,7 @@ IF (JSC_LINK_FLAGS)
 ENDIF ()
 
 IF ("${PORT}" STREQUAL "Efl")
-    SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Programs")
+    SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 ENDIF ()
 
 IF (SHOULD_INSTALL_JS_SHELL)

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 119e50d..0414d13 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -438,7 +438,7 @@ SET(WebKit2_LIBRARIES
     ${WebCore_LIBRARY_NAME}
 )
 
-SET(WebProcess_NAME ../Programs/WebProcess)
+SET(WebProcess_NAME ../bin/WebProcess)
 SET(WebProcess_SOURCES "")
 
 SET(WebProcess_LIBRARIES

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index b51b4c2..fa1ab15 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Use *bin* and *lib* directories for executable and libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=77928
+
+        Reviewed by Daniel Bates.
+
+        CMake has used *Programs* directory for executable. In addition, shared libraries are being
+        built in source directory. It is better to set common places in order to maintain executable
+        and libraries. *bin* is for executable and *lib* is for library.
+
+        * CMakeLists.txt:
+
 2012-02-07  Timothy Hatcher  <timothy@apple.com>
 
         Initilize the WebPageProxy intrinsicDeviceScaleFactor on creation of the WKView.

diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
index bf356c3..0a0778d 100644 (file)
--- a/Source/cmake/WebKitFS.cmake
+++ b/Source/cmake/WebKitFS.cmake
@@ -1,6 +1,5 @@
 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
-FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
 
 IF (ENABLE_WEBCORE)
     FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b58f2b0..ede28ff 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,23 @@
+2012-02-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Use *bin* and *lib* directories for executable and libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=77928
+
+        Reviewed by Daniel Bates.
+
+        CMake has used *Programs* directory for executable. In addition, shared libraries are being
+        built in source directory. It is better to set common places in order to maintain executable
+        and libraries. *bin* is for executable and *lib* is for library.
+
+        * DumpRenderTree/efl/CMakeLists.txt:
+        * EWebLauncher/CMakeLists.txt:
+        * Scripts/run-launcher:
+        * Scripts/webkitdirs.pm:
+        (jscProductDir):
+        * Scripts/webkitpy/layout_tests/port/efl.py:
+        (EflPort._path_to_driver):
+        (EflPort._path_to_image_diff):
+
 2012-02-07  Adam Klein  <adamk@chromium.org>
 
         Add JSC support for delivering mutations when the outermost script context exits

diff --git a/Tools/DumpRenderTree/efl/CMakeLists.txt b/Tools/DumpRenderTree/efl/CMakeLists.txt
index 0dae168..09726f6 100644 (file)
--- a/Tools/DumpRenderTree/efl/CMakeLists.txt
+++ b/Tools/DumpRenderTree/efl/CMakeLists.txt
@@ -123,12 +123,12 @@ ADD_DEFINITIONS(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
 
 INCLUDE_DIRECTORIES(${DumpRenderTree_INCLUDE_DIRECTORIES})
 
-ADD_EXECUTABLE(Programs/DumpRenderTree ${DumpRenderTree_SOURCES})
-TARGET_LINK_LIBRARIES(Programs/DumpRenderTree ${DumpRenderTree_LIBRARIES})
-ADD_TARGET_PROPERTIES(Programs/DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(Programs/DumpRenderTree PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(bin/DumpRenderTree ${DumpRenderTree_SOURCES})
+TARGET_LINK_LIBRARIES(bin/DumpRenderTree ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(bin/DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/DumpRenderTree PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
-ADD_EXECUTABLE(Programs/ImageDiff ${ImageDiff_SOURCES})
-TARGET_LINK_LIBRARIES(Programs/ImageDiff ${DumpRenderTree_LIBRARIES})
-ADD_TARGET_PROPERTIES(Programs/ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(Programs/ImageDiff PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(bin/ImageDiff ${ImageDiff_SOURCES})
+TARGET_LINK_LIBRARIES(bin/ImageDiff ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(bin/ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/ImageDiff PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

diff --git a/Tools/EWebLauncher/CMakeLists.txt b/Tools/EWebLauncher/CMakeLists.txt
index 69ac7bf..c2da940 100644 (file)
--- a/Tools/EWebLauncher/CMakeLists.txt
+++ b/Tools/EWebLauncher/CMakeLists.txt
@@ -52,7 +52,7 @@ ENDIF ()
 ADD_DEFINITIONS(-DDATA_DIR=\"${THEME_BINARY_DIR}\")
 
 INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
-ADD_EXECUTABLE(Programs/EWebLauncher ${EWebLauncher_SOURCES})
-TARGET_LINK_LIBRARIES(Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
-ADD_TARGET_PROPERTIES(Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(Programs/EWebLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(bin/EWebLauncher ${EWebLauncher_SOURCES})
+TARGET_LINK_LIBRARIES(bin/EWebLauncher ${EWebLauncher_LIBRARIES})
+ADD_TARGET_PROPERTIES(bin/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/EWebLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

diff --git a/Tools/Scripts/run-launcher b/Tools/Scripts/run-launcher
index 15bd009..c2a47dd 100755 (executable)
--- a/Tools/Scripts/run-launcher
+++ b/Tools/Scripts/run-launcher
@@ -72,7 +72,7 @@ if (isQt()) {
     }
     
     if (isEfl()) {
-        $launcherPath = catdir($launcherPath, "Programs", "EWebLauncher");
+        $launcherPath = catdir($launcherPath, "bin", "EWebLauncher");
     }
     
     if (isWx()) {

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index eb22523..eda2b20 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -453,8 +453,8 @@ sub productDir
 sub jscProductDir
 {
     my $productDir = productDir();
-    $productDir .= "/bin" if isQt();
-    $productDir .= "/Programs" if (isGtk() || isEfl());
+    $productDir .= "/bin" if (isQt() || isEfl());
+    $productDir .= "/Programs" if isGtk();
 
     return $productDir;
 }

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/efl.py b/Tools/Scripts/webkitpy/layout_tests/port/efl.py
index a4b70a3..39b0849 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/efl.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/efl.py
@@ -47,10 +47,10 @@ class EflPort(WebKitPort):
         return [TestConfiguration(version=self._version, architecture='x86', build_type=build_type, graphics_type='cpu') for build_type in self.ALL_BUILD_TYPES]
 
     def _path_to_driver(self):
-        return self._build_path('Programs', self.driver_name())
+        return self._build_path('bin', self.driver_name())
 
     def _path_to_image_diff(self):
-        return self._build_path('Programs', 'ImageDiff')
+        return self._build_path('bin', 'ImageDiff')
 
     # FIXME: I doubt EFL wants to override this method.
     def check_build(self, needs_http):