Update bootstrap, upgrade scripts with libbutl-odb changes

2 files changed, 10 insertions, 10 deletions

diff --git a/bootstrap b/bootstrap
index 16aa666..6e333ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -11,15 +11,15 @@
 #
 # Typical command lines for "full" development setup:
 #
-# --ssh --clean --extra --module rust --cxx g++-7 --cfg gcc7 --loptions "-fuse-ld=gold -Wl,--threads,--thread-count,4"
+# --ssh --clean --extra --module rust --cxx g++ --cfg gcc --loptions "-fuse-ld=gold -Wl,--threads,--thread-count,4"
 #
 # Additional configuration:
 #
-# --no-clone --no-symlink --no-libs --no-modules --cxx g++-7 --cfg gcc7-tsan --coptions "-Wall -Wextra -Werror -g -fsanitize=thread" --loptions "-fuse-ld=gold -Wl,--threads,--thread-count,4"
+# --no-clone --no-symlink --no-libs --no-modules --cxx g++ --cfg gcc-tsan --coptions "-Wall -Wextra -Werror -g -fsanitize=thread" --loptions "-fuse-ld=gold -Wl,--threads,--thread-count,4"
 #
 # To initialize any additional projects:
 #
-# bdep init -d <proj> -A builds/gcc7 @gcc7
+# bdep init -d <proj> -A builds/gcc @gcc
 #
 # Note that this script runs git-update-index commands specified in the
 # README-GIT files of cloned repositories. It also expected the staged
@@ -372,30 +372,30 @@ fi
 
 # Generate database support (currently and temporarily handled with a script).
 #
-# Note: this has to be done after bdep-init since we need the libodb headers.
-#       We also have to pre-update version headers.
+# Note: this has to be done after bdep-init since we need the libodb and
+#       libbutl-odb headers. We also have to pre-update version headers.
 #
 if [ $def ]; then
-  run bpkg update -d "$rd" libodb
   run b "$rd/libbutl/libbutl/hxx{version}"
   run b "$rd/libbpkg/libbpkg/hxx{version}"
   run b "$rd/bpkg/bpkg/hxx{version common-options}"
   run b "$rd/bdep/bdep/hxx{version common-options project-options}"
 
   run cd bpkg/bpkg
-  run ./odb.sh
+  run ./odb.sh # Uses libbutl-odb.
   run cd -
 
   run cd bdep/bdep
-  run ./odb.sh
+  run ./odb.sh # Uses libbutl-odb.
   run cd -
 
   if [ "$extra" ]; then
+    run bpkg update -d "$rd" libodb
     run b "$rd/brep/web/xhtml/hxx{version}"
     run b "$rd/brep/libbrep/hxx{version}"
 
     run cd brep/libbrep
-    run ./odb.sh
+    run ./odb.sh # Uses libodb.
     run cd -
   fi
 fi
diff --git a/upgrade b/upgrade
index c98e9d6..96cdf6d 100755
--- a/upgrade
+++ b/upgrade
@@ -21,7 +21,7 @@
 # but only the build system is updated. This can be done at a later stage by
 # running the build system in the configuration directory:
 #
-# BDEP_SYNC=0 b builds/gcc7/
+# BDEP_SYNC=0 b builds/gcc/
 #
 owd="$(pwd)"
 trap "{ cd '$owd'; exit 1; }" ERR