[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:36:14 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit cb503b62f5ef4f623d2c80c13c4f32714ceec81a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 14:31:04 2010 +0000

    2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add library version and soname to EFL generated libraries and binary.
            https://bugs.webkit.org/show_bug.cgi?id=43212
    
            Make WebKit-EFL follow libtool soname versioning scheme.
    
            * cmake/OptionsEfl.cmake: Added PROJECT_VERSION_PATCH to PROJECT_VERSION.
    2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add library version and soname to EFL generated libraries and binary.
            https://bugs.webkit.org/show_bug.cgi?id=43212
    
            Add version and soname to libjavascriptcore.so and libwtf.so in case of
            linking as shared libraries, and version to jsc executable.
    
            * CMakeLists.txt:
            * jsc/CMakeLists.txt:
            * wtf/CMakeLists.txt:
    2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add library version and soname to EFL generated libraries and binary.
            https://bugs.webkit.org/show_bug.cgi?id=43212
    
            Add version and soname to libwebcore.so in case of linking as shared
            library.
    
            No new feature, so no new tests.
    
            * CMakeLists.txt:
    2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add library version and soname to EFL generated libraries and binary.
            https://bugs.webkit.org/show_bug.cgi?id=43212
    
            Add version and soname to libewebkit.so.
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64357 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 335e41c..55d27a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add library version and soname to EFL generated libraries and binary.
+        https://bugs.webkit.org/show_bug.cgi?id=43212
+
+        Make WebKit-EFL follow libtool soname versioning scheme.
+
+        * cmake/OptionsEfl.cmake: Added PROJECT_VERSION_PATCH to PROJECT_VERSION.
+
 2010-07-29  Martin Robinson  <mrobinson at igalia.com>
 
         Unreviewed build fix.
diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index 08a0e72..c33146d 100644
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -265,5 +265,6 @@ TARGET_LINK_LIBRARIES(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARIES}
 ADD_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} LINK_FLAGS ${JavaScriptCore_LINK_FLAGS})
 
 IF (SHARED_CORE)
+    SET_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
     INSTALL(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION lib)
 ENDIF ()
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1476861..b72bb65 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add library version and soname to EFL generated libraries and binary.
+        https://bugs.webkit.org/show_bug.cgi?id=43212
+
+        Add version and soname to libjavascriptcore.so and libwtf.so in case of
+        linking as shared libraries, and version to jsc executable.
+
+        * CMakeLists.txt:
+        * jsc/CMakeLists.txt:
+        * wtf/CMakeLists.txt:
+
 2010-07-30  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/jsc/CMakeLists.txt b/JavaScriptCore/jsc/CMakeLists.txt
index 970c20f..756ba92 100644
--- a/JavaScriptCore/jsc/CMakeLists.txt
+++ b/JavaScriptCore/jsc/CMakeLists.txt
@@ -16,3 +16,4 @@ INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
 ADD_EXECUTABLE(${JSC_EXECUTABLE_NAME} ${JSC_HEADERS} ${JSC_SOURCES})
 TARGET_LINK_LIBRARIES(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES})
 ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS ${JSC_LINK_FLAGS})
+SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
diff --git a/JavaScriptCore/wtf/CMakeLists.txt b/JavaScriptCore/wtf/CMakeLists.txt
index 1119b3c..5cf108f 100644
--- a/JavaScriptCore/wtf/CMakeLists.txt
+++ b/JavaScriptCore/wtf/CMakeLists.txt
@@ -42,5 +42,6 @@ TARGET_LINK_LIBRARIES(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES})
 ADD_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} LINK_FLAGS ${WTF_LINK_FLAGS})
 
 IF (SHARED_CORE)
+    SET_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
     INSTALL(TARGETS ${WTF_LIBRARY_NAME} DESTINATION lib)
 ENDIF ()
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 8f4d542..f6070fd 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1879,5 +1879,6 @@ ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS ${WebCore_LINK_FLAGS})
 
 
 IF (SHARED_CORE)
+    SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
     INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION lib)
 ENDIF ()
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe33ea0..57f7c42 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add library version and soname to EFL generated libraries and binary.
+        https://bugs.webkit.org/show_bug.cgi?id=43212
+
+        Add version and soname to libwebcore.so in case of linking as shared
+        library.
+
+        No new feature, so no new tests.
+
+        * CMakeLists.txt:
+
 2010-07-30  Steve Block  <steveblock at google.com>
 
         Reviewed by Steve Block.
diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 3ed3e9c..3fee2c6 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -67,6 +67,7 @@ INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
 TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
 ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 
 INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 76b6fb4..76048df 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-30  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add library version and soname to EFL generated libraries and binary.
+        https://bugs.webkit.org/show_bug.cgi?id=43212
+
+        Add version and soname to libewebkit.so.
+
+        * CMakeLists.txt:
+
 2010-07-26  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Reviewed by Antonio Gomes.
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 2f4be53..7237f25 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -1,6 +1,7 @@
 SET(PROJECT_VERSION_MAJOR 0)
 SET(PROJECT_VERSION_MINOR 1)
-SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
+SET(PROJECT_VERSION_PATCH 0)
+SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}-${PROJECT_VERSION})
 ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list