[Kde-bindings] KDE/kdebindings/csharp/plasma

[Arno Rehn]

SVN commit 829434 by arnorehn:

* Put the PlasmaScriptengineKimono.* classes all in one assembly.

CCMAIL: kde-bindings at kde.org



 M  +6 -13     CMakeLists.txt  
 M  +3 -0      ChangeLog  
 M  +1 -1      plasma-scriptengine-kimono-applet.desktop  
 M  +1 -1      plasma-scriptengine-kimono-dataengine.desktop  


--- trunk/KDE/kdebindings/csharp/plasma/CMakeLists.txt #829433:829434
@@ -21,10 +21,8 @@
 
 SET(SRC_PLASMASCRIPTING src/PlasmaScripting_Applet.cs)
 
-SET(SRC_PLASMASCRIPTENGINEKIMONO_APPLET
-    src/PlasmaScriptengineKimono_Applet.cs)
-
-SET(SRC_PLASMASCRIPTENGINEKIMONO_DATAENGINE
+SET(SRC_PLASMASCRIPTENGINEKIMONO
+    src/PlasmaScriptengineKimono_Applet.cs
     src/PlasmaScriptengineKimono_DataEngine.cs)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/smoke 
@@ -38,18 +36,13 @@
 ADD_CS_LIBRARY(plasma "${SRC_CS}" ALL)
 
 SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/plasma.dll -warn:0 -keyfile:${KEYFILE})
-ADD_CS_LIBRARY(Applet "${SRC_PLASMASCRIPTENGINEKIMONO_APPLET}" ALL)
-ADD_DEPENDENCIES(Applet plasma)
+ADD_CS_LIBRARY(PlasmaScriptengineKimono "${SRC_PLASMASCRIPTENGINEKIMONO}" ALL)
+ADD_DEPENDENCIES(PlasmaScriptengineKimono plasma)
 
-SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/plasma.dll -warn:0 -keyfile:${KEYFILE})
-ADD_CS_LIBRARY(DataEngine "${SRC_PLASMASCRIPTENGINEKIMONO_DATAENGINE}" ALL)
-ADD_DEPENDENCIES(DataEngine plasma)
-
 INSTALL(TARGETS plasma-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 INSTALL_GAC(plasma)
 
-install(FILES ${LIBRARY_OUTPUT_PATH}/Applet.dll DESTINATION ${DATA_INSTALL_DIR}/plasma_scriptengine_kimono)
-install(FILES plasma-scriptengine-kimono-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES ${LIBRARY_OUTPUT_PATH}/PlasmaScriptengineKimono.dll DESTINATION ${DATA_INSTALL_DIR}/plasma_scriptengine_kimono)
 
-install(FILES ${LIBRARY_OUTPUT_PATH}/DataEngine.dll DESTINATION ${DATA_INSTALL_DIR}/plasma_scriptengine_kimono)
+install(FILES plasma-scriptengine-kimono-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES plasma-scriptengine-kimono-dataengine.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- trunk/KDE/kdebindings/csharp/plasma/ChangeLog #829433:829434
@@ -1,3 +1,6 @@
+2008-07-08  Arno Rehn  <arno at arnorehn.de>
+* Put the PlasmaScriptengineKimono.* classes all in one assembly.
+
 2008-07-08  Richard Dale  <richard.j.dale at gmail.com>
 * Added a marshaller for the Plasma::DataEngine::Data type so that 
   DateUpdated() slots should work
--- trunk/KDE/kdebindings/csharp/plasma/plasma-scriptengine-kimono-applet.desktop #829433:829434
@@ -73,7 +73,7 @@
 Type=Service
 Icon=text-x-script
 X-KDE-Library=kimonopluginfactory
-X-KDE-PluginKeyword=plasma_scriptengine_kimono/Applet.dll
+X-KDE-PluginKeyword=plasma_scriptengine_kimono/PlasmaScriptengineKimono.dll
 X-EngineName=kimono-applet-script
 X-Plasma-API=mono-script
 X-Plasma-ComponentTypes=Applet
--- trunk/KDE/kdebindings/csharp/plasma/plasma-scriptengine-kimono-dataengine.desktop #829433:829434
@@ -56,7 +56,7 @@
 Type=Service
 Icon=text-x-script
 X-KDE-Library=kimonopluginfactory
-X-KDE-PluginKeyword=plasma_scriptengine_kimono/DataEngine.dll
+X-KDE-PluginKeyword=plasma_scriptengine_kimono/PlasmaScriptengineKimono.dll
 X-EngineName=kimono-applet-script
 X-Plasma-API=mono-script
 X-Plasma-ComponentTypes=DataEngine