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

[m-eik at users.sourceforge.net]

Revision: 4163
          http://rkward.svn.sourceforge.net/rkward/?rev=4163&view=rev
Author:   m-eik
Date:     2012-03-05 15:39:12 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
checking how to solve MacPorts versioning issues without too much interference to the usual builds

Modified Paths:
--------------
    trunk/rkward/VERSION.cmake
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/update_bundle.sh

Modified: trunk/rkward/VERSION.cmake
===================================================================
--- trunk/rkward/VERSION.cmake	2012-03-03 16:18:32 UTC (rev 4162)
+++ trunk/rkward/VERSION.cmake	2012-03-05 15:39:12 UTC (rev 4163)
@@ -1 +1,5 @@
-SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)
+# the IF condition enables manual setting of the version number string
+# which allows for different versioning needed for MacPorts
+IF(NOT RKVERSION_NUMBER)
+	SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)
+ENDIF(NOT RKVERSION_NUMBER)

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2012-03-03 16:18:32 UTC (rev 4162)
+++ trunk/rkward/macports/kde/rkward/Portfile	2012-03-05 15:39:12 UTC (rev 4163)
@@ -2,13 +2,13 @@
 # $Id$
 
 PortSystem          1.0
-
 fetch.type          svn
 svn.url             http://rkward.svn.sourceforge.net/svnroot/rkward/trunk
+svn.revision        4163
 worksrcdir          ${workpath}/trunk/rkward
 
 name                rkward-devel
-version             0.5.7+0.5.8-svn
+version             0.5.7-svn${svn.revision}
 categories          kde kde4 math science
 maintainers         hhu.de:meik.michalke
 license             GPL-2
@@ -24,6 +24,7 @@
 
 master_sites        https://sourceforge.net/projects/rkward/files/Current_Stable_Releases
 
+PortGroup           cmake 1.0
 depends_lib         port:kde4-baseapps \
                     port:kate \
                     port:R
@@ -32,15 +33,16 @@
         configure.compiler llvm-gcc-4.2
 }
 
-pre-configure {
-        system "mkdir ${worksrcdir}/build"
+post-extract {
+        # creates the build dir if it doesn't exist
+        # this won't return errors if directory is already there
+        file mkdir ${worksrcdir}/build
 }
 
 configure.dir       ${worksrcdir}/build
-configure.pre_args-delete --prefix=${prefix}
-configure.pre_args-append -DCMAKE_INSTALL_PREFIX=${prefix}
 configure.args-append \
         -DNO_R_XML=1 \
+        -DRKVERSION_NUMBER=${version} \
         -DBUNDLE_INSTALL_DIR=${applications_dir}
 configure.cmd       cmake ..
 

Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh	2012-03-03 16:18:32 UTC (rev 4162)
+++ trunk/rkward/macports/update_bundle.sh	2012-03-05 15:39:12 UTC (rev 4163)
@@ -1,11 +1,6 @@
 #!/bin/bash
-# get SVN revision number
-echo "get SVN revision number..."
-SVNREV=$(svn info http://rkward.svn.sourceforge.net/svnroot/rkward/trunk 2>&1 | grep "^Revision:" | sed -e 's/[^[:digit:]]*//g')
-echo "Revision: $SVNREV"
 SRCDATE=$(date +%Y-%m-%d)
 SRCPATH=/opt/ports
-SRCFILE=${SRCPATH}/sources_bundle_svn$SVNREV_${SRCDATE}.tar
 # specify macports installation path
 MPTINST=/opt/rkward
 # specify work directory
@@ -52,6 +47,13 @@
   esac
 done
 
+if [[ $UPRKWARD || $MKSRCTAR || $COPYMDMD ]] ; then
+  # get SVN revision number
+  echo "get SVN revision number..."
+  SVNREV=$(svn info http://rkward.svn.sourceforge.net/svnroot/rkward/trunk 2>&1 | grep "^Revision:" | sed -e 's/[^[:digit:]]*//g')
+  echo "Revision: $SVNREV"
+  SRCFILE=${SRCPATH}/sources_bundle_svn$SVNREV_${SRCDATE}.tar
+fi
 
 # update installed ports
 if [[ $UPMPORTS ]] ; then

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