[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
paroga at webkit.org
paroga at webkit.org
Fri Jan 21 14:57:39 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 5199ab446e4b242e55286ed57e370025b6d7b928
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 16:55:13 2011 +0000
2011-01-05 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[CMake] Fix the usage of SOURCE_GROUP
https://bugs.webkit.org/show_bug.cgi?id=51739
* Source/cmake/WebKitMacros.cmake:
2011-01-05 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[CMake] Fix the usage of SOURCE_GROUP
https://bugs.webkit.org/show_bug.cgi?id=51739
* CMakeLists.txt:
2011-01-05 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[CMake] Fix the usage of SOURCE_GROUP
https://bugs.webkit.org/show_bug.cgi?id=51739
* CMakeLists.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75069 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index b4ca18d..ee45908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
Reviewed by Andreas Kling.
+ [CMake] Fix the usage of SOURCE_GROUP
+ https://bugs.webkit.org/show_bug.cgi?id=51739
+
+ * Source/cmake/WebKitMacros.cmake:
+
+2011-01-05 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
[WINCE] Remove CMake warning
https://bugs.webkit.org/show_bug.cgi?id=51921
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 5abd765..f8b4d1e 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -239,22 +239,6 @@ ENDIF ()
INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/CMakeLists${PORT}.txt)
-# Declare source groups for Visual Studio folders
-SOURCE_GROUP(API "API/")
-SOURCE_GROUP(assembler "assembler/")
-SOURCE_GROUP(bytecode "bytecode/")
-SOURCE_GROUP(bytecompiler "bytecompiler/")
-SOURCE_GROUP(debugger "debugger/")
-SOURCE_GROUP(bytecode "bytecode/")
-SOURCE_GROUP(interpreter "interpreter/")
-SOURCE_GROUP(jit "jit/")
-SOURCE_GROUP(parser "parser/")
-SOURCE_GROUP(pcre "pcre/")
-SOURCE_GROUP(profiler "profiler/")
-SOURCE_GROUP(runtime "runtime/")
-SOURCE_GROUP(yarr "yarr/")
-SOURCE_GROUP(wtf "wtf/")
-
ADD_SUBDIRECTORY(wtf)
ADD_SUBDIRECTORY(shell)
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index b5b08e3..dde99a5 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-05 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [CMake] Fix the usage of SOURCE_GROUP
+ https://bugs.webkit.org/show_bug.cgi?id=51739
+
+ * CMakeLists.txt:
+
2011-01-05 Andras Becsi <abecsi at webkit.org>
Reviewed by Csaba Osztrogonác.
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index 235031b..75a87a6 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -103,10 +103,17 @@ MACRO(MAKE_HASH_TOOLS _source)
UNSET(_hash_tools_h)
ENDMACRO()
-MACRO (WEBKIT_WRAP_SOURCELIST _input)
- IF (WTF_PLATFORM_QT)
- FOREACH (_file ${ARGN})
- GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
+MACRO (WEBKIT_WRAP_SOURCELIST)
+ FOREACH (_file ${ARGN})
+ GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
+ GET_FILENAME_COMPONENT(_path ${_file} PATH)
+
+ IF (NOT _file MATCHES "${DERIVED_SOURCES_DIR}")
+ STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
+ SOURCE_GROUP("${_sourcegroup}" FILES ${_file})
+ ENDIF ()
+
+ IF (WTF_PLATFORM_QT)
SET(_moc_filename ${DERIVED_SOURCES_DIR}/${_basename}.moc)
FILE(READ ${_file} _contents)
@@ -116,6 +123,8 @@ MACRO (WEBKIT_WRAP_SOURCELIST _input)
QT4_GENERATE_MOC(${_file} ${_moc_filename})
ADD_SOURCE_DEPENDENCIES(${_file} ${_moc_filename})
ENDIF ()
- ENDFOREACH ()
- ENDIF ()
+ ENDIF ()
+ ENDFOREACH ()
+
+ SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_DIR}")
ENDMACRO ()
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index b950e8f..0be0bb8 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -2220,42 +2220,10 @@ SET(WebCore_LIBRARIES
)
-# Declare source groups for Visual Studio folders
-SOURCE_GROUP(accessibility "accessibility/")
-SOURCE_GROUP(bindings "bindings/")
-SOURCE_GROUP(bridge "bridge/")
-SOURCE_GROUP(Configurations "Configurations/")
-SOURCE_GROUP(css "css/")
-SOURCE_GROUP(dom "dom/")
-SOURCE_GROUP(editing "editing/")
-SOURCE_GROUP(ForwardingHeaders "ForwardingHeaders/")
-SOURCE_GROUP(history "history/")
-SOURCE_GROUP(html "html/")
-SOURCE_GROUP(icu "icu/")
-SOURCE_GROUP(inspector "inspector/")
-SOURCE_GROUP(JavaScriptCore "Source/JavaScriptCore/")
-SOURCE_GROUP(loader "loader/")
-SOURCE_GROUP(manual-tests "manual-tests/")
-SOURCE_GROUP(mathml "mathml/")
-SOURCE_GROUP(notifications "notifications/")
-SOURCE_GROUP(page "page/")
-SOURCE_GROUP(platform "platform/")
-SOURCE_GROUP(plugins "plugins/")
-SOURCE_GROUP(Programs "Programs/")
-SOURCE_GROUP(rendering "rendering/")
-SOURCE_GROUP(Resources "Resources/")
-SOURCE_GROUP(SharedScript "SharedScript/")
-SOURCE_GROUP(storage "storage/")
-SOURCE_GROUP(svg "svg/")
-SOURCE_GROUP(WebCore "WebCore/")
-SOURCE_GROUP(websockets "websockets/")
-SOURCE_GROUP(wml "wml/")
-SOURCE_GROUP(workers "workers/")
-SOURCE_GROUP(xml "xml/")
-
SET(WebCore_LINK_FLAGS "")
INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
+WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
ADD_DEFINITIONS(-DBUILDING_WebCore)
INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f577bd..d09e87a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-05 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [CMake] Fix the usage of SOURCE_GROUP
+ https://bugs.webkit.org/show_bug.cgi?id=51739
+
+ * CMakeLists.txt:
+
2011-01-05 Andras Becsi <abecsi at webkit.org>
Reviewed by Csaba Osztrogonác.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list