[Genabel-commits] r1794 - pkg/GenABEL-general/distrib_scripts

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-08-10 17:45:16 +0200 (Sun, 10 Aug 2014)
New Revision: 1794

Modified:
   pkg/GenABEL-general/distrib_scripts/makedistrib_DatABEL.sh
   pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh
   pkg/GenABEL-general/distrib_scripts/makedistrib_MixABEL.sh
   pkg/GenABEL-general/distrib_scripts/makedistrib_VariABEL.sh
Log:
Added the -u or --user option that allows you to specify the SVN username. If this option is specified, an SVN checkout will be used instead of an SVN export. This will add a warning about the .svn directory when running R CMD check, but allows you to fix stuff on the fly and test it before committing (use in combination with -n).
For final submission, run do a clean run, without any options.


Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_DatABEL.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_DatABEL.sh	2014-08-10 15:29:11 UTC (rev 1793)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_DatABEL.sh	2014-08-10 15:45:16 UTC (rev 1794)
@@ -11,6 +11,7 @@
 #   out some of your local changes.
 # -c|--nocrancheck: don't run R CMD check --as-cran (can save some
 #   time if you're expecting trouble)
+# -u|--user <username>: Use <username> when checking out from SVN.
 
 PKG=DatABEL
 
@@ -28,6 +29,7 @@
 # Parse command line options
 NOCHECKOUT=false
 CRANCHECK=true
+SVNUSER=""
 while [ $# -gt 0 ]; do
     case $1 in
         -n | --nocheckout )
@@ -36,6 +38,11 @@
         -c | --nocrancheck )
             CRANCHECK=false
             ;;
+        -u | --user )
+            shift
+            SVNUSER=${1:?Error: please specify SVN user name after the -u option}
+            echo "Using SVN user name $SVNUSER"
+            ;;
         -* )
             echo "$0: invalid option $1" >&2
             exit 1
@@ -62,11 +69,18 @@
     echo "--------------------------------------------------"
     echo "Checking out source code from SVN..."
     echo "--------------------------------------------------"
-    SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
-    svn export $SVNBASE/pkg/$PKG
-    svn export $SVNBASE/pkg/filevector
+    if [ -z $SVNUSER ]; then
+        SVNCMD="svn export"
+        SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
+    else
+        SVNCMD="svn checkout"
+        SVNBASE=svn+ssh://${SVNUSER}@svn.r-forge.r-project.org/svnroot/genabel/
+    fi
+    $SVNCMD $SVNBASE/pkg/filevector
+    $SVNCMD $SVNBASE/pkg/DatABEL
+    $SVNCMD $SVNBASE/pkg/${PKG}
 
-    cd $PKG
+    cd ${PKG}
     rm -f cleanup* configure* *.R
     cd src
     cp DAlib/*.c* .

Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh	2014-08-10 15:29:11 UTC (rev 1793)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh	2014-08-10 15:45:16 UTC (rev 1794)
@@ -5,11 +5,12 @@
 # the package.
 #
 # Command line options:
-# -n|--nocheckout: if the first command line option is keepold the previously
-#   checked out source code will not be deleted and no SVN checkout will
-#   be done. This is handy when trying out some of your local changes.
+# -n|--nocheckout: the previously checked out source code will not be
+#   deleted and no SVN checkout will be done. This is handy when trying
+#   out some of your local changes.
 # -c|--nocrancheck: don't run R CMD check --as-cran (can save some
 #   time if you're expecting trouble)
+# -u|--user <username>: Use <username> when checking out from SVN.
 
 PKG=MetABEL
 
@@ -27,6 +28,7 @@
 # Parse command line options
 NOCHECKOUT=false
 CRANCHECK=true
+SVNUSER=""
 while [ $# -gt 0 ]; do
     case $1 in
         -n | --nocheckout )
@@ -35,6 +37,11 @@
         -c | --nocrancheck )
             CRANCHECK=false
             ;;
+        -u | --user )
+            shift
+            SVNUSER=${1:?Error: please specify SVN user name after the -u option}
+            echo "Using SVN user name $SVNUSER"
+            ;;
         -* )
             echo "$0: invalid option $1" >&2
             exit 1
@@ -60,7 +67,14 @@
     echo "--------------------------------------------------"
     echo "Checking out source code from SVN..."
     echo "--------------------------------------------------"
-    svn export svn://svn.r-forge.r-project.org/svnroot/genabel/pkg/${PKG}
+    if [ -z $SVNUSER ]; then
+        SVNCMD="svn export"
+        SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
+    else
+        SVNCMD="svn checkout"
+        SVNBASE=svn+ssh://${SVNUSER}@svn.r-forge.r-project.org/svnroot/genabel/
+    fi
+    $SVNCMD $SVNBASE/pkg/${PKG}
 fi
 
 install_deps

Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_MixABEL.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_MixABEL.sh	2014-08-10 15:29:11 UTC (rev 1793)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_MixABEL.sh	2014-08-10 15:45:16 UTC (rev 1794)
@@ -5,11 +5,12 @@
 # the package.
 #
 # Command line options:
-# -n|--nocheckout: if the first command line option is keepold the previously
-#   checked out source code will not be deleted and no SVN checkout will
-#   be done. This is handy when trying out some of your local changes.
+# -n|--nocheckout: the previously checked out source code will not be
+#   deleted and no SVN checkout will be done. This is handy when trying
+#   out some of your local changes.
 # -c|--nocrancheck: don't run R CMD check --as-cran (can save some
 #   time if you're expecting trouble)
+# -u|--user <username>: Use <username> when checking out from SVN.
 
 PKG=MixABEL
 
@@ -27,6 +28,7 @@
 # Parse command line options
 NOCHECKOUT=false
 CRANCHECK=true
+SVNUSER=""
 while [ $# -gt 0 ]; do
     case $1 in
         -n | --nocheckout )
@@ -35,6 +37,11 @@
         -c | --nocrancheck )
             CRANCHECK=false
             ;;
+        -u | --user )
+            shift
+            SVNUSER=${1:?Error: please specify SVN user name after the -u option}
+            echo "Using SVN user name $SVNUSER"
+            ;;
         -* )
             echo "$0: invalid option $1" >&2
             exit 1
@@ -62,10 +69,16 @@
     echo "--------------------------------------------------"
     echo "Checking out source code from SVN..."
     echo "--------------------------------------------------"
-    SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
-    svn export $SVNBASE/pkg/filevector
-    svn export $SVNBASE/pkg/DatABEL
-    svn export $SVNBASE/pkg/${PKG}
+    if [ -z $SVNUSER ]; then
+        SVNCMD="svn export"
+        SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
+    else
+        SVNCMD="svn checkout"
+        SVNBASE=svn+ssh://${SVNUSER}@svn.r-forge.r-project.org/svnroot/genabel/
+    fi
+    $SVNCMD $SVNBASE/pkg/filevector
+    $SVNCMD $SVNBASE/pkg/DatABEL
+    $SVNCMD $SVNBASE/pkg/${PKG}
 
     cd ${PKG}
     rm -f cleanup* configure* *.R

Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_VariABEL.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_VariABEL.sh	2014-08-10 15:29:11 UTC (rev 1793)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_VariABEL.sh	2014-08-10 15:45:16 UTC (rev 1794)
@@ -5,11 +5,12 @@
 # the package.
 #
 # Command line options:
-# -n|--nocheckout: if the first command line option is keepold the previously
-#   checked out source code will not be deleted and no SVN checkout will
-#   be done. This is handy when trying out some of your local changes.
+# -n|--nocheckout: the previously checked out source code will not be
+#   deleted and no SVN checkout will be done. This is handy when trying
+#   out some of your local changes.
 # -c|--nocrancheck: don't run R CMD check --as-cran (can save some
 #   time if you're expecting trouble)
+# -u|--user <username>: Use <username> when checking out from SVN.
 
 PKG=VariABEL
 
@@ -27,6 +28,7 @@
 # Parse command line options
 NOCHECKOUT=false
 CRANCHECK=true
+SVNUSER=""
 while [ $# -gt 0 ]; do
     case $1 in
         -n | --nocheckout )
@@ -35,6 +37,11 @@
         -c | --nocrancheck )
             CRANCHECK=false
             ;;
+        -u | --user )
+            shift
+            SVNUSER=${1:?Error: please specify SVN user name after the -u option}
+            echo "Using SVN user name $SVNUSER"
+            ;;
         -* )
             echo "$0: invalid option $1" >&2
             exit 1
@@ -62,10 +69,16 @@
     echo "--------------------------------------------------"
     echo "Checking out source code from SVN..."
     echo "--------------------------------------------------"
-    SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
-    svn export $SVNBASE/pkg/filevector
-    svn export $SVNBASE/pkg/DatABEL
-    svn export $SVNBASE/pkg/${PKG}
+    if [ -z $SVNUSER ]; then
+        SVNCMD="svn export"
+        SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
+    else
+        SVNCMD="svn checkout"
+        SVNBASE=svn+ssh://${SVNUSER}@svn.r-forge.r-project.org/svnroot/genabel/
+    fi
+    $SVNCMD $SVNBASE/pkg/filevector
+    $SVNCMD $SVNBASE/pkg/DatABEL
+    $SVNCMD $SVNBASE/pkg/${PKG}
 
     cd ${PKG}
     rm -f cleanup* configure* *.R