update to rc2 release

Author: adammoody

bootstrap.sh

@@ -5,8 +5,12 @@
 # installed to scr/install/
 #
 # Optional flags:
+#   --ssh    clone dependency repos with git ssh instead of https
 #   --debug  compiles dependencies with full debug "-g -O0"
-#   --dev    builds most recent version of each dependency
+#   --opt    compiles dependencies with optimization (non-debug)
+#   --dev    builds each dependency from its latest commit
+#   --tag    builds each dependency from a hardcoded tag
+#   --clean  deletes deps and install directories before build
 #
 
 set -x 
@@ -27,6 +31,8 @@ while [ $# -ge 1 ]; do
       build_debug=0 ;;
     "--dev" )
       build_dev=1 ;;
+    "--tag" )
+      build_dev=0 ;;
     "--clean" )
       build_clean=1 ;;
     *)
@@ -49,15 +55,15 @@ mkdir -p install
 
 cd deps
 
-lwgrp=lwgrp-1.0.3
-dtcmp=dtcmp-1.1.2
+lwgrp=lwgrp-1.0.4
+dtcmp=dtcmp-1.1.3
 pdsh=pdsh-2.34
 
 if [ ! -f ${lwgrp}.tar.gz ] ; then
-  wget https://github.com/LLNL/lwgrp/releases/download/v1.0.3/${lwgrp}.tar.gz
+  wget https://github.com/LLNL/lwgrp/releases/download/v1.0.4/${lwgrp}.tar.gz
 fi
 if [ ! -f ${dtcmp}.tar.gz ] ; then
-  wget https://github.com/LLNL/dtcmp/releases/download/v1.1.2/${dtcmp}.tar.gz
+  wget https://github.com/LLNL/dtcmp/releases/download/v1.1.3/${dtcmp}.tar.gz
 fi
 if [ ! -f ${pdsh}.tar.gz ] ; then
   wget https://github.com/chaos/pdsh/releases/download/${pdsh}/${pdsh}.tar.gz
@@ -136,7 +142,7 @@ popd
 
 pushd KVTree
   if [ $build_dev -eq 0 ] ; then
-    git checkout v1.1.1
+    git checkout v1.2.0
   fi
   rm -rf build
   mkdir -p build
@@ -157,7 +163,7 @@ popd
 
 pushd AXL
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.4.0
+    git checkout v0.5.0
   fi
   rm -rf build
   mkdir -p build
@@ -177,7 +183,7 @@ popd
 
 pushd spath
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.0.2
+    git checkout v0.1.0
   fi
   rm -rf build
   mkdir -p build
@@ -198,7 +204,7 @@ popd
 
 pushd rankstr
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.0.3
+    git checkout v0.1.0
   fi
   rm -rf build
   mkdir -p build
@@ -218,7 +224,7 @@ popd
 
 pushd redset
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.0.5
+    git checkout v0.1.0
   fi
   rm -rf build
   mkdir -p build
@@ -239,7 +245,7 @@ popd
 
 pushd shuffile
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.0.4
+    git checkout v0.1.0
   fi
   rm -rf build
   mkdir -p build
@@ -260,7 +266,7 @@ popd
 
 pushd er
   if [ $build_dev -eq 0 ] ; then
-    git checkout v0.0.4
+    git checkout v0.1.0
   fi
   rm -rf build
   mkdir -p build

dist/CMakeLists.txt

@@ -167,7 +167,6 @@ LIST(APPEND libaxl_srcs
     axl/src/axl_sync.c
     axl/src/axl_async_datawarp.c
     axl/src/axl_async_bbapi.c
-#    axl/src/axl_async_cppr.c
     axl/src/axl_err.c
     axl/src/axl_io.c
     axl/src/axl_util.c

dist/builddist

@@ -6,6 +6,7 @@ print_usage() {
     echo "Tags:"
     echo "  develop - build tarball of latest"
 #    echo "  v3.0rc1"
+    echo "  v3.0rc2"
 }
 
 # check that we got an argument or print usage
@@ -43,6 +44,20 @@ if [ "$1" == "develop" ] ; then
 #        "rankstr"  "ecp-veloc" "v0.0.3"
 #        "scr"      "llnl"      "v3.0rc1"
 #    )
+elif [ "$1" == "v3.0rc2" ] ; then
+    # to build the scr-v3.0rc2 release
+    ORGS=(
+        "lwgrp"    "llnl"      "v1.0.4"
+        "dtcmp"    "llnl"      "v1.1.3"
+        "kvtree"   "ecp-veloc" "v1.2.0"
+        "axl"      "ecp-veloc" "v0.5.0"
+        "spath"    "ecp-veloc" "v0.1.0"
+        "shuffile" "ecp-veloc" "v0.1.0"
+        "redset"   "ecp-veloc" "v0.1.0"
+        "er"       "ecp-veloc" "v0.1.0"
+        "rankstr"  "ecp-veloc" "v0.1.0"
+        "scr"      "llnl"      "v3.0rc2"
+    )
 else
     echo "Error: unknown tag: $1"
     echo ""

doc/rst/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.0'
+version = '3.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '3.0.0rc2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/rst/users/build.rst

@@ -46,9 +46,9 @@ To build SCR from a release tarball:
 
 .. code-block:: bash
 
-  wget https://github.com/LLNL/scr/releases/download/v3.0rc1/scr-top-v3.0rc1.tgz
-  tar -zxf scr-top-v3.0rc1.tgz
-  cd scr-top-v3.0rc1
+  wget https://github.com/LLNL/scr/releases/download/v3.0rc2/scr-top-v3.0rc2.tgz
+  tar -zxf scr-top-v3.0rc2.tgz
+  cd scr-top-v3.0rc2
 
   mkdir build
   cd build
@@ -201,13 +201,13 @@ For SLURM systems, SCR can be installed with:
 
 .. code-block:: bash
 
-  spack install scr@3.0rc1 resource_manager=SLURM
+  spack install scr@3.0rc2 resource_manager=SLURM
 
 For LSF, systems, SCR can be installed with:
 
 .. code-block:: bash
 
-  spack install scr@3.0rc1 resource_manager=LSF
+  spack install scr@3.0rc2 resource_manager=LSF
 
 The SCR Spack package provides other variants that may be useful.
 To see the full list, type:

doc/rst/users/quick.rst

@@ -32,9 +32,9 @@ To download and build SCR with CMake:
 
 .. code-block:: bash
 
-  wget https://github.com/LLNL/scr/releases/download/v3.0rc1/scr-top-v3.0rc1.tgz
-  tar -zxf scr-top-v3.0rc1.tgz
-  cd scr-top-v3.0rc1
+  wget https://github.com/LLNL/scr/releases/download/v3.0rc2/scr-top-v3.0rc2.tgz
+  tar -zxf scr-top-v3.0rc2.tgz
+  cd scr-top-v3.0rc2
 
   mkdir build install
   cd build
@@ -61,7 +61,7 @@ SCR can then be installed for SLURM systems with:
 
 .. code-block:: bash
 
-  spack install scr@3.0rc1
+  spack install scr@3.0rc2
 
 This downloads, builds, and installs SCR and its dependencies.