[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice [POSSIBLY UNSAFE]
From: Thomas Zander <zander () kde ! org>
Date: 2010-01-31 22:07:13
Message-ID: 1264975633.748591.28895.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1083250 by zander:
Merge kostore and koodf
As decided at the oslo meeting, move kostore stuff into koodf
M +3 -8 CMakeLists.txt
M +0 -4 cmake/modules/FindKOfficeLibs.cmake.in
M +1 -3 kexi/shapes/relationdesign/CMakeLists.txt
M +2 -2 kplato/libs/kernel/CMakeLists.txt
M +1 -1 kplato/libs/kernel/tests/CMakeLists.txt
M +1 -1 kplato/libs/models/tests/CMakeLists.txt
M +2 -2 kplato/plugins/schedulers/rcps/CMakeLists.txt
M +1 -1 kplato/tests/CMakeLists.txt
M +0 -2 kpresenter/plugins/eventactions/CMakeLists.txt
M +1 -1 krita/image/tests/CMakeLists.txt
M +0 -1 libs/CMakeLists.txt
M +22 -5 libs/odf/CMakeLists.txt
A libs/odf/KoDirectoryStore.cpp \
libs/store/KoDirectoryStore.cpp#1083176 [License: LGPL (v2+)] A \
libs/odf/KoDirectoryStore.h libs/store/KoDirectoryStore.h#1083176 [License: LGPL \
(v2+)] A libs/odf/KoEncryptedStore.cpp \
libs/store/KoEncryptedStore.cpp#1083176 [License: LGPL (v2+)] A \
libs/odf/KoEncryptedStore.h libs/store/KoEncryptedStore.h#1083176 [License: LGPL \
(v2+)] A libs/odf/KoEncryptionChecker.cpp \
libs/store/KoEncryptionChecker.cpp#1083176 [License: LGPL (v2+)] A \
libs/odf/KoEncryptionChecker.h libs/store/KoEncryptionChecker.h#1083176 [License: \
LGPL (v2+)] A libs/odf/KoStore.cpp libs/store/KoStore.cpp#1083176 \
[License: LGPL (v2+)] A libs/odf/KoStore.h \
libs/store/KoStore.h#1083176 [License: LGPL (v2+)] A \
libs/odf/KoStoreDevice.h libs/store/KoStoreDevice.h#1083176 [License: LGPL (v2+)] \
A libs/odf/KoStore_p.h libs/store/KoStore_p.h#1083176 [License: LGPL \
(v2+)] A libs/odf/KoTarStore.cpp libs/store/KoTarStore.cpp#1083176 \
[License: LGPL (v2+)] A libs/odf/KoTarStore.h \
libs/store/KoTarStore.h#1083176 [License: LGPL (v2+)] A \
libs/odf/KoXmlReader.cpp libs/store/KoXmlReader.cpp#1083176 [License: LGPL (v2+)] \
A libs/odf/KoXmlReader.h libs/store/KoXmlReader.h#1083176 [License: \
LGPL (v2+)] A libs/odf/KoXmlReaderForward.h \
libs/store/KoXmlReaderForward.h#1083176 [License: LGPL (v2+)] A \
libs/odf/KoXmlWriter.cpp libs/store/KoXmlWriter.cpp#1083176 [License: LGPL (v2+)] \
A libs/odf/KoXmlWriter.h libs/store/KoXmlWriter.h#1083176 [License: \
LGPL (v2+)] A libs/odf/KoZipStore.cpp \
libs/store/KoZipStore.cpp#1083176 [License: LGPL (v2+)] A \
libs/odf/KoZipStore.h libs/store/KoZipStore.h#1083176 [License: LGPL (v2+)] M +40 \
-1 libs/odf/tests/CMakeLists.txt A libs/odf/tests/TestStorage.cpp \
libs/store/tests/TestStorage.cpp#1083176 [POSSIBLY UNSAFE: system] [License: LGPL \
(v2+)] A libs/odf/tests/TestXmlReader.cpp \
libs/store/tests/TestXmlReader.cpp#1083176 [License: UNKNOWN] A \
libs/odf/tests/TestXmlWriter.cpp libs/store/tests/TestXmlWriter.cpp#1083176 \
[License: LGPL (v2+)] A libs/odf/tests/kodomtest.cpp \
libs/store/tests/kodomtest.cpp#1083176 [License: LGPL (v2+)] A \
libs/odf/tests/kodomtest.h libs/store/tests/kodomtest.h#1083176 [License: LGPL \
(v2+)] A libs/odf/tests/storedroptest.cpp \
libs/store/tests/storedroptest.cpp#1083176 [License: LGPL (v2+)] D \
libs/store/CMakeLists.txt D libs/store/KoDirectoryStore.cpp
D libs/store/KoDirectoryStore.h
D libs/store/KoEncryptedStore.cpp
D libs/store/KoEncryptedStore.h
D libs/store/KoEncryptionChecker.cpp
D libs/store/KoEncryptionChecker.h
D libs/store/KoStore.cpp
D libs/store/KoStore.h
D libs/store/KoStoreDevice.h
D libs/store/KoStore_p.h
D libs/store/KoTarStore.cpp
D libs/store/KoTarStore.h
D libs/store/KoXmlReader.cpp
D libs/store/KoXmlReader.h
D libs/store/KoXmlReaderForward.h
D libs/store/KoXmlWriter.cpp
D libs/store/KoXmlWriter.h
D libs/store/KoZipStore.cpp
D libs/store/KoZipStore.h
D libs/store/Mainpage.dox
D libs/store/SPEC
D libs/store/kostore_export.h
D libs/store/tests/CMakeLists.txt
D libs/store/tests/TestStorage.cpp
D libs/store/tests/TestXmlReader.cpp
D libs/store/tests/TestXmlWriter.cpp
D libs/store/tests/kodomtest.cpp
D libs/store/tests/kodomtest.h
D libs/store/tests/storedroptest.cpp
M +1 -1 plugins/musicshape/core/tests/CMakeLists.txt
--- trunk/koffice/CMakeLists.txt #1083249:1083250
@@ -260,23 +260,18 @@
# for config.h and <toplevel/foo.h> includes (if any?)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${CMAKE_SOURCE_DIR}/interfaces )
-
-# kostore is at the bottom of stack, so it has the dependency on the kde4 includes.
-set(KOSTORE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/store ${CMAKE_BINARY_DIR}/libs/store \
${KDE4_INCLUDES})
-
# koplugin is at the bottom of the stack
set(KOPLUGIN_INCLUDES ${CMAKE_SOURCE_DIR}/libs/koplugin)
# kobase is at the bottom of the stack
set(KOBASE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kobase)
-# koodf depends on kostore, kobase and koodf
+# koodf depends on kobase
set(KOODF_INCLUDES ${CMAKE_SOURCE_DIR}/libs/odf
${CMAKE_BINARY_DIR}/libs/odf
- ${KOBASE_INCLUDES}
- ${KOSTORE_INCLUDES})
+ ${KDE4_INCLUDES}
+ ${KOBASE_INCLUDES})
-
# pigment depends on koplugin and lcms
set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/pigment
--- trunk/koffice/cmake/modules/FindKOfficeLibs.cmake.in #1083249:1083250
@@ -4,7 +4,6 @@
# KOFFICELIBS_FOUND - system has KOffice
# KOFFICELIBS_INCLUDE_DIR - the Koffice include directory
# KOMAIN_LIBRARY
-# KSTORE_LIBRARY
# KOTEXT_LIBRARY
# KOACTION_LIBRARY
# KOPLUGIN_LIBRARY
@@ -30,7 +29,6 @@
FIND_PATH( KOFFICELIBS_INCLUDE_DIR NAMES KoDocument.h)# HINTS \
${CMAKE_INSTALL_PREFIX}/include)
FIND_LIBRARY(KOMAIN_LIBRARY NAMES komain)
-FIND_LIBRARY(KOSTORE_LIBRARY NAMES kostore)
FIND_LIBRARY(KOTEXT_LIBRARY NAMES kotext)
FIND_LIBRARY(KOACTION_LIBRARY NAMES koaction)
FIND_LIBRARY(KOPLUGIN_LIBRARY NAMES koplugin)
@@ -46,7 +44,6 @@
SET( KOFFICECORE_LIBRARIES
- ${KOSTORE_LIBRARY}
${KOBASE_LIBRARY}
${KOODF_LIBRARY}
${FLAKE_LIBRARY}
@@ -72,7 +69,6 @@
# show the KOFFICELIBS_INCLUDE_DIR and KOFFICELIBS_LIBRARIES variables only in the \
advanced view MARK_AS_ADVANCED(KOFFICELIBS_INCLUDE_DIR
KOMAIN_LIBRARY
- KSTORE_LIBRARY
KOTEXT_LIBRARY
KOACTION_LIBRARY
KOPLUGIN_LIBRARY
--- trunk/koffice/kexi/shapes/relationdesign/CMakeLists.txt #1083249:1083250
@@ -17,9 +17,7 @@
kexidb
kexicore
keximain
-flake
komain
-kostore
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTCORE_LIBRARY}
@@ -28,4 +26,4 @@
)
install(TARGETS kexirelationdesignshape DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES kexirelationdesignshape.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
\ No newline at end of file
+install( FILES kexirelationdesignshape.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--- trunk/koffice/kplato/libs/kernel/CMakeLists.txt #1083249:1083250
@@ -1,7 +1,7 @@
add_subdirectory( tests )
-include_directories(${KOSTORE_INCLUDES})
+include_directories(${KOODF_INCLUDES})
########### KPlato kernel library ###############
@@ -29,7 +29,7 @@
kde4_add_library(kplatokernel SHARED ${kplatokernel_LIB_SRCS})
-target_link_libraries(kplatokernel kostore ${QT_QTGUI_LIBRARY})
+target_link_libraries(kplatokernel koodf ${QT_QTGUI_LIBRARY})
set_target_properties(kplatokernel PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
--- trunk/koffice/kplato/libs/kernel/tests/CMakeLists.txt #1083249:1083250
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( .. ${KOSTORE_INCLUDES})
+include_directories( .. ${KOODF_INCLUDES})
########### next target ###############
--- trunk/koffice/kplato/libs/models/tests/CMakeLists.txt #1083249:1083250
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( .. ../../kernel ${KOSTORE_INCLUDES})
+include_directories( .. ../../kernel ${KOODF_INCLUDES})
########### next target ###############
--- trunk/koffice/kplato/plugins/schedulers/rcps/CMakeLists.txt #1083249:1083250
@@ -1,5 +1,5 @@
-include_directories( ${LIBRCPS_INCLUDE_DIR} ${KOSTORE_INCLUDES} \
${CMAKE_SOURCE_DIR}/kplato/libs/kernel ${KDE4_INCLUDES} ) +include_directories( \
${LIBRCPS_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/kplato/libs/kernel \
${KDE4_INCLUDES} )
add_subdirectory( tests )
@@ -13,7 +13,7 @@
target_link_libraries(
kplatorcpsscheduler
kplatokernel
- kostore
+ koodf
${LIBRCPS_LIBRARIES}
)
--- trunk/koffice/kplato/tests/CMakeLists.txt #1083249:1083250
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( .. ${KPLATO_INCLUDES} ${KOSTORE_INCLUDES})
+include_directories( .. ${KPLATO_INCLUDES} ${KOODF_INCLUDES})
########### test files ###############
--- trunk/koffice/kpresenter/plugins/eventactions/CMakeLists.txt #1083249:1083250
@@ -13,10 +13,8 @@
kpresentereventactions
kpresenterprivate
flake
- kostore
${KDE4_KIO_LIBRARY}
${KDE4_PHONON_LIBRARY}
- ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
)
--- trunk/koffice/krita/image/tests/CMakeLists.txt #1083249:1083250
@@ -30,7 +30,7 @@
add_definitions(-DFILES_OUTPUT_DIR="\\"${CMAKE_CURRENT_BINARY_DIR}\\"")
set(kis_paint_device_test_SRCS kis_paint_device_test.cpp )
kde4_add_unit_test(KisPaintDeviceTest TESTNAME krita-image-KisPaintDeviceTest \
${kis_paint_device_test_SRCS})
-target_link_libraries(KisPaintDeviceTest ${KDE4_KDEUI_LIBS} kritaimage kostore \
${QT_QTTEST_LIBRARY}) +target_link_libraries(KisPaintDeviceTest ${KDE4_KDEUI_LIBS} \
kritaimage ${QT_QTTEST_LIBRARY})
########### next target ###############
--- trunk/koffice/libs/CMakeLists.txt #1083249:1083250
@@ -1,4 +1,3 @@
-add_subdirectory( store )
add_subdirectory( kobase )
add_subdirectory( widgets )
add_subdirectory( koplugin )
--- trunk/koffice/libs/odf/CMakeLists.txt #1083249:1083250
@@ -4,9 +4,10 @@
########### libkoodf ###############
-#if( QCA2_FOUND )
-#add_definitions( -DQCA2 )
-#endif( QCA2_FOUND )
+if( QCA2_FOUND )
+ include_directories( ${QCA2_INCLUDE_DIR} )
+ add_definitions( -DQCA2 )
+endif( QCA2_FOUND )
set(koodf_LIB_SRCS
KoOdf.cpp
@@ -31,12 +32,23 @@
KoBorder.cpp
KoPageLayout.cpp
KoPageFormat.cpp
+ KoStore.cpp
+ KoTarStore.cpp
+ KoDirectoryStore.cpp
+ KoZipStore.cpp
+ KoXmlReader.cpp
+ KoXmlWriter.cpp
+ KoEncryptedStore.cpp
+ KoEncryptionChecker.cpp
)
kde4_add_library(koodf SHARED ${koodf_LIB_SRCS})
-target_link_libraries(koodf kostore kobase)
-target_link_libraries(koodf LINK_INTERFACE_LIBRARIES kostore kobase)
+target_link_libraries(koodf kobase ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
+target_link_libraries(koodf LINK_INTERFACE_LIBRARIES kobase ${KDE4_KIO_LIBS})
+if( QCA2_FOUND )
+ target_link_libraries(koodf ${QCA2_LIBRARIES})
+endif( QCA2_FOUND )
set_target_properties(koodf PROPERTIES
VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION} @@ -69,5 +81,10 @@
KoPageLayout.h
KoPageFormat.h
KoColumns.h
+ KoStore.h
+ KoStoreDevice.h
+ KoXmlReader.h
+ KoXmlWriter.h
+ KoXmlReaderForward.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
--- trunk/koffice/libs/odf/tests/CMakeLists.txt #1083249:1083250
@@ -25,5 +25,44 @@
kde4_add_unit_test(TestKoOdfLoadingContext TESTNAME libs-odf-TestKoOdfLoadingContext \
${TestKoOdfLoadingContext_SRCS}) target_link_libraries(TestKoOdfLoadingContext koodf \
${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
+add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+
+########### next target ###############
+
+set(xmlwritertest_SRCS TestXmlWriter.cpp )
+
+kde4_add_unit_test(TestXmlWriter TESTNAME libs-store-testxmlwriter \
${xmlwritertest_SRCS}) +
+target_link_libraries(TestXmlWriter koodf ${QT_QTTEST_LIBRARY} \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS}) +
+########### next target ###############
+
+set(xmlreadertest_SRCS TestXmlReader.cpp )
+kde4_add_unit_test(TestXmlReader TESTNAME libs-store-testxmlreader \
${xmlreadertest_SRCS}) +target_link_libraries(TestXmlReader koodf \
${QT_QTTEST_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS}) +
+########### next target ###############
+
+set(storedroptest_SRCS storedroptest.cpp )
+
+kde4_add_executable(storedroptest TEST ${storedroptest_SRCS})
+
+target_link_libraries(storedroptest koodf ${QT_QT3SUPPORT_LIBRARY} \
${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS}) +
+########### next target ###############
+
+set(kodomtest_SRCS kodomtest.cpp )
+
+kde4_add_unit_test(kodomtest TESTNAME libs-store-kodomtest ${kodomtest_SRCS})
+
+target_link_libraries(kodomtest koodf ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} \
${KDE4_KDEUI_LIBS} ) +
+########### next target ###############
+
+set(storageTest_SRCS TestStorage.cpp )
+
+kde4_add_unit_test(TestStorage TESTNAME libs-store-storage ${storageTest_SRCS})
+
+target_link_libraries(TestStorage koodf ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} \
${KDE4_KDEUI_LIBS}) +
########### end ###############
-
--- trunk/koffice/plugins/musicshape/core/tests/CMakeLists.txt #1083249:1083250
@@ -76,7 +76,7 @@
)
kde4_add_unit_test(MusicXmlWriterTest TESTNAME shapes-musicshape-MusicXmlWriterTest \
${MusicXmlWriterTest_test_SRCS})
-target_link_libraries(MusicXmlWriterTest ${QT_QTTEST_LIBRARY} kostore)
+target_link_libraries(MusicXmlWriterTest ${QT_QTTEST_LIBRARY} koodf)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic