[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kode-schema-refactor/kode
From: Josef Spillner <spillner () kde ! org>
Date: 2009-12-10 14:45:17
Message-ID: 1260456317.466189.4100.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1061042 by josef:
- the "make it sort of compile" commit so that we can link Kejsare (after 3 years!)
M +13 -10 CMakeLists.txt
M +7 -9 common/CMakeLists.txt
M +1 -1 kodemain.cpp
M +27 -27 kwsdl/CMakeLists.txt
M +24 -29 kwsdl/kung/CMakeLists.txt
M +6 -13 kwsdl/wscl/CMakeLists.txt
M +18 -20 kwsdl/wsdl/CMakeLists.txt
M +17 -18 kxforms/CMakeLists.txt
M +10 -12 kxml_compiler/CMakeLists.txt
M +14 -14 libkode/CMakeLists.txt
M +1 -1 libkode/tests/CMakeLists.txt
M +14 -17 schema/CMakeLists.txt
M +1 -1 schema/typestable.h
--- branches/work/kode-schema-refactor/kode/CMakeLists.txt #1061041:1061042
@@ -2,22 +2,25 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/libkode \
${CMAKE_CURRENT_SOURCE_DIR}/common/ )
-add_subdirectory( libkode )
-add_subdirectory( common )
-add_subdirectory( schema )
-add_subdirectory( kxml_compiler )
-add_subdirectory(kxforms)
+add_subdirectory( libkode )
+add_subdirectory( common )
+add_subdirectory( schema )
+# FIXME: app doesn't compile
+##add_subdirectory( kxml_compiler )
+# FIXME: doesn't compile
+##add_subdirectory(kxforms)
add_subdirectory( kwsdl )
########### next target ###############
set(kode_bin_SRCS kodemain.cpp )
-kde4_automoc(${kode_bin_SRCS})
+#kde4_automoc(${kode_bin_SRCS})
-kde4_add_executable(kode_bin ${kode_bin_SRCS})
-set_target_properties(kode_bin PROPERTIES OUTPUT_NAME kode)
+## FIXME: kode needs proper porting to KDE 4, sync with main branch?
+##kde4_add_executable(kode_bin ${kode_bin_SRCS})
+##set_target_properties(kode_bin PROPERTIES OUTPUT_NAME kode)
-target_link_libraries(kode_bin ${KDE4_KDECORE_LIBS} kode ${KDE4_KABC_LIBS} )
+##target_link_libraries(kode_bin ${KDE4_KDECORE_LIBS} kode ${KDE4_KABC_LIBS} )
-install(TARGETS kode_bin DESTINATION ${BIN_INSTALL_DIR} )
+##install(TARGETS kode_bin DESTINATION ${BIN_INSTALL_DIR} )
--- branches/work/kode-schema-refactor/kode/common/CMakeLists.txt #1061041:1061042
@@ -1,22 +1,20 @@
-
include_directories( ${CMAKE_SOURCE_DIR}/kode )
-
########### next target ###############
-set(kxmlcommon_LIB_SRCS
- fileprovider.cpp
- messagehandler.cpp
- nsmanager.cpp
- parsercontext.cpp
+set(kxmlcommon_LIB_SRCS
+ fileprovider.cpp
+ messagehandler.cpp
+ nsmanager.cpp
+ parsercontext.cpp
qname.cpp )
-kde4_automoc(${kxmlcommon_LIB_SRCS})
+#kde4_automoc(${kxmlcommon_LIB_SRCS})
kde4_add_library(kxmlcommon SHARED ${kxmlcommon_LIB_SRCS})
#target_link_libraries(kxmlcommon ${KDE4_KIO_LIBS})
-target_link_libraries(kxmlcommon ${QT_QTCORE_LIBRARIES} ${QT_QTNETWORK_LIBRARIES})
+target_link_libraries(kxmlcommon ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
set_target_properties(kxmlcommon PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS kxmlcommon DESTINATION ${LIB_INSTALL_DIR})
--- branches/work/kode-schema-refactor/kode/kodemain.cpp #1061041:1061042
@@ -71,7 +71,7 @@
{ "singleton", I18N_NOOP("Create a singleton class"), 0 },
{ "protocol", I18N_NOOP("kioslave protocol"), 0 },
{ "+[filename]", I18N_NOOP("Source code file name"), 0 },
- KCmdLineLastOption
+ { 0, 0, 0 }
};
void addPropertyFunctions( QString &out, const QString &type,
--- branches/work/kode-schema-refactor/kode/kwsdl/CMakeLists.txt #1061041:1061042
@@ -1,40 +1,40 @@
+add_subdirectory( doc )
+add_subdirectory( wsdl )
+add_subdirectory( wscl )
+# FIXME: app doesn't compile
+##add_subdirectory( kung )
-add_subdirectory( doc )
-add_subdirectory( wsdl )
-add_subdirectory( wscl )
-add_subdirectory( kung )
-
include_directories( ${CMAKE_SOURCE_DIR}/kode )
-
########### next target ###############
-set(kwsdl_compiler_SRCS
- compiler.cpp
- converter.cpp
- converter_attribute.cpp
- converter_clientstub.cpp
- converter_complextype.cpp
- converter_element.cpp
- converter_serverstub.cpp
- converter_simpletype.cpp
- converter_transport.cpp
- converter_utils.cpp
- creator.cpp
- main.cpp
- namemapper.cpp
- settings.cpp
+set(kwsdl_compiler_SRCS
+ compiler.cpp
+ converter.cpp
+ converter_attribute.cpp
+ converter_clientstub.cpp
+ converter_complextype.cpp
+ converter_element.cpp
+ converter_serverstub.cpp
+ converter_simpletype.cpp
+ converter_transport.cpp
+ converter_utils.cpp
+ creator.cpp
+ main.cpp
+ namemapper.cpp
+ settings.cpp
typemap.cpp )
-kde4_automoc(${kwsdl_compiler_SRCS})
+#kde4_automoc(${kwsdl_compiler_SRCS})
-kde4_add_executable(kwsdl_compiler ${kwsdl_compiler_SRCS})
+# FIXME: app needs proper porting to KDE 4
+##kde4_add_executable(kwsdl_compiler ${kwsdl_compiler_SRCS})
-target_link_libraries(kwsdl_compiler ${KDE4_KDECORE_LIBS} kode wsdl )
+##target_link_libraries(kwsdl_compiler ${KDE4_KDECORE_LIBS} kode wsdl )
-install(TARGETS kwsdl_compiler DESTINATION ${BIN_INSTALL_DIR} )
+##install(TARGETS kwsdl_compiler DESTINATION ${BIN_INSTALL_DIR} )
-
########### install files ###############
-install( FILES kwsdl_compiler.desktop DESTINATION ${XDG_APPS_DIR})
+# FIXME: XDG_APPS_DIR is not defined!
+##install( FILES kwsdl_compiler.desktop DESTINATION ${XDG_APPS_DIR})
--- branches/work/kode-schema-refactor/kode/kwsdl/kung/CMakeLists.txt \
#1061041:1061042 @@ -3,25 +3,25 @@
########### next target ###############
-set(kschemawidgets_LIB_SRCS
- binaryinputfield.cpp
- boolinputfield.cpp
- complexbaseinputfield.cpp
- dateinputfield.cpp
- doubleinputfield.cpp
- enuminputfield.cpp
- inputdialog.cpp
- inputfield.cpp
- inputfieldfactory.cpp
- integerinputfield.cpp
- listinputfield.cpp
- pageinputfield.cpp
- outputdialog.cpp
- simplebaseinputfield.cpp
- stringinputfield.cpp
+set(kschemawidgets_LIB_SRCS
+ binaryinputfield.cpp
+ boolinputfield.cpp
+ complexbaseinputfield.cpp
+ dateinputfield.cpp
+ doubleinputfield.cpp
+ enuminputfield.cpp
+ inputdialog.cpp
+ inputfield.cpp
+ inputfieldfactory.cpp
+ integerinputfield.cpp
+ listinputfield.cpp
+ pageinputfield.cpp
+ outputdialog.cpp
+ simplebaseinputfield.cpp
+ stringinputfield.cpp
timeinputfield.cpp )
-kde4_automoc(${kschemawidgets_LIB_SRCS})
+#kde4_automoc(${kschemawidgets_LIB_SRCS})
kde4_add_library(kschemawidgets SHARED ${kschemawidgets_LIB_SRCS})
@@ -35,15 +35,15 @@
########### next target ###############
-set(kung_SRCS
- dispatcher.cpp
- generalconversationmanager.cpp
- loader.cpp
- main.cpp
- transport.cpp
+set(kung_SRCS
+ dispatcher.cpp
+ generalconversationmanager.cpp
+ loader.cpp
+ main.cpp
+ transport.cpp
wsclconversationmanager.cpp )
-kde4_automoc(${kung_SRCS})
+#kde4_automoc(${kung_SRCS})
kde4_add_executable(kung ${kung_SRCS})
@@ -51,13 +51,8 @@
install(TARGETS kung DESTINATION ${BIN_INSTALL_DIR} )
-
########### install files ###############
-
-
-
-
#original Makefile.am contents follow:
#INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl \
-I$(top_srcdir)/libkdepim $(all_includes)
--- branches/work/kode-schema-refactor/kode/kwsdl/wscl/CMakeLists.txt \
#1061041:1061042 @@ -1,17 +1,15 @@
-
include_directories( ${CMAKE_SOURCE_DIR}/libkdepim )
-
########### next target ###############
-set(wscl_LIB_SRCS
- conversation.cpp
- documents.cpp
- interaction.cpp
- parser.cpp
+set(wscl_LIB_SRCS
+ conversation.cpp
+ documents.cpp
+ interaction.cpp
+ parser.cpp
transition.cpp )
-kde4_automoc(${wscl_LIB_SRCS})
+#kde4_automoc(${wscl_LIB_SRCS})
kde4_add_library(wscl SHARED ${wscl_LIB_SRCS})
@@ -20,13 +18,8 @@
set_target_properties(wscl PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS wscl DESTINATION ${LIB_INSTALL_DIR})
-
########### install files ###############
-
-
-
-
#original Makefile.am contents follow:
#INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libkdepim $(all_includes)
--- branches/work/kode-schema-refactor/kode/kwsdl/wsdl/CMakeLists.txt \
#1061041:1061042 @@ -1,32 +1,30 @@
-
include_directories( ${CMAKE_SOURCE_DIR}/kode ${CMAKE_SOURCE_DIR}/kode/kwsdl )
-
########### next target ###############
-set(wsdl_LIB_SRCS
- binding.cpp
- bindingoperation.cpp
- definitions.cpp
- element.cpp
- fault.cpp
- import.cpp
- message.cpp
- operation.cpp
- param.cpp
- part.cpp
- port.cpp
- porttype.cpp
- service.cpp
- soapbinding.cpp
- type.cpp
+set(wsdl_LIB_SRCS
+ binding.cpp
+ bindingoperation.cpp
+ definitions.cpp
+ element.cpp
+ fault.cpp
+ import.cpp
+ message.cpp
+ operation.cpp
+ param.cpp
+ part.cpp
+ port.cpp
+ porttype.cpp
+ service.cpp
+ soapbinding.cpp
+ type.cpp
wsdl.cpp )
-kde4_automoc(${wsdl_LIB_SRCS})
+#kde4_automoc(${wsdl_LIB_SRCS})
kde4_add_library(wsdl SHARED ${wsdl_LIB_SRCS})
-target_link_libraries(wsdl ${KDE4_KDECORE_LIBS} kxmlcommon schema )
+target_link_libraries(wsdl ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} kxmlcommon \
schema )
set_target_properties(wsdl PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS wsdl DESTINATION ${LIB_INSTALL_DIR})
--- branches/work/kode-schema-refactor/kode/kxforms/CMakeLists.txt #1061041:1061042
@@ -1,31 +1,31 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/kode ${KDE4_INCLUDE_DIR} )
+
########### next target ###############
-set(kxforms_SRCS
- main.cpp
- mainwindow.cpp
- manager.cpp
- form.cpp
+set(kxforms_SRCS
+ main.cpp
+ mainwindow.cpp
+ manager.cpp
+ form.cpp
formcreator.cpp
hints.cpp
- list.cpp
+ list.cpp
listmodel.cpp
- input.cpp
- formgui.cpp
+ input.cpp
+ formgui.cpp
remotefile.cpp
- xformscommon.cpp
+ xformscommon.cpp
xmlbuilder.cpp
- guielement.cpp
- kresult.cpp
- guihandler.cpp
+ guielement.cpp
+ kresult.cpp
+ guihandler.cpp
guihandlerflat.cpp
guihandlerdialogs.cpp
- reference.cpp
- textarea.cpp
+ reference.cpp
+ textarea.cpp
select1.cpp )
-kde4_automoc(${kxforms_SRCS})
+#kde4_automoc(${kxforms_SRCS})
kde4_add_kcfg_files(kxforms_SRCS prefs.kcfgc )
@@ -35,12 +35,11 @@
install(TARGETS kxforms DESTINATION ${BIN_INSTALL_DIR} )
-
########### next target ###############
set(testreferences_SRCS testreferences.cpp reference.cpp )
-kde4_automoc(${testreferences_SRCS})
+#kde4_automoc(${testreferences_SRCS})
if(KDE4_BUILD_TESTS)
--- branches/work/kode-schema-refactor/kode/kxml_compiler/CMakeLists.txt \
#1061041:1061042 @@ -1,18 +1,16 @@
+add_subdirectory( tests )
-add_subdirectory( tests )
-
include_directories( ${CMAKE_SOURCE_DIR}/kode/libkode ${CMAKE_SOURCE_DIR}/kode )
-
########### next target ###############
-set(kxml_compiler_SRCS
- creator.cpp
- kxml_compiler.cpp
- parsercreatordom.cpp
+set(kxml_compiler_SRCS
+ creator.cpp
+ kxml_compiler.cpp
+ parsercreatordom.cpp
parsercreatorcustom.cpp)
-kde4_automoc(${kxml_compiler_SRCS})
+#kde4_automoc(${kxml_compiler_SRCS})
kde4_add_executable(kxml_compiler NOGUI ${kxml_compiler_SRCS})
@@ -23,16 +21,16 @@
########### next target ###############
set(kschema_LIB_SRCS
- parserrelaxng.cpp
- parserxsd.cpp
+ parserrelaxng.cpp
+ parserxsd.cpp
schema.cpp
)
-kde4_automoc(${kschema_LIB_SRCS})
+#kde4_automoc(${kschema_LIB_SRCS})
kde4_add_library(kschema SHARED ${kschema_LIB_SRCS})
-target_link_libraries(kschema ${KDE4_KDECORE_LIBS} schema )
+target_link_libraries(kschema ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} schema \
kxmlcommon )
set_target_properties(kschema PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS kschema DESTINATION ${LIB_INSTALL_DIR})
--- branches/work/kode-schema-refactor/kode/libkode/CMakeLists.txt #1061041:1061042
@@ -1,21 +1,21 @@
add_subdirectory( tests )
-set(kode_LIB_SRCS
- code.cpp
- enum.cpp
- style.cpp
- printer.cpp
- license.cpp
- file.cpp
- class.cpp
- function.cpp
- variable.cpp
- membervariable.cpp
- typedef.cpp
- statemachine.cpp
+set(kode_LIB_SRCS
+ code.cpp
+ enum.cpp
+ style.cpp
+ printer.cpp
+ license.cpp
+ file.cpp
+ class.cpp
+ function.cpp
+ variable.cpp
+ membervariable.cpp
+ typedef.cpp
+ statemachine.cpp
automakefile.cpp )
-kde4_automoc(${kode_LIB_SRCS})
+#kde4_automoc(${kode_LIB_SRCS})
kde4_add_library(kode SHARED ${kode_LIB_SRCS})
--- branches/work/kode-schema-refactor/kode/libkode/tests/CMakeLists.txt \
#1061041:1061042 @@ -2,7 +2,7 @@
set(nestedclasses_test_SRCS nestedclasses_test.cpp )
-kde4_automoc(${nestedclasses_test_SRCS})
+#kde4_automoc(${nestedclasses_test_SRCS})
kde4_add_executable(nestedclasses_test RUN_UNINSTALLED ${nestedclasses_test_SRCS})
--- branches/work/kode-schema-refactor/kode/schema/CMakeLists.txt #1061041:1061042
@@ -1,38 +1,35 @@
-
include_directories( ${CMAKE_SOURCE_DIR}/kode )
-
########### next target ###############
-set(schema_LIB_SRCS
+set(schema_LIB_SRCS
annotation.cpp
- attribute.cpp
- complextype.cpp
- element.cpp
- parser.cpp
- simpletype.cpp
- types.cpp
- xmlelement.cpp
- xsdtype.cpp
- attributegroup.cpp
- compositor.cpp)
+ attribute.cpp
+ complextype.cpp
+ element.cpp
+ parser.cpp
+ simpletype.cpp
+ types.cpp
+ xmlelement.cpp
+ xsdtype.cpp
+ attributegroup.cpp
+ compositor.cpp)
-kde4_automoc(${schema_LIB_SRCS})
+#kde4_automoc(${schema_LIB_SRCS})
kde4_add_library(schema SHARED ${schema_LIB_SRCS})
#target_link_libraries(schema ${KDE4_KIO_LIBS} kxmlcommon )
-target_link_libraries(schema ${QT_QTCORE_LIBRARIES} ${QT_QTXML_LIBRARIES} \
kxmlcommon ) +target_link_libraries(schema ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} \
kxmlcommon )
set_target_properties(schema PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS schema DESTINATION ${LIB_INSTALL_DIR})
-
########### next target ###############
set(schematest_SRCS schematest.cpp )
-kde4_automoc(${schematest_SRCS})
+#kde4_automoc(${schematest_SRCS})
kde4_add_executable(schematest ${schematest_SRCS})
--- branches/work/kode-schema-refactor/kode/schema/typestable.h #1061041:1061042
@@ -49,7 +49,7 @@
QString typeName( int id ) const;
- int addExternalTypeId( const QName &type, XSDType *type );
+ int addExternalTypeId( const QName &type, XSDType *ptype );
int numExtRefs() const;
QName extRefName( int index ) const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic