[rkward-cvs] SF.net SVN: rkward:[4159] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Fri Feb 3 08:06:27 UTC 2012
Revision: 4159
http://rkward.svn.sourceforge.net/rkward/?rev=4159&view=rev
Author: tfry
Date: 2012-02-03 08:06:27 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
set_dist_version.sh and getversion.sh are used by some other scripts, so adjusting them to keep them working. Also cleaning up a bit.
Modified Paths:
--------------
trunk/rkward/rkward/CMakeLists.txt
trunk/rkward/rkward/rbackend/CMakeLists.txt
trunk/rkward/scripts/getversion.sh
trunk/rkward/scripts/set_dist_version.sh
Added Paths:
-----------
trunk/rkward/VERSION.cmake
trunk/rkward/rkward/SetVersionNumber.cmake
Removed Paths:
-------------
trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
trunk/rkward/rkward/resource.ver
trunk/rkward/rkward/version.h
Added: trunk/rkward/VERSION.cmake
===================================================================
--- trunk/rkward/VERSION.cmake (rev 0)
+++ trunk/rkward/VERSION.cmake 2012-02-03 08:06:27 UTC (rev 4159)
@@ -0,0 +1 @@
+SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)
Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/rkward/CMakeLists.txt 2012-02-03 08:06:27 UTC (rev 4159)
@@ -1,24 +1,4 @@
-# set version number
-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_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)
+INCLUDE(SetVersionNumber.cmake)
IF(Q_WS_MAC)
SET(RKWARD_FRONTEND_LOCATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
Added: trunk/rkward/rkward/SetVersionNumber.cmake
===================================================================
--- trunk/rkward/rkward/SetVersionNumber.cmake (rev 0)
+++ trunk/rkward/rkward/SetVersionNumber.cmake 2012-02-03 08:06:27 UTC (rev 4159)
@@ -0,0 +1,17 @@
+# set version number
+INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
+
+# replace placeholders with version number in several files
+CONFIGURE_FILE(
+ version.h.in
+ ${CMAKE_SOURCE_DIR}/rkward/version.h
+ @ONLY)
+CONFIGURE_FILE(
+ ver.R.in
+ ${CMAKE_SOURCE_DIR}/rkward/rbackend/rpackages/rkward/R/ver.R
+ @ONLY)
+CONFIGURE_FILE(
+ resource.ver.in
+ ${CMAKE_SOURCE_DIR}/rkward/resource.ver
+ @ONLY)
+
Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt 2012-02-03 08:06:27 UTC (rev 4159)
@@ -6,7 +6,7 @@
ADD_SUBDIRECTORY( rpackages )
-INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
SET (
rbackend_shared_SRCS
@@ -61,6 +61,7 @@
ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
FIND_PACKAGE(Gettext REQUIRED)
TARGET_LINK_LIBRARIES(rkward.rbackend ${R_USED_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} ${GETTEXT_LIBRARIES})
+
IF(WIN32)
# on Widows, we install to the rbackend subdirectory, because 1) LIBEXEC_INSTALL_DIR == BIN_INSTALL_DIR and 2) we don't want the backend to pick up
# all the KDE library versions, first, when loading DLLs
Deleted: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R 2012-02-03 08:06:27 UTC (rev 4159)
@@ -1 +0,0 @@
-".rk.app.version" <- "0.5.7z+0.5.8+devel1"
Deleted: trunk/rkward/rkward/resource.ver
===================================================================
--- trunk/rkward/rkward/resource.ver 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/rkward/resource.ver 2012-02-03 08:06:27 UTC (rev 4159)
@@ -1 +0,0 @@
-0.5.7z+0.5.8+devel1
Deleted: trunk/rkward/rkward/version.h
===================================================================
--- trunk/rkward/rkward/version.h 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/rkward/version.h 2012-02-03 08:06:27 UTC (rev 4159)
@@ -1,2 +0,0 @@
-/* Version number of package */
-#define RKWARD_VERSION "0.5.7z+0.5.8+devel1"
Modified: trunk/rkward/scripts/getversion.sh
===================================================================
--- trunk/rkward/scripts/getversion.sh 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/scripts/getversion.sh 2012-02-03 08:06:27 UTC (rev 4159)
@@ -8,7 +8,7 @@
BASEDIR=`pwd`
if [ -z ${SPECIFIEDVERSION} ]; then
- awk '{ printf "%s", $0; next }' rkward/resource.ver
+ awk '{ sub(/SET\(RKVERSION_NUMBER /, ""); sub(/\)/, ""); printf "%s", $0; next }' VERSION.cmake
elif [ ${SPECIFIEDVERSION} = "SVN" ]; then
VERSION=`${BASEDIR}/scripts/getversion.sh`
cd ${BASEDIR}
Modified: trunk/rkward/scripts/set_dist_version.sh
===================================================================
--- trunk/rkward/scripts/set_dist_version.sh 2012-02-02 16:13:12 UTC (rev 4158)
+++ trunk/rkward/scripts/set_dist_version.sh 2012-02-03 08:06:27 UTC (rev 4159)
@@ -7,7 +7,4 @@
cd `dirname $0`/..
BASEDIR=`pwd`
-echo "/* Version number of package */" > $BASEDIR/rkward/version.h
-echo "#define RKWARD_VERSION \"$VERSION\"" >> $BASEDIR/rkward/version.h
-echo "\".rk.app.version\" <- \"$VERSION\"" > $BASEDIR/rkward/rbackend/rpackages/rkward/R/ver.R
-echo "$VERSION" > $BASEDIR/rkward/resource.ver
+echo "SET(RKVERSION_NUMBER $VERSION)" > $BASEDIR/VERSION.cmake
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