[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/example
From:       David Faure <faure () kde ! org>
Date:       2006-10-11 17:12:31
Message-ID: 1160586751.719756.18995.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 594595 by dfaure:

Converted to standard koffice filenaming style; re-enable compilation of binary, renamed it to koexample,
and even ported it to K_EXPORT_PLUGIN.


 M  +22 -52    CMakeLists.txt  
 A             KoExampleAboutData.h   example_aboutdata.h#590045
 A             KoExampleFactory.cpp   example_factory.cc#590045 [License: LGPL (v2+)]
 A             KoExampleFactory.h   example_factory.h#590045
 A             KoExamplePart.cpp   example_part.cc#590045 [License: LGPL (v2+)]
 A             KoExamplePart.h   example_part.h#590045
 A             KoExampleView.cpp   example_view.cc#590045 [License: LGPL (v2+)]
 A             KoExampleView.h   example_view.h#590045
 M  +1 -1      Messages.sh  
 D             example_aboutdata.h  
 D             example_factory.cc  
 D             example_factory.h  
 D             example_part.cc  
 D             example_part.h  
 D             example_view.cc  
 D             example_view.h  
 M  +3 -3      examplepart.desktop  
 D             main.cc  
 A             main.cpp   main.cc#590045 [License: LGPL (v2+)]
 D             x-vnd.kde.example.desktop  
 A             x-vnd.kde.koexample.desktop   x-vnd.kde.example.desktop#590045


--- trunk/koffice/example/CMakeLists.txt #594594:594595
@@ -3,74 +3,44 @@
 include_directories( ${KOFFICEUI_INCLUDES} )
 
 
-########### next target ###############
+########### next target: the part ###############
 
-set(examplepart_PART_SRCS example_part.cc example_view.cc example_factory.cc )
+set(koexamplepart_PART_SRCS KoExamplePart.cpp KoExampleView.cpp KoExampleFactory.cpp )
 
-kde4_automoc(${examplepart_PART_SRCS})
+kde4_automoc(${koexamplepart_PART_SRCS})
 
-kde4_add_plugin(examplepart WITH_PREFIX ${examplepart_PART_SRCS})
+kde4_add_plugin(koexamplepart WITH_PREFIX ${koexamplepart_PART_SRCS})
 
-kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} examplepart )
+kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} koexamplepart )
 
-target_link_libraries(examplepart  ${KDE4_KPARTS_LIBS} kofficecore )
+target_link_libraries(koexamplepart  ${KDE4_KPARTS_LIBS} kofficecore )
 
-install(TARGETS examplepart  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS koexamplepart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
-########### next target ###############
+########### next target: the executable ###############
 
+set(koexample_KDEINIT_SRCS main.cpp )
 
-########### install files ###############
+kde4_automoc(${koexample_KDEINIT_SRCS})
 
-install( FILES  x-vnd.kde.example.desktop  DESTINATION ${MIME_INSTALL_DIR}/application)
-install( FILES  examplepart.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-install( FILES  example.rc example_readonly.rc  DESTINATION ${DATA_INSTALL_DIR}/example)
-install( FILES  example.desktop  DESTINATION ${XDG_APPS_DIR})
+kde4_add_kdeinit_executable( koexample ${koexample_KDEINIT_SRCS})
 
+target_link_libraries(kdeinit_koexample  ${KDE4_KDECORE_LIBS} kofficecore )
 
+install(TARGETS kdeinit_koexample  DESTINATION ${LIB_INSTALL_DIR})
 
+target_link_libraries( koexample kdeinit_koexample )
 
+install(TARGETS koexample  DESTINATION ${BIN_INSTALL_DIR})
 
+########### install files ###############
 
-
-#original Makefile.am contents follow:
-
-#
-#INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
-#
-### The part
-#kde_module_LTLIBRARIES = libexamplepart.la
-#libexamplepart_la_SOURCES = example_part.cc \
-#	example_view.cc example_factory.cc
-#libexamplepart_la_LDFLAGS = $(KDE_PLUGIN)
-#libexamplepart_la_LIBADD = $(LIB_KOFFICEUI)
-#
-### The kdeinit loadable module and executable
-#kdeinit_LTLIBRARIES = example.la
-#lib_LTLIBRARIES =
-#bin_PROGRAMS =
-#example_la_SOURCES = main.cc
-#example_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-#example_la_LIBADD = $(LIB_KOFFICEUI)
-#
-#METASOURCES = AUTO
-#
-#kdelnk_DATA = example.desktop
-#kdelnkdir = $(kde_appsdir)/Office
-#
 ## Note: for your application, the mime type should be defined in
-##       kdelibs CVS HEAD and a compatibility entry should be added in
-##       the directory koffice/mimetypes/kde??
+##       kdelibs CVS HEAD (and freedesktop.org) and a compatibility entry
+##       should be added in the directory koffice/mimetypes/kde??
 ##       where ?? is the version number of the last stable kde(libs) release.
-#kdemime_DATA = x-vnd.kde.example.desktop
-#kdemimedir = $(kde_mimedir)/application
-#
-#rc_DATA = example.rc example_readonly.rc
-#rcdir = $(kde_datadir)/example
-#
-#messages: rc.cpp
-#	$(XGETTEXT) rc.cpp *.cc example_aboutdata.h -o $(podir)/example.pot
-#kde_services_DATA = examplepart.desktop
-#
-#include $(top_srcdir)/admin/Doxyfile.am
+install( FILES  x-vnd.kde.koexample.desktop  DESTINATION ${MIME_INSTALL_DIR}/application)
+install( FILES  examplepart.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+install( FILES  example.rc example_readonly.rc  DESTINATION ${DATA_INSTALL_DIR}/example)
+install( FILES  example.desktop  DESTINATION ${XDG_APPS_DIR})
--- trunk/koffice/example/Messages.sh #594594:594595
@@ -1,2 +1,2 @@
 #! /bin/sh
-$XGETTEXT rc.cpp *.cc example_aboutdata.h -o $podir/example.pot
+$XGETTEXT rc.cpp *.cpp KoExampleAboutData.h -o $podir/example.pot
--- trunk/koffice/example/examplepart.desktop #594594:594595
@@ -3,9 +3,9 @@
 Name=KOffice Example Component
 Name[fr]=Composant-exemple KOffice
 Name[x-test]=xxKOffice Example Componentxx
-X-KDE-Library=libexamplepart
-MimeType=application/x-example
+X-KDE-Library=libkoexamplepart
+MimeType=application/x-vnd.kde.koexample
 Type=Service
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-example
+X-KDE-NativeMimeType=application/x-vnd.kde.koexample
 Icon=example
[prev in list] [next in list] [prev in thread] [next in thread]