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

[tfry at users.sourceforge.net]

Revision: 2036
          http://rkward.svn.sourceforge.net/rkward/?rev=2036&view=rev
Author:   tfry
Date:     2007-10-08 07:39:08 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
cleanups, corrections

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/doc/CMakeLists.txt
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt
    branches/KDE4_port/rkward/syntax/CMakeLists.txt

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-08 13:47:55 UTC (rev 2035)
+++ branches/KDE4_port/TODO_KDE4	2007-10-08 14:39:08 UTC (rev 2036)
@@ -2,7 +2,7 @@
 - message extraction
 - po file handling
 - handbook installation
-- R package building
+- need to replace hard-coded "share/apps"?
 - icons
 - rkward.desktop
 - syntax definitions

Modified: branches/KDE4_port/doc/CMakeLists.txt
===================================================================
--- branches/KDE4_port/doc/CMakeLists.txt	2007-10-08 13:47:55 UTC (rev 2035)
+++ branches/KDE4_port/doc/CMakeLists.txt	2007-10-08 14:39:08 UTC (rev 2036)
@@ -1,18 +1,3 @@
 ADD_SUBDIRECTORY( en ) 
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-######## kdevelop will overwrite this part!!! (begin)##########
-#
-#SUBDIRS = en 
-#
-######## kdevelop will overwrite this part!!! (end)############
-#

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 13:47:55 UTC (rev 2035)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 14:39:08 UTC (rev 2036)
@@ -39,11 +39,12 @@
 TARGET_LINK_LIBRARIES(rkward.bin ${QT_AND_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc khtml kmdi kdeui katepartinterfaces )
 
 # wrapper script
-ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rkward
-   COMMAND perl ./makerkwardscript.pl rkward.sh.template "$(R_HOMEDIR)" > rkward; ${CMAKE_CURRENT_BINARY_DIR}/rkward
-   DEPENDS makerkwardscript.pl rkward.sh.template
- )
+# 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_HOMEDIR}" > ${CMAKE_CURRENT_BINARY_DIR}/rkward
+	DEPENDS makerkwardscript.pl rkward.sh.template
+)
+ADD_DEPENDENCIES(rkward.bin rkwardwrapper)
 
 ########### install files ###############
 

Modified: branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt	2007-10-08 13:47:55 UTC (rev 2035)
+++ branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt	2007-10-08 14:39:08 UTC (rev 2036)
@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY( rkward ) 
-
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
 
 CONFIGURE_FILE(

Modified: branches/KDE4_port/rkward/syntax/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/syntax/CMakeLists.txt	2007-10-08 13:47:55 UTC (rev 2035)
+++ branches/KDE4_port/rkward/syntax/CMakeLists.txt	2007-10-08 14:39:08 UTC (rev 2036)
@@ -5,11 +5,4 @@
 
 INSTALL(FILES   r.xml rkward.xml DESTINATION /share/apps/katepart/syntax/ )
 
-
-
-#original Makefile.am contents follow:
-
-#EXTRA_DIST = r-syntax-test.R
-#
-#katesyntaxdir = $(kde_datadir)/katepart/syntax/
-#katesyntax_DATA =  r.xml rkward.xml
+# r-syntax-test.R is not installed


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