[rkward-cvs] SF.net SVN: rkward:[4157] trunk/rkward/rkward

m-eik at users.sourceforge.net m-eik at users.sourceforge.net
Thu Feb 2 16:10:54 UTC 2012


Revision: 4157
          http://rkward.svn.sourceforge.net/rkward/?rev=4157&view=rev
Author:   m-eik
Date:     2012-02-02 16:10:54 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
version setting is now done completely in CMakeLists.txt. set_dist_version.sh should be obsolete.

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt

Added Paths:
-----------
    trunk/rkward/rkward/resource.ver.in
    trunk/rkward/rkward/rkward.bat.in
    trunk/rkward/rkward/rkward.sh.in
    trunk/rkward/rkward/ver.R.in
    trunk/rkward/rkward/version.h.in

Removed Paths:
-------------
    trunk/rkward/rkward/rkward.bat.template
    trunk/rkward/rkward/rkward.sh.template
    trunk/rkward/rkward/version.h.template

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2012-02-02 15:43:06 UTC (rev 4156)
+++ trunk/rkward/rkward/CMakeLists.txt	2012-02-02 16:10:54 UTC (rev 4157)
@@ -1,11 +1,24 @@
 # set version number
-file (STRINGS "resource.ver" RKVERSION_NUMBER)
-SET(RKWARD_VERSION_TEMPLATE version.h.template)
-SET(RKWARD_VERSION_FILE ${CMAKE_SOURCE_DIR}/rkward/version.h)
+SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)
+# replace placeholders with version number in several files
+SET(RKWARD_VERSION_H_TEMPLATE version.h.in)
+SET(RKWARD_VERSION_H ${CMAKE_SOURCE_DIR}/rkward/version.h)
 CONFIGURE_FILE(
-	${RKWARD_VERSION_TEMPLATE}
-	${RKWARD_VERSION_FILE}
+	${RKWARD_VERSION_H_TEMPLATE}
+	${RKWARD_VERSION_H}
 	@ONLY)
+SET(RKWARD_VER_R_TEMPLATE ver.R.in)
+SET(RKWARD_VER_R ${CMAKE_SOURCE_DIR}/rkward/rbackend/rpackages/rkward/R/ver.R)
+CONFIGURE_FILE(
+	${RKWARD_VER_R_TEMPLATE}
+	${RKWARD_VER_R}
+	@ONLY)
+SET(RKWARD_RESOURCE_VER_TEMPLATE resource.ver.in)
+SET(RKWARD_RESOURCE_VER ${CMAKE_SOURCE_DIR}/rkward/resource.ver)
+CONFIGURE_FILE(
+	${RKWARD_RESOURCE_VER_TEMPLATE}
+	${RKWARD_RESOURCE_VER}
+	@ONLY)
 
 IF(Q_WS_MAC)
 	SET(RKWARD_FRONTEND_LOCATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
@@ -61,10 +74,10 @@
 # wrapper script
 GET_DIRECTORY_PROPERTY(R_EXECUTABLE DIRECTORY rbackend DEFINITION R_EXECUTABLE)
 IF(WIN32)
-	SET(RKWARD_WRAPPER_TEMPLATE rkward.bat.template)
+	SET(RKWARD_WRAPPER_TEMPLATE rkward.bat.in)
 	SET(RKWARD_WRAPPER_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/rkward.bat)
 ELSE(WIN32)
-	SET(RKWARD_WRAPPER_TEMPLATE rkward.sh.template)
+	SET(RKWARD_WRAPPER_TEMPLATE rkward.sh.in)
 	SET(RKWARD_WRAPPER_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/rkward)
 ENDIF(WIN32)
 CONFIGURE_FILE(
@@ -74,7 +87,7 @@
 ADD_DEPENDENCIES(rkward.frontend ${RKWARD_WRAPPER_SCRIPT})
 
 IF(Q_WS_MAC)
-	SET(RKWARD_INFOPLIST_TEMPLATE Info.plist.template)
+	SET(RKWARD_INFOPLIST_TEMPLATE Info.plist.in)
 	SET(RKWARD_INFOPLIST_FILE ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
 	CONFIGURE_FILE(
 		${RKWARD_INFOPLIST_TEMPLATE}

Added: trunk/rkward/rkward/resource.ver.in
===================================================================
--- trunk/rkward/rkward/resource.ver.in	                        (rev 0)
+++ trunk/rkward/rkward/resource.ver.in	2012-02-02 16:10:54 UTC (rev 4157)
@@ -0,0 +1 @@
+ at RKVERSION_NUMBER@

Added: trunk/rkward/rkward/rkward.bat.in
===================================================================
--- trunk/rkward/rkward/rkward.bat.in	                        (rev 0)
+++ trunk/rkward/rkward/rkward.bat.in	2012-02-02 16:10:54 UTC (rev 4157)
@@ -0,0 +1,30 @@
+ at ECHO off
+REM Wrapper script to start RKWard.
+REM If the *first* parameter is "--debugger", run through the specified debugger
+
+REM ATTENTION: The SET R_BINARY=... line should remain on line number 10 of this script.
+REM This is where the NSIS installer assumes to find it.
+
+
+
+SET R_BINARY=@R_EXECUTABLE@
+
+
+REM Explicit initialization of KDE, in case Windows 7 asks for admin priviledges
+ECHO Initializing KDE
+%~dsp0\kdeinit4.exe
+
+ECHO Starting RKWard
+SET RKWARD.BIN=%~dsp0\rkward.frontend.exe
+SET RKWARD_ENSURE_PREFIX=%~dsp0\..
+SET PATH=%~dsp0;%PATH%
+SET DEBUGGER=
+
+IF NOT "%1" == "--debugger" GOTO run
+REM else:
+SHIFT
+SET DEBUGGER=%~s1
+SHIFT
+
+:run
+CALL "%R_BINARY%" CMD %DEBUGGER% %RKWARD.BIN% %1 %2 %3 %4 %5 %6 %7 %8 %9

Deleted: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template	2012-02-02 15:43:06 UTC (rev 4156)
+++ trunk/rkward/rkward/rkward.bat.template	2012-02-02 16:10:54 UTC (rev 4157)
@@ -1,30 +0,0 @@
- at ECHO off
-REM Wrapper script to start RKWard.
-REM If the *first* parameter is "--debugger", run through the specified debugger
-
-REM ATTENTION: The SET R_BINARY=... line should remain on line number 10 of this script.
-REM This is where the NSIS installer assumes to find it.
-
-
-
-SET R_BINARY=@R_EXECUTABLE@
-
-
-REM Explicit initialization of KDE, in case Windows 7 asks for admin priviledges
-ECHO Initializing KDE
-%~dsp0\kdeinit4.exe
-
-ECHO Starting RKWard
-SET RKWARD.BIN=%~dsp0\rkward.frontend.exe
-SET RKWARD_ENSURE_PREFIX=%~dsp0\..
-SET PATH=%~dsp0;%PATH%
-SET DEBUGGER=
-
-IF NOT "%1" == "--debugger" GOTO run
-REM else:
-SHIFT
-SET DEBUGGER=%~s1
-SHIFT
-
-:run
-CALL "%R_BINARY%" CMD %DEBUGGER% %RKWARD.BIN% %1 %2 %3 %4 %5 %6 %7 %8 %9

Added: trunk/rkward/rkward/rkward.sh.in
===================================================================
--- trunk/rkward/rkward/rkward.sh.in	                        (rev 0)
+++ trunk/rkward/rkward/rkward.sh.in	2012-02-02 16:10:54 UTC (rev 4157)
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Shell wrapper for rkward executable.
+error () {
+  echo "ERROR: $*" >&2
+  exit 1
+}
+
+export R_binary="@R_EXECUTABLE@"
+
+## Location of R may have moved, so check
+if test -x "${R_binary}"; then
+  :
+else
+  error "R binary ('${R_binary}') not found. Most likely your installation of R has moved to a new location. Please rebuild rkward."
+fi
+
+## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (via SCIM)
+## To prevent this, set it here, explicitely. R does not work with wrong settings of LC_NUMERIC.
+
+## First, however, need to unset LC_ALL, if set. Instead we set LANG, so the default will be the same, where not overridden
+if [ -z "$LC_ALL" ]; then
+  :
+else
+  export LANG="$LC_ALL"
+  unset LC_ALL
+  echo "Warning: unsetting LC_ALL"
+fi
+
+# handle --debugger argument (if any)
+# the loop partially copied from the R wrapper script
+debugger=
+if [ "${1}" = "--debugger" ]; then
+  shift
+  if [ -z "${1}" ]; then
+    error  "option '--debugger' requires an argument"
+  else
+    debugger=${1}
+    shift
+  fi
+fi
+
+## set LC_NUMERIC to "C"
+export LC_NUMERIC="C"
+
+## Start rkward. Running through R CMD to set all the relevant R enviroment variables
+if test -x "`dirname $0`/rkward.frontend" ; then
+  # for running directly from a build directory. Don't use this, unless you are a developer!
+  rkward_binary="`dirname $0`/rkward.frontend"
+else
+  # for regular installations
+  export RKWARD_ENSURE_PREFIX="`dirname $0`/.."
+  rkward_binary="@RKWARD_FRONTEND_LOCATION@/rkward.frontend"
+fi
+exec $R_binary CMD $debugger ${rkward_binary} "$@"


Property changes on: trunk/rkward/rkward/rkward.sh.in
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2012-02-02 15:43:06 UTC (rev 4156)
+++ trunk/rkward/rkward/rkward.sh.template	2012-02-02 16:10:54 UTC (rev 4157)
@@ -1,54 +0,0 @@
-#!/bin/sh
-# Shell wrapper for rkward executable.
-error () {
-  echo "ERROR: $*" >&2
-  exit 1
-}
-
-export R_binary="@R_EXECUTABLE@"
-
-## Location of R may have moved, so check
-if test -x "${R_binary}"; then
-  :
-else
-  error "R binary ('${R_binary}') not found. Most likely your installation of R has moved to a new location. Please rebuild rkward."
-fi
-
-## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (via SCIM)
-## To prevent this, set it here, explicitely. R does not work with wrong settings of LC_NUMERIC.
-
-## First, however, need to unset LC_ALL, if set. Instead we set LANG, so the default will be the same, where not overridden
-if [ -z "$LC_ALL" ]; then
-  :
-else
-  export LANG="$LC_ALL"
-  unset LC_ALL
-  echo "Warning: unsetting LC_ALL"
-fi
-
-# handle --debugger argument (if any)
-# the loop partially copied from the R wrapper script
-debugger=
-if [ "${1}" = "--debugger" ]; then
-  shift
-  if [ -z "${1}" ]; then
-    error  "option '--debugger' requires an argument"
-  else
-    debugger=${1}
-    shift
-  fi
-fi
-
-## set LC_NUMERIC to "C"
-export LC_NUMERIC="C"
-
-## Start rkward. Running through R CMD to set all the relevant R enviroment variables
-if test -x "`dirname $0`/rkward.frontend" ; then
-  # for running directly from a build directory. Don't use this, unless you are a developer!
-  rkward_binary="`dirname $0`/rkward.frontend"
-else
-  # for regular installations
-  export RKWARD_ENSURE_PREFIX="`dirname $0`/.."
-  rkward_binary="@RKWARD_FRONTEND_LOCATION@/rkward.frontend"
-fi
-exec $R_binary CMD $debugger ${rkward_binary} "$@"

Added: trunk/rkward/rkward/ver.R.in
===================================================================
--- trunk/rkward/rkward/ver.R.in	                        (rev 0)
+++ trunk/rkward/rkward/ver.R.in	2012-02-02 16:10:54 UTC (rev 4157)
@@ -0,0 +1 @@
+".rk.app.version" <- "@RKVERSION_NUMBER@"

Added: trunk/rkward/rkward/version.h.in
===================================================================
--- trunk/rkward/rkward/version.h.in	                        (rev 0)
+++ trunk/rkward/rkward/version.h.in	2012-02-02 16:10:54 UTC (rev 4157)
@@ -0,0 +1,2 @@
+/* Version number of package */
+#define RKWARD_VERSION "@RKVERSION_NUMBER@"

Deleted: trunk/rkward/rkward/version.h.template
===================================================================
--- trunk/rkward/rkward/version.h.template	2012-02-02 15:43:06 UTC (rev 4156)
+++ trunk/rkward/rkward/version.h.template	2012-02-02 16:10:54 UTC (rev 4157)
@@ -1,2 +0,0 @@
-/* Version number of package */
-#define RKWARD_VERSION "@RKVERSION_NUMBER@"

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





More information about the rkward-tracker mailing list