[rkward-cvs] SF.net SVN: rkward: [2240] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2240
          http://rkward.svn.sourceforge.net/rkward/?rev=2240&view=rev
Author:   tfry
Date:     2007-11-18 13:10:08 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Fighting CMake

Modified Paths:
--------------
    branches/KDE4_port/CMakeLists.txt
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/misc/rkstandardicons.cpp
    branches/KDE4_port/rkward/rkward.sh.template

Added Paths:
-----------
    branches/KDE4_port/Messages.sh

Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt	2007-11-18 18:55:09 UTC (rev 2239)
+++ branches/KDE4_port/CMakeLists.txt	2007-11-18 21:10:08 UTC (rev 2240)
@@ -16,3 +16,7 @@
 INCLUDE_DIRECTORIES( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 # TODO: figure out how to make source distributions (with REAMDE files, etc.)
+
+ADD_CUSTOM_TARGET(messages
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/po/
+	COMMAND BASEDIR=${CMAKE_CURRENT_SOURCE_DIR}/rkward ${CMAKE_CURRENT_SOURCE_DIR}/Messages.sh)

Added: branches/KDE4_port/Messages.sh
===================================================================
--- branches/KDE4_port/Messages.sh	                        (rev 0)
+++ branches/KDE4_port/Messages.sh	2007-11-18 21:10:08 UTC (rev 2240)
@@ -0,0 +1,6 @@
+#!/bin/sh
+DIR=`pwd`
+cd ${BASEDIR}
+find . -name '*.cpp' -o -name '*.h' -o -name '*.c' > ${DIR}/infiles.list
+cd $DIR
+xgettext -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 --files-from=infiles.list -D ${BASEDIR} -o rkward.pot


Property changes on: branches/KDE4_port/Messages.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-11-18 18:55:09 UTC (rev 2239)
+++ branches/KDE4_port/TODO_KDE4	2007-11-18 21:10:08 UTC (rev 2240)
@@ -1,7 +1,6 @@
 **CMake**
 - message extraction
 - po file handling
-- use Configure-File-Makro for wrapperscript
 - test
 	- configuration
 		- R

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-11-18 18:55:09 UTC (rev 2239)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-11-18 21:10:08 UTC (rev 2240)
@@ -23,35 +23,26 @@
 	rkwardapplication.cpp
 )
 
-########### next target ###############
-
 # auto-gen sources
-QT4_AUTOMOC(${RKWard_Sources})
+#QT4_AUTOMOC(${RKWard_Sources})	# not needed here, as KDE4_ADD_EXECUTABLE mocs the sources in this dir.
 
 # somehow the needed libdirs for R do not get passed down automatically
 GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 
 KDE4_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
+# wrapper script
+GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)
+CONFIGURE_FILE(
+	rkward.sh.template
+	${CMAKE_CURRENT_BINARY_DIR}/rkward
+	@ONLY)
+ADD_DEPENDENCIES(rkward.bin ${CMAKE_CURRENT_BINARY_DIR}/rkward)
 
 TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
 
 # NOTE: KDE4_KFILE_LIBS still links against Qt3Support
 
-# wrapper script
-GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)
-# TODO: somehow this is built unconditionally, but nevermind
-ADD_CUSTOM_TARGET(rkwardwrapper
-	COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/makerkwardscript.pl ${CMAKE_CURRENT_SOURCE_DIR}/rkward.sh.template "${R_HOME}" > ${CMAKE_CURRENT_BINARY_DIR}/rkward
-	DEPENDS makerkwardscript.pl rkward.sh.template
-)
-# will this work?
-#CONFIGURE_FILE(
-#	rkward.sh.template
-#	${CMAKE_CURRENT_BINARY_DIR}/rkward
-#	@ONLY)
-ADD_DEPENDENCIES(rkward.bin rkwardwrapper)
-
 ########### install files ###############
 
 INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}/rkward
@@ -62,3 +53,4 @@
 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rkward DESTINATION ${BIN_INSTALL_DIR})
 
 INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+

Modified: branches/KDE4_port/rkward/misc/rkstandardicons.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-18 18:55:09 UTC (rev 2239)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-18 21:10:08 UTC (rev 2240)
@@ -62,8 +62,8 @@
 	icons[ObjectEnvironment] = KIcon ("konqueror");
 	icons[ObjectPackageEnvironment] = KIcon ("ark");
 	icons[ObjectDataFrame] = KIcon ("table");
-	icons[ObjectDataNumeric] = KIcon ("math_paren");
-	icons[ObjectDataFactor] = KIcon ("math_onetwomatrix");
+	icons[ObjectDataNumeric] = KIcon ("math_paren");	// TODO: needs to be replaced
+	icons[ObjectDataFactor] = KIcon ("math_onetwomatrix");	// TODO: needs to be replaced
 	icons[ObjectDataCharacter] = KIcon ("text");
 #warning TODO icon for logical
 	icons[ObjectDataLogical] = QIcon ();

Modified: branches/KDE4_port/rkward/rkward.sh.template
===================================================================
--- branches/KDE4_port/rkward/rkward.sh.template	2007-11-18 18:55:09 UTC (rev 2239)
+++ branches/KDE4_port/rkward/rkward.sh.template	2007-11-18 21:10:08 UTC (rev 2240)
@@ -19,7 +19,7 @@
   fi
 fi
 
-R_HOME_DIR=###R_HOME_DIR###
+R_HOME_DIR=@R_HOME@
 export R_binary="$R_HOME_DIR/bin/R"
 
 ## Location of R may have moved, so check


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.