[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: create libsonnetcore
From: Christoph Cullmann <cullmann () kde ! org>
Date: 2011-08-10 9:43:16
Message-ID: 20110810094316.BE893A60AE () git ! kde ! org
[Download RAW message or body]
Git commit 8e51a20d44ab640a918af896acf0e14b235e0b05 by Christoph Cullmann.
Committed on 10/08/2011 at 11:42.
Pushed by cullmann into branch 'frameworks'.
create libsonnetcore
will install headers like before in include/sonnet
new header include/sonnet/sonnetcore_export.h
should compile, tests still work, at least here
R +0 -0 tier2/sonnet/core/backgroundchecker.cpp [from: kdecore/sonnet/backgroundchecker.cpp - 100% \
similarity] R +0 -0 tier2/sonnet/core/tests/test_filter.h [from: \
kdecore/sonnet/tests/test_filter.h - 100% similarity] R +0 -0 tier2/sonnet/core/speller.cpp [from: \
kdecore/sonnet/speller.cpp - 100% similarity] M +1 -1 tier2/sonnet/plugins/hspell/CMakeLists.txt
R +3 -3 tier2/sonnet/core/globals.h [from: kdecore/sonnet/globals.h - 089% similarity]
M +1 -1 tier2/sonnet/plugins/enchant/CMakeLists.txt
R +0 -0 tier2/sonnet/core/client_p.h [from: kdecore/sonnet/client_p.h - 100% similarity]
R +0 -0 tier2/sonnet/core/loader_p.h [from: kdecore/sonnet/loader_p.h - 100% similarity]
R +0 -0 tier2/sonnet/core/tests/test_filter.cpp [from: kdecore/sonnet/tests/test_filter.cpp - 100% \
similarity] R +0 -0 tier2/sonnet/core/settings_p.h [from: kdecore/sonnet/settings_p.h - 100% \
similarity] R +2 -2 tier2/sonnet/core/speller.h [from: kdecore/sonnet/speller.h - 098% similarity]
R +0 -0 tier2/sonnet/core/backgroundengine_p.h [from: kdecore/sonnet/backgroundengine_p.h - 100% \
similarity] R +0 -0 tier2/sonnet/core/settings.cpp [from: kdecore/sonnet/settings.cpp - 100% \
similarity] R +0 -0 tier2/sonnet/core/tests/test_config.cpp [from: \
kdecore/sonnet/tests/test_config.cpp - 100% similarity] R +0 -0 tier2/sonnet/core/filter.cpp \
[from: kdecore/sonnet/filter.cpp - 100% similarity] M +1 -0 tier2/sonnet/CMakeLists.txt
R +0 -0 tier2/sonnet/core/tests/test_dialog.h [from: kdecore/sonnet/tests/test_dialog.h - 100% \
similarity] A +47 -0 tier2/sonnet/core/CMakeLists.txt
M +1 -1 tier2/sonnet/plugins/aspell/CMakeLists.txt
M +0 -16 kdecore/CMakeLists.txt
R +0 -0 tier2/sonnet/core/spellerplugin.cpp [from: kdecore/sonnet/spellerplugin.cpp - 100% \
similarity] R +0 -0 tier2/sonnet/core/sonnetspeller.desktop [from: \
kdecore/sonnet/sonnetspeller.desktop - 100% similarity] R +0 -0 \
tier2/sonnet/core/tests/test_core.cpp [from: kdecore/sonnet/tests/test_core.cpp - 100% similarity] R +0 \
-0 tier2/sonnet/core/filter_p.h [from: kdecore/sonnet/filter_p.h - 100% similarity] R +2 -2 \
tier2/sonnet/core/backgroundchecker.h [from: kdecore/sonnet/backgroundchecker.h - 097% similarity] R +0 \
-0 tier2/sonnet/core/tests/test_core.h [from: kdecore/sonnet/tests/test_core.h - 100% similarity] R \
+0 -0 tier2/sonnet/core/client.cpp [from: kdecore/sonnet/client.cpp - 100% similarity] M +1 -1 \
tier2/sonnet/plugins/hunspell/CMakeLists.txt R +0 -0 tier2/sonnet/core/loader.cpp [from: \
kdecore/sonnet/loader.cpp - 100% similarity] R +0 -0 tier2/sonnet/core/tests/test.cpp [from: \
kdecore/sonnet/tests/test.cpp - 100% similarity] R +0 -0 tier2/sonnet/core/tests/test_dialog.cpp \
[from: kdecore/sonnet/tests/test_dialog.cpp - 100% similarity] R +0 -0 \
tier2/sonnet/core/globals.cpp [from: kdecore/sonnet/globals.cpp - 100% similarity] M +1 -1 \
tier2/sonnet/plugins/CMakeLists.txt R +0 -0 tier2/sonnet/core/backgroundengine.cpp [from: \
kdecore/sonnet/backgroundengine.cpp - 100% similarity] R +0 -0 tier2/sonnet/core/spellerplugin_p.h \
[from: kdecore/sonnet/spellerplugin_p.h - 100% similarity] R +2 -2 \
tier2/sonnet/core/tests/CMakeLists.txt [from: kdecore/sonnet/tests/CMakeLists.txt - 081% similarity]
http://commits.kde.org/kdelibs/8e51a20d44ab640a918af896acf0e14b235e0b05
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 8b6dead..b8f9d3b 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -53,8 +53,6 @@ if (KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
set(KDECORE_NO_KDE3SUPPORT TRUE)
endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/sonnet/ )
-
# kdecore_OPTIONAL_SRCS is used to collect source files
# which are not always compiled into kdecore
# if it's used, *always* append to it
@@ -145,7 +143,6 @@ endif (UNIX)
add_subdirectory( kconfig_compiler )
add_subdirectory( tests )
-add_subdirectory( sonnet/tests )
if ( NOT WINCE )
add_subdirectory( network/kssld )
endif ( NOT WINCE )
@@ -252,15 +249,6 @@ set(kdecore_LIB_SRCS
services/yacc.c
services/lex.c
services/kplugininfo.cpp
- sonnet/loader.cpp
- sonnet/client.cpp
- sonnet/spellerplugin.cpp
- sonnet/speller.cpp
- sonnet/filter.cpp
- sonnet/settings.cpp
- sonnet/backgroundchecker.cpp
- sonnet/backgroundengine.cpp
- sonnet/globals.cpp
)
if (NOT KDECORE_NO_KDE3SUPPORT)
@@ -627,13 +615,9 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
-install( FILES sonnet/backgroundchecker.h sonnet/speller.h sonnet/globals.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel)
-
install( FILES
config/kconfigbackend.desktop
services/kplugininfo.desktop
- sonnet/sonnetspeller.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
diff --git a/tier2/sonnet/CMakeLists.txt b/tier2/sonnet/CMakeLists.txt
index 246e32c..7e74b83 100644
--- a/tier2/sonnet/CMakeLists.txt
+++ b/tier2/sonnet/CMakeLists.txt
@@ -2,4 +2,5 @@
# this consists of libsonnetcore & libsonnetui + plugins
project(sonnet)
+add_subdirectory( core )
add_subdirectory( plugins )
diff --git a/tier2/sonnet/core/CMakeLists.txt b/tier2/sonnet/core/CMakeLists.txt
new file mode 100644
index 0000000..d0548f5
--- /dev/null
+++ b/tier2/sonnet/core/CMakeLists.txt
@@ -0,0 +1,47 @@
+project(sonnetcore)
+
+include_directories(
+ ${QT_INCLUDES}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set(sonnetcore_SRCS
+ loader.cpp
+ client.cpp
+ spellerplugin.cpp
+ speller.cpp
+ filter.cpp
+ settings.cpp
+ backgroundchecker.cpp
+ backgroundengine.cpp
+ globals.cpp
+)
+
+kde4_add_library(sonnetcore ${LIBRARY_TYPE} ${sonnetcore_SRCS})
+
+generate_export_header(sonnetcore
+ DEPRECATED_NAME KDE_DEPRECATED
+)
+
+target_link_libraries(sonnetcore ${QT_QTCORE_LIBRARY} ${KDE4_KDECORE_LIBS})
+
+set_target_properties(sonnetcore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
+)
+
+install(TARGETS sonnetcore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
+install( FILES backgroundchecker.h speller.h globals.h ${CMAKE_CURRENT_BINARY_DIR}/sonnetcore_export.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel)
+
+
+install( FILES
+ sonnetspeller.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+# add tests
+add_subdirectory (tests)
diff --git a/kdecore/sonnet/backgroundchecker.cpp b/tier2/sonnet/core/backgroundchecker.cpp
similarity index 100%
rename from kdecore/sonnet/backgroundchecker.cpp
rename to tier2/sonnet/core/backgroundchecker.cpp
diff --git a/kdecore/sonnet/backgroundchecker.h b/tier2/sonnet/core/backgroundchecker.h
similarity index 97%
rename from kdecore/sonnet/backgroundchecker.h
rename to tier2/sonnet/core/backgroundchecker.h
index a0fbbca..f0da3a3 100644
--- a/kdecore/sonnet/backgroundchecker.h
+++ b/tier2/sonnet/core/backgroundchecker.h
@@ -23,7 +23,7 @@
#include "speller.h"
-#include <kdecore_export.h>
+#include "sonnetcore_export.h"
#include <QtCore/QObject>
@@ -51,7 +51,7 @@ namespace Sonnet
* @author Zack Rusin <zack@kde.org>
* @short class used for spell checking in the background
*/
- class KDECORE_EXPORT BackgroundChecker : public QObject
+ class SONNETCORE_EXPORT BackgroundChecker : public QObject
{
Q_OBJECT
public:
diff --git a/kdecore/sonnet/backgroundengine.cpp b/tier2/sonnet/core/backgroundengine.cpp
similarity index 100%
rename from kdecore/sonnet/backgroundengine.cpp
rename to tier2/sonnet/core/backgroundengine.cpp
diff --git a/kdecore/sonnet/backgroundengine_p.h b/tier2/sonnet/core/backgroundengine_p.h
similarity index 100%
rename from kdecore/sonnet/backgroundengine_p.h
rename to tier2/sonnet/core/backgroundengine_p.h
diff --git a/kdecore/sonnet/client.cpp b/tier2/sonnet/core/client.cpp
similarity index 100%
rename from kdecore/sonnet/client.cpp
rename to tier2/sonnet/core/client.cpp
diff --git a/kdecore/sonnet/client_p.h b/tier2/sonnet/core/client_p.h
similarity index 100%
rename from kdecore/sonnet/client_p.h
rename to tier2/sonnet/core/client_p.h
diff --git a/kdecore/sonnet/filter.cpp b/tier2/sonnet/core/filter.cpp
similarity index 100%
rename from kdecore/sonnet/filter.cpp
rename to tier2/sonnet/core/filter.cpp
diff --git a/kdecore/sonnet/filter_p.h b/tier2/sonnet/core/filter_p.h
similarity index 100%
rename from kdecore/sonnet/filter_p.h
rename to tier2/sonnet/core/filter_p.h
diff --git a/kdecore/sonnet/globals.cpp b/tier2/sonnet/core/globals.cpp
similarity index 100%
rename from kdecore/sonnet/globals.cpp
rename to tier2/sonnet/core/globals.cpp
diff --git a/kdecore/sonnet/globals.h b/tier2/sonnet/core/globals.h
similarity index 89%
rename from kdecore/sonnet/globals.h
rename to tier2/sonnet/core/globals.h
index d6ce8a3..78b4d5a 100644
--- a/kdecore/sonnet/globals.h
+++ b/tier2/sonnet/core/globals.h
@@ -21,7 +21,7 @@
#include <QtCore/QString>
-#include <kdecore_export.h>
+#include "sonnetcore_export.h"
namespace Sonnet {
@@ -32,7 +32,7 @@ namespace Sonnet {
*
* @since 4.2
*/
- extern KDECORE_EXPORT QString detectLanguage(const QString &sentence);
+ extern SONNETCORE_EXPORT QString detectLanguage(const QString &sentence);
/**
* @return the default language which is stored in the sonnetrc config file.
@@ -43,7 +43,7 @@ namespace Sonnet {
*
* @since 4.2
*/
- extern KDECORE_EXPORT QString defaultLanguageName();
+ extern SONNETCORE_EXPORT QString defaultLanguageName();
}
#endif
diff --git a/kdecore/sonnet/loader.cpp b/tier2/sonnet/core/loader.cpp
similarity index 100%
rename from kdecore/sonnet/loader.cpp
rename to tier2/sonnet/core/loader.cpp
diff --git a/kdecore/sonnet/loader_p.h b/tier2/sonnet/core/loader_p.h
similarity index 100%
rename from kdecore/sonnet/loader_p.h
rename to tier2/sonnet/core/loader_p.h
diff --git a/kdecore/sonnet/settings.cpp b/tier2/sonnet/core/settings.cpp
similarity index 100%
rename from kdecore/sonnet/settings.cpp
rename to tier2/sonnet/core/settings.cpp
diff --git a/kdecore/sonnet/settings_p.h b/tier2/sonnet/core/settings_p.h
similarity index 100%
rename from kdecore/sonnet/settings_p.h
rename to tier2/sonnet/core/settings_p.h
diff --git a/kdecore/sonnet/sonnetspeller.desktop b/tier2/sonnet/core/sonnetspeller.desktop
similarity index 100%
rename from kdecore/sonnet/sonnetspeller.desktop
rename to tier2/sonnet/core/sonnetspeller.desktop
diff --git a/kdecore/sonnet/speller.cpp b/tier2/sonnet/core/speller.cpp
similarity index 100%
rename from kdecore/sonnet/speller.cpp
rename to tier2/sonnet/core/speller.cpp
diff --git a/kdecore/sonnet/speller.h b/tier2/sonnet/core/speller.h
similarity index 98%
rename from kdecore/sonnet/speller.h
rename to tier2/sonnet/core/speller.h
index e076950..37dd82f 100644
--- a/kdecore/sonnet/speller.h
+++ b/tier2/sonnet/core/speller.h
@@ -24,7 +24,7 @@
#include <QtCore/QStringList>
#include <QtCore/QString>
-#include <kdecore_export.h>
+#include "sonnetcore_export.h"
class KConfig;
@@ -35,7 +35,7 @@ namespace Sonnet
*
* @short class used for actuall spell checking
*/
- class KDECORE_EXPORT Speller
+ class SONNETCORE_EXPORT Speller
{
public:
Speller(const QString &lang=QString());
diff --git a/kdecore/sonnet/spellerplugin.cpp b/tier2/sonnet/core/spellerplugin.cpp
similarity index 100%
rename from kdecore/sonnet/spellerplugin.cpp
rename to tier2/sonnet/core/spellerplugin.cpp
diff --git a/kdecore/sonnet/spellerplugin_p.h b/tier2/sonnet/core/spellerplugin_p.h
similarity index 100%
rename from kdecore/sonnet/spellerplugin_p.h
rename to tier2/sonnet/core/spellerplugin_p.h
diff --git a/kdecore/sonnet/tests/CMakeLists.txt b/tier2/sonnet/core/tests/CMakeLists.txt
similarity index 81%
rename from kdecore/sonnet/tests/CMakeLists.txt
rename to tier2/sonnet/core/tests/CMakeLists.txt
index 929af6f..208593a 100644
--- a/kdecore/sonnet/tests/CMakeLists.txt
+++ b/tier2/sonnet/core/tests/CMakeLists.txt
@@ -9,14 +9,14 @@ set(test_suggest_SRCS test.cpp)
kde4_add_executable(test_suggest TEST ${test_suggest_SRCS})
-target_link_libraries(test_suggest ${KDE4_KDECORE_LIBS} )
+target_link_libraries(test_suggest ${KDE4_KDECORE_LIBS} sonnetcore)
########### unittests ###############
MACRO(SONNET_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME sonnet-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} \
${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES}) + target_link_libraries(${_testname} \
${KDE4_KDECORE_LIBS} sonnetcore ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES}) \
ENDFOREACH(_testname) ENDMACRO(SONNET_UNIT_TESTS)
diff --git a/kdecore/sonnet/tests/test.cpp b/tier2/sonnet/core/tests/test.cpp
similarity index 100%
rename from kdecore/sonnet/tests/test.cpp
rename to tier2/sonnet/core/tests/test.cpp
diff --git a/kdecore/sonnet/tests/test_config.cpp b/tier2/sonnet/core/tests/test_config.cpp
similarity index 100%
rename from kdecore/sonnet/tests/test_config.cpp
rename to tier2/sonnet/core/tests/test_config.cpp
diff --git a/kdecore/sonnet/tests/test_core.cpp b/tier2/sonnet/core/tests/test_core.cpp
similarity index 100%
rename from kdecore/sonnet/tests/test_core.cpp
rename to tier2/sonnet/core/tests/test_core.cpp
diff --git a/kdecore/sonnet/tests/test_core.h b/tier2/sonnet/core/tests/test_core.h
similarity index 100%
rename from kdecore/sonnet/tests/test_core.h
rename to tier2/sonnet/core/tests/test_core.h
diff --git a/kdecore/sonnet/tests/test_dialog.cpp b/tier2/sonnet/core/tests/test_dialog.cpp
similarity index 100%
rename from kdecore/sonnet/tests/test_dialog.cpp
rename to tier2/sonnet/core/tests/test_dialog.cpp
diff --git a/kdecore/sonnet/tests/test_dialog.h b/tier2/sonnet/core/tests/test_dialog.h
similarity index 100%
rename from kdecore/sonnet/tests/test_dialog.h
rename to tier2/sonnet/core/tests/test_dialog.h
diff --git a/kdecore/sonnet/tests/test_filter.cpp b/tier2/sonnet/core/tests/test_filter.cpp
similarity index 100%
rename from kdecore/sonnet/tests/test_filter.cpp
rename to tier2/sonnet/core/tests/test_filter.cpp
diff --git a/kdecore/sonnet/tests/test_filter.h b/tier2/sonnet/core/tests/test_filter.h
similarity index 100%
rename from kdecore/sonnet/tests/test_filter.h
rename to tier2/sonnet/core/tests/test_filter.h
diff --git a/tier2/sonnet/plugins/CMakeLists.txt b/tier2/sonnet/plugins/CMakeLists.txt
index 9d69005..17bd573 100644
--- a/tier2/sonnet/plugins/CMakeLists.txt
+++ b/tier2/sonnet/plugins/CMakeLists.txt
@@ -1,6 +1,6 @@
include_directories(
- ${CMAKE_SOURCE_DIR}/kdecore/sonnet ${KDE4_KDECORE_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core ${KDE4_KDECORE_INCLUDES}
)
# you can find macro_optional_find_package() in kdelibs/cmake/modules/OptionalFindPackage.cmake
diff --git a/tier2/sonnet/plugins/aspell/CMakeLists.txt b/tier2/sonnet/plugins/aspell/CMakeLists.txt
index f81b8f8..2f7c4bd 100644
--- a/tier2/sonnet/plugins/aspell/CMakeLists.txt
+++ b/tier2/sonnet/plugins/aspell/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kspell_aspell_PART_SRCS kspell_aspellclient.cpp kspell_aspelldict.cpp )
kde4_add_plugin(kspell_aspell ${kspell_aspell_PART_SRCS})
-target_link_libraries(kspell_aspell ${KDE4_KDECORE_LIBS} ${ASPELL_LIBRARIES} )
+target_link_libraries(kspell_aspell ${KDE4_KDECORE_LIBS} sonnetcore ${ASPELL_LIBRARIES} )
install(TARGETS kspell_aspell DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tier2/sonnet/plugins/enchant/CMakeLists.txt b/tier2/sonnet/plugins/enchant/CMakeLists.txt
index c71e04d..e3365cf 100644
--- a/tier2/sonnet/plugins/enchant/CMakeLists.txt
+++ b/tier2/sonnet/plugins/enchant/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kspell_enchant_PART_SRCS enchantdict.cpp enchantclient.cpp )
kde4_add_plugin(kspell_enchant ${kspell_enchant_PART_SRCS})
-target_link_libraries(kspell_enchant ${KDE4_KDECORE_LIBS} ${ENCHANT_LIBRARIES} )
+target_link_libraries(kspell_enchant ${KDE4_KDECORE_LIBS} sonnetcore ${ENCHANT_LIBRARIES} )
install(TARGETS kspell_enchant DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tier2/sonnet/plugins/hspell/CMakeLists.txt b/tier2/sonnet/plugins/hspell/CMakeLists.txt
index 0ce7019..9e7bf13 100644
--- a/tier2/sonnet/plugins/hspell/CMakeLists.txt
+++ b/tier2/sonnet/plugins/hspell/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kspell_hspell_PART_SRCS kspell_hspellclient.cpp kspell_hspelldict.cpp )
kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
-target_link_libraries(kspell_hspell ${KDE4_KDECORE_LIBS} ${HSPELL_LIBRARIES} ${ZLIB_LIBRARY} )
+target_link_libraries(kspell_hspell ${KDE4_KDECORE_LIBS} sonnetcore ${HSPELL_LIBRARIES} ${ZLIB_LIBRARY} \
)
install(TARGETS kspell_hspell DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tier2/sonnet/plugins/hunspell/CMakeLists.txt b/tier2/sonnet/plugins/hunspell/CMakeLists.txt
index c480e34..86e33a0 100644
--- a/tier2/sonnet/plugins/hunspell/CMakeLists.txt
+++ b/tier2/sonnet/plugins/hunspell/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kspell_hunspell_PART_SRCS kspell_hunspellclient.cpp kspell_hunspelldict.cpp
kde4_add_plugin(kspell_hunspell ${kspell_hunspell_PART_SRCS})
-target_link_libraries(kspell_hunspell ${KDE4_KDECORE_LIBS} ${HUNSPELL_LIBRARIES} )
+target_link_libraries(kspell_hunspell ${KDE4_KDECORE_LIBS} sonnetcore ${HUNSPELL_LIBRARIES} )
install(TARGETS kspell_hunspell DESTINATION ${PLUGIN_INSTALL_DIR} )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic