[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok
From: Peter Zhou <peterzhoulei () gmail ! com>
Date: 2008-07-02 12:36:48
Message-ID: 1215002208.918270.24993.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 827209 by peterzl:
This is a huge one.
I have not yet worked out how to make qt bindings work with Amarok/cmake, but after \
thounsands of tries, I have an idea now: To use add_custom_command to get the \
${Core_Binding_SRCS}, ${GUI_Binding_SRCS} from the generator(or other useful bindings \
like QtSQL), then finally compile them as libs. Efforts maybe needed to hack on the \
generator, make it generate CMakeList.txt files or make it output as we want. I am \
committing the current cmake version of the generator anyway :)
M +2 -0 CMakeLists.txt
M +6 -3 src/CMakeLists.txt
M +2 -0 src/dialogs/ScriptManager.cpp
A src/generator (directory)
A src/generator/CMakeLists.txt
A src/generator/LICENSE.GPL
A src/generator/generator (directory)
A src/generator/generator/.preprocessed.tmp
A src/generator/generator/CMakeLists.txt
A src/generator/generator/abstractmetabuilder.cpp [License: GPL (v2)]
A src/generator/generator/abstractmetabuilder.h [License: GPL (v2)]
A src/generator/generator/abstractmetalang.cpp [License: GPL (v2)]
A src/generator/generator/abstractmetalang.h [License: GPL (v2)]
A src/generator/generator/asttoxml.cpp [License: GPL (v2)]
A src/generator/generator/asttoxml.h [License: GPL (v2)]
A src/generator/generator/build_all.txt
A src/generator/generator/build_core.txt
A src/generator/generator/build_gui.txt
A src/generator/generator/build_network.txt
A src/generator/generator/build_opengl.txt
A src/generator/generator/build_phonon.txt
A src/generator/generator/build_sql.txt
A src/generator/generator/build_svg.txt
A src/generator/generator/build_typesystem.txt
A src/generator/generator/build_uitools.txt
A src/generator/generator/build_webkit.txt
A src/generator/generator/build_xml.txt
A src/generator/generator/build_xmlpatterns.txt
A src/generator/generator/classgenerator.cpp [License: GPL (v2)]
A src/generator/generator/classgenerator.h [License: GPL (v2)]
A src/generator/generator/customtypes.cpp [License: GPL (v2)]
A src/generator/generator/customtypes.h [License: GPL (v2)]
A src/generator/generator/docgenerator.cpp [License: GPL (v2)]
A src/generator/generator/docgenerator.h [License: GPL (v2)]
A src/generator/generator/fileout.cpp [License: GPL (v2)]
A src/generator/generator/fileout.h [License: GPL (v2)]
AM src/generator/generator/generate.sh
A src/generator/generator/generator.cpp [License: GPL (v2)]
A src/generator/generator/generator.h [License: GPL (v2)]
A src/generator/generator/generator.pri
A src/generator/generator/generator.pro
A src/generator/generator/generator.qrc
A src/generator/generator/generatorset.cpp [License: GPL (v2)]
A src/generator/generator/generatorset.h [License: GPL (v2)]
A src/generator/generator/generatorsetqtscript.cpp [License: GPL (v2)]
A src/generator/generator/generatorsetqtscript.h [License: GPL (v2)]
A src/generator/generator/main.cpp [License: GPL (v2)]
A src/generator/generator/main.h [License: GPL (v2)]
A src/generator/generator/merge.xsl
A src/generator/generator/metajava.cpp [License: GPL (v2)]
A src/generator/generator/metajava.h [License: GPL (v2)]
A src/generator/generator/metaqtscript.cpp [License: GPL (v2)]
A src/generator/generator/metaqtscript.h [License: GPL (v2)]
A src/generator/generator/metaqtscriptbuilder.cpp [License: GPL (v2)]
A src/generator/generator/metaqtscriptbuilder.h [License: GPL (v2)]
A src/generator/generator/parser (directory)
A src/generator/generator/parser/ast.cpp [License: GPL (v2)]
A src/generator/generator/parser/ast.h [License: GPL (v2)]
A src/generator/generator/parser/binder.cpp [License: GPL (v2)]
A src/generator/generator/parser/binder.h [License: GPL (v2)]
A src/generator/generator/parser/class_compiler.cpp [License: GPL \
(v2)] A src/generator/generator/parser/class_compiler.h [License: GPL \
(v2)] A src/generator/generator/parser/codemodel.cpp [License: GPL \
(v2)] A src/generator/generator/parser/codemodel.h [License: GPL (v2)]
A src/generator/generator/parser/codemodel_finder.cpp [License: GPL \
(v2)] A src/generator/generator/parser/codemodel_finder.h [License: \
GPL (v2)] A src/generator/generator/parser/codemodel_fwd.h [License: \
GPL (v2)] A src/generator/generator/parser/codemodel_pointer.h \
[License: GPL (v2)] A src/generator/generator/parser/compiler_utils.cpp \
[License: GPL (v2)] A src/generator/generator/parser/compiler_utils.h \
[License: GPL (v2)] A src/generator/generator/parser/control.cpp \
[License: GPL (v2)] A src/generator/generator/parser/control.h \
[License: GPL (v2)] A \
src/generator/generator/parser/declarator_compiler.cpp [License: GPL (v2)] A \
src/generator/generator/parser/declarator_compiler.h [License: GPL (v2)] A \
src/generator/generator/parser/default_visitor.cpp [License: GPL (v2)] A \
src/generator/generator/parser/default_visitor.h [License: GPL (v2)] A \
src/generator/generator/parser/dumptree.cpp [License: GPL (v2)] A \
src/generator/generator/parser/dumptree.h [License: GPL (v2)] A \
src/generator/generator/parser/include (directory) A \
src/generator/generator/parser/include/stdarg.h [License: BSD] A \
src/generator/generator/parser/lexer.cpp [License: GPL (v2)] A \
src/generator/generator/parser/lexer.h [License: GPL (v2)] A \
src/generator/generator/parser/list.cpp [License: GPL (v2)] A \
src/generator/generator/parser/list.h [License: GPL (v2)] A \
src/generator/generator/parser/name_compiler.cpp [License: GPL (v2)] A \
src/generator/generator/parser/name_compiler.h [License: GPL (v2)] A \
src/generator/generator/parser/parser.cpp [License: GPL (v2)] A \
src/generator/generator/parser/parser.h [License: GPL (v2)] A \
src/generator/generator/parser/r++.macros A \
src/generator/generator/parser/rpp (directory) A \
src/generator/generator/parser/rpp-allocator.h [License: GPL (v2)] A \
src/generator/generator/parser/rpp/builtin-macros.cpp [License: BSD] A \
src/generator/generator/parser/rpp/pp-cctype.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-configuration A \
src/generator/generator/parser/rpp/pp-engine-bits.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-engine.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-environment.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-fwd.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-internal.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-iterator.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-macro-expander.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-macro.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-main.cpp [License: BSD] A \
src/generator/generator/parser/rpp/pp-qt-configuration A \
src/generator/generator/parser/rpp/pp-scanner.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-string.h [License: BSD] A \
src/generator/generator/parser/rpp/pp-symbol.h [License: BSD] A \
src/generator/generator/parser/rpp/pp.h [License: BSD] A \
src/generator/generator/parser/rpp/preprocessor.cpp [License: BSD] A \
src/generator/generator/parser/rpp/preprocessor.h [License: BSD] A \
src/generator/generator/parser/rpp/rpp.pri A \
src/generator/generator/parser/rxx.pri A \
src/generator/generator/parser/rxx.pro A \
src/generator/generator/parser/rxx_allocator.h [License: GPL (v2)] A \
src/generator/generator/parser/smallobject.cpp [License: GPL (v2)] A \
src/generator/generator/parser/smallobject.h [License: GPL (v2)] A \
src/generator/generator/parser/symbol.h [License: GPL (v2)] A \
src/generator/generator/parser/tokens.cpp [License: GPL (v2)] A \
src/generator/generator/parser/tokens.h [License: GPL (v2)] A \
src/generator/generator/parser/type_compiler.cpp [License: GPL (v2)] A \
src/generator/generator/parser/type_compiler.h [License: GPL (v2)] A \
src/generator/generator/parser/visitor.cpp [License: GPL (v2)] A \
src/generator/generator/parser/visitor.h [License: GPL (v2)] A \
src/generator/generator/prigenerator.cpp [License: GPL (v2)] A \
src/generator/generator/prigenerator.h [License: GPL (v2)] A \
src/generator/generator/qtscript_masterinclude.h [License: GPL (v2)] A \
src/generator/generator/reporthandler.cpp [License: GPL (v2)] A \
src/generator/generator/reporthandler.h [License: GPL (v2)] A \
src/generator/generator/setupgenerator.cpp [License: GPL (v2)] A \
src/generator/generator/setupgenerator.h [License: GPL (v2)] A \
src/generator/generator/shellgenerator.cpp [License: GPL (v2)] A \
src/generator/generator/shellgenerator.h [License: GPL (v2)] A \
src/generator/generator/shellheadergenerator.cpp [License: GPL (v2)] A \
src/generator/generator/shellheadergenerator.h [License: GPL (v2)] A \
src/generator/generator/shellimplgenerator.cpp [License: GPL (v2)] A \
src/generator/generator/shellimplgenerator.h [License: GPL (v2)] A \
src/generator/generator/typeparser.cpp [License: GPL (v2)] A \
src/generator/generator/typeparser.h [License: GPL (v2)] A \
src/generator/generator/typesystem.cpp [License: GPL (v2)] A \
src/generator/generator/typesystem.h [License: GPL (v2)] A \
src/generator/generator/typesystem_core-common.xml A \
src/generator/generator/typesystem_core-qtscript.xml A \
src/generator/generator/typesystem_core.xml A \
src/generator/generator/typesystem_gui-common.xml A \
src/generator/generator/typesystem_gui-qtscript.xml A \
src/generator/generator/typesystem_gui.xml A \
src/generator/generator/typesystem_network-common.xml A \
src/generator/generator/typesystem_network-qtscript.xml A \
src/generator/generator/typesystem_network.xml A \
src/generator/generator/typesystem_opengl-common.xml A \
src/generator/generator/typesystem_opengl-qtscript.xml A \
src/generator/generator/typesystem_opengl.xml A \
src/generator/generator/typesystem_phonon-common.xml A \
src/generator/generator/typesystem_phonon-qtscript.xml A \
src/generator/generator/typesystem_phonon.xml A \
src/generator/generator/typesystem_sql-common.xml A \
src/generator/generator/typesystem_sql-qtscript.xml A \
src/generator/generator/typesystem_sql.xml A \
src/generator/generator/typesystem_svg-common.xml A \
src/generator/generator/typesystem_svg-qtscript.xml A \
src/generator/generator/typesystem_svg.xml A \
src/generator/generator/typesystem_uitools.xml A \
src/generator/generator/typesystem_webkit-common.xml A \
src/generator/generator/typesystem_webkit-qtscript.xml A \
src/generator/generator/typesystem_webkit.xml A \
src/generator/generator/typesystem_xml-common.xml A \
src/generator/generator/typesystem_xml-qtscript.xml A \
src/generator/generator/typesystem_xml.xml A \
src/generator/generator/typesystem_xmlpatterns-common.xml A \
src/generator/generator/typesystem_xmlpatterns-qtscript.xml A \
src/generator/generator/typesystem_xmlpatterns.xml A \
src/generator/qtbindings (directory) A \
src/generator/qtbindings/qs_eval (directory) A \
src/generator/qtbindings/qs_eval/main.cpp [License: GPL (v2)] A \
src/generator/qtbindings/qs_eval/qs_eval.pro A \
src/generator/qtbindings/qtbindings.pro A \
src/generator/qtbindings/qtbindingsbase.pri A \
src/generator/qtbindings/qtscript_core (directory) A \
src/generator/qtbindings/qtscript_core/qtscript_core.pro A \
src/generator/qtbindings/qtscript_core/qtscriptconcurrent.h [License: GPL (v2)] A \
src/generator/qtbindings/qtscript_gui (directory) A \
src/generator/qtbindings/qtscript_gui/qtscript_gui.pro A \
src/generator/qtbindings/qtscript_network (directory) A \
src/generator/qtbindings/qtscript_network/qtscript_network.pro A \
src/generator/qtbindings/qtscript_opengl (directory) A \
src/generator/qtbindings/qtscript_opengl/qtscript_opengl.pro A \
src/generator/qtbindings/qtscript_phonon (directory) A \
src/generator/qtbindings/qtscript_phonon/qtscript_phonon.pro A \
src/generator/qtbindings/qtscript_sql (directory) A \
src/generator/qtbindings/qtscript_sql/qtscript_sql.pro A \
src/generator/qtbindings/qtscript_svg (directory) A \
src/generator/qtbindings/qtscript_svg/qtscript_svg.pro A \
src/generator/qtbindings/qtscript_uitools (directory) A \
src/generator/qtbindings/qtscript_uitools/qtscript_uitools.pro A \
src/generator/qtbindings/qtscript_webkit (directory) A \
src/generator/qtbindings/qtscript_webkit/qtscript_webkit.pro A \
src/generator/qtbindings/qtscript_xml (directory) A \
src/generator/qtbindings/qtscript_xml/qtscript_xml.pro A \
src/generator/qtbindings/qtscript_xmlpatterns (directory) A \
src/generator/qtbindings/qtscript_xmlpatterns/qtscript_xmlpatterns.pro
--- trunk/extragear/multimedia/amarok/CMakeLists.txt #827208:827209
@@ -2,6 +2,8 @@
cmake_minimum_required(VERSION 2.4.5)
+add_subdirectory( src/generator )
+
#We depend on kde4.1 now.. I believe this is the easiest way to do it.
set(KDE_MIN_VERSION "4.00.61")
find_package(KDE4)
--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #827208:827209
@@ -64,8 +64,6 @@
include_directories( ${KDEMULTIMEDIA_INCLUDE_DIR} )
endif ( KDEMULTIMEDIA_FOUND )
-
-
#####################################################################
# PLUGIN
#####################################################################
@@ -488,6 +486,12 @@
kde4_add_library(amaroklib SHARED ${amaroklib_LIB_SRCS})
+#add_dependencies( amaroklib generator )
+
+#add_custom_command ( TARGET amaroklib PRE_LINK
+# COMMAND "cp \
${CMAKE_CURRENT_BINARY_DIR}/generator/generator/generator \
${CMAKE_CURRENT_SOURCE_DIR}/generator/generator/generator" +#)
+
target_link_libraries(amaroklib
${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KNEWSTUFF_LIBS}
${TAGLIB_LIBRARIES}
@@ -548,7 +552,6 @@
install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(Q_WS_MAC)
-
########### install files ###############
install(FILES amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
--- trunk/extragear/multimedia/amarok/src/dialogs/ScriptManager.cpp #827208:827209
@@ -876,6 +876,8 @@
DEBUG_BLOCK
QScriptEngine* scriptEngine = m_scripts[name].engine;
+// scriptEngine->importExtension( "qt.core" );
+// scriptEngine->importExtension( "qt.gui" );
QScriptValue scriptObject;
scriptObject = scriptEngine->newQObject( new Amarok::ScriptImporter( \
scriptEngine, m_scripts[name].url ) );
** trunk/extragear/multimedia/amarok/src/generator/generator/generate.sh #property \
svn:executable + *
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic