[rkward-cvs] SF.net SVN: rkward-code:[4673] trunk/rkward/macports
m-eik at users.sf.net
m-eik at users.sf.net
Fri Apr 5 16:17:56 UTC 2013
Revision: 4673
http://sourceforge.net/p/rkward/code/4673
Author: m-eik
Date: 2013-04-05 16:17:20 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
MacPorts: switching from variants to subports, to hopefully be able to bundle those as well (not tested!)
Modified Paths:
--------------
trunk/rkward/macports/kde/rkward/Portfile
trunk/rkward/macports/kde/rkward-devel/Portfile
trunk/rkward/macports/update_bundle.sh
Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile 2013-04-04 19:47:50 UTC (rev 4672)
+++ trunk/rkward/macports/kde/rkward/Portfile 2013-04-05 16:17:20 UTC (rev 4673)
@@ -26,9 +26,12 @@
master_sites https://sourceforge.net/projects/rkward/files/Current_Stable_Releases
PortGroup cmake 1.0
+
+# gmake is needed to be able to build R source packages without XCode
depends_lib port:kdelibs4 \
port:kate \
- port:R-framework
+ port:R-framework \
+ port:gmake
# add port:okular once the graphics device is fully functional
# this needs port:poppler with +qt4 +quartz varaints which cannot be
@@ -62,11 +65,15 @@
}
configure.cmd cmake ..
-variant binary description {Configure R to install Mac binaries by default} {
+# configure R to install Mac binaries by default
+subport rkward-binary {
+ conflicts-append rkward rkward-devel-binary rkward-devel-debug rkward-debug
configure.args-append -DUSE_BINARY_PACKAGES=1
}
-variant debug description {Compile with full debugging support} {
+# compile with full debugging support
+subport rkward-debug {
+ conflicts-append rkward rkward-devel-binary rkward-devel-debug rkward-binary
depends_lib-append port:valgrind
configure.args-append -DCMAKE_BUILD_TYPE=debugfull
}
Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile 2013-04-04 19:47:50 UTC (rev 4672)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile 2013-04-05 16:17:20 UTC (rev 4673)
@@ -27,9 +27,11 @@
PortGroup cmake 1.0
+# gmake is needed to be able to build R source packages without XCode
depends_lib port:kdelibs4 \
port:kate \
- port:R-framework
+ port:R-framework \
+ port:gmake
# add port:okular once the graphics device is fully functional
# this needs port:poppler with +qt4 +quartz varaints which cannot be
@@ -63,11 +65,15 @@
}
configure.cmd cmake ..
-variant binary description {Configure R to install Mac binaries by default} {
+# configure R to install Mac binaries by default
+subport rkward-devel-binary {
+ conflicts-append rkward-devel rkward-binary rkward-devel-debug rkward-debug
configure.args-append -DUSE_BINARY_PACKAGES=1
}
-variant debug description {Compile with full debugging support} {
+# compile with full debugging support
+subport rkward-devel-debug {
+ conflicts-append rkward-devel rkward-devel-binary rkward-debug rkward-binary
depends_lib-append port:valgrind
configure.args-append -DCMAKE_BUILD_TYPE=debugfull
}
Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh 2013-04-04 19:47:50 UTC (rev 4672)
+++ trunk/rkward/macports/update_bundle.sh 2013-04-05 16:17:20 UTC (rev 4673)
@@ -5,6 +5,7 @@
MPTINST=/opt/rkward
# specify the target port
PTARGET=rkward-devel
+PNSUFFX="-devel"
# specify work directory
WORKDIR=/opt/ports/kde/${PTARGET}/work
# specify local public directory
@@ -35,9 +36,15 @@
OLDWD=$(pwd)
if [[ $1 == "" ]] ; then
- echo "Usage: update_bundle.sh OPTION
+ echo "Usage: update_bundle.sh OPTIONS
OPTIONS:
+
+ the following must always be combined with r/m/s/c:
-D (build target rkward instead of rkward-devel)
+ -d (build subport 'debug')
+ -b (build subport 'binary')
+
+ these work on their own:
-X (completely!!! wipe ${MPTINST})
-F <MacPorts version> (do an all fresh installation of <MacPorts version>)
-f (list disk usage for all includable ports)
@@ -52,10 +59,15 @@
fi
# get the options
-while getopts ":DflLprmscxXF:" OPT; do
+while getopts ":DdbflLprmscxXF:" OPT; do
case $OPT in
D) PTARGET=rkward >&2
- WORKDIR=/opt/ports/kde/${PTARGET}/work>&2 ;;
+ WORKDIR="/opt/ports/kde/${PTARGET}/work" >&2
+ PNSUFFX="" >&2 ;;
+ d) PTARGET=${PTARGET}-debug >&2
+ PNSUFFX="${PNSUFFX}-debug" >&2 ;;
+ b) PTARGET=${PTARGET}-binary >&2
+ PNSUFFX="${PNSUFFX}-binary" >&2 ;;
F) FRESHMCP=TRUE >&2
MCPVERS=$OPTARG >&2 ;;
f) LSDSKUSG=TRUE >&2 ;;
@@ -174,14 +186,16 @@
if [[ $UPRKWARD ]] ; then
INSTALLEDPORTS=$(port installed)
# make sure each instance of previous RKWard installations is removed first
- if [[ $(echo $INSTALLEDPORTS | grep "[[:space:]]rkward[[:space:]]" 2> /dev/null ) ]] ; then
- sudo port uninstall rkward
- sudo port clean rkward
- fi
- if [[ $(echo $INSTALLEDPORTS | grep "[[:space:]]rkward-devel[[:space:]]" 2> /dev/null ) ]] ; then
- sudo port uninstall rkward-devel
- sudo port clean rkward-devel
- fi
+ for i in rkward rkward-devel rkward-binary rkward-devel-binary rkward-debug rkward-devel-debug ; do
+ if [[ $(echo $INSTALLEDPORTS | grep "[[:space:]]${i}[[:space:]]" 2> /dev/null ) ]] ; then
+ sudo port uninstall ${i}
+ sudo port clean ${i}
+ fi
+ done
+# if [[ $(echo $INSTALLEDPORTS | grep "[[:space:]]rkward-devel[[:space:]]" 2> /dev/null ) ]] ; then
+# sudo port uninstall rkward-devel
+# sudo port clean rkward-devel
+# fi
# build and install recent version
sudo port -v install ${PTARGET} || exit 1
fi
@@ -296,7 +310,7 @@
# copy the image file to a public directory
if [[ $COPYMDMD ]] ; then
MDMGFILE=${WORKDIR}/${PTARGET}-${PORTVERS}.dmg
- TRGTFILE=${LPUBDIR}/RKWard-${TARGETVERS}_R-${RVERS}_KDE-${KDEVERS}_MacOSX_bundle.dmg
+ TRGTFILE=${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_R-${RVERS}_KDE-${KDEVERS}_MacOSX_bundle.dmg
echo "copying: $MDMGFILE to $TRGTFILE ..."
cp -av $MDMGFILE $TRGTFILE
echo "done."
@@ -316,7 +330,7 @@
tar cvf $SRCFILE ${MPTINST}/var/macports/distfiles || exit 1
# copy the source archive to a public directory
if [[ $COPYMDMD ]] ; then
- TRGSFILE=${LPUBDIR}/RKWard-${TARGETVERS}_R-${RVERS}_KDE-${KDEVERS}_src.tar
+ TRGSFILE=${LPUBDIR}/RKWard${PNSUFFX}-${TARGETVERS}_R-${RVERS}_KDE-${KDEVERS}_src.tar
echo "copying: $SRCFILE to $TRGSFILE ..."
cp -av $SRCFILE $TRGSFILE
echo "done."
More information about the rkward-tracker
mailing list