summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-08-08 13:32:02 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2017-08-08 13:32:02 (GMT)
commit5c138ea1178b53d6cf2d6c80032e1762d51e4ea1 (patch)
treef8751516e5d0b38f27ebc890e58af8401315e12d
parent6080bd9453345c1ed46adbace47ff7029ecefe52 (diff)
Update for 0.6.0 release0.6.0
-rw-r--r--git/modules18
-rw-r--r--release.txt57
-rwxr-xr-xreview2
-rwxr-xr-xstage1
-rwxr-xr-xversion15
5 files changed, 63 insertions, 30 deletions
diff --git a/git/modules b/git/modules
index 6b018fe..3f822ad 100644
--- a/git/modules
+++ b/git/modules
@@ -8,16 +8,18 @@ bpkg \
brep \
libbbot \
bbot \
-libstd-modules \
-buildos \
-msvc-linux"
+libstd-modules"
-# During release it is useful to exclude etc/ and/or build2-toolchain so
-# can do mass commits (like version updates).
+# During release it is useful to exclude some of these so can do mass
+# commits (like version updates).
#
+modules="$modules build2-toolchain"
+
+modules="$modules buildos"
+modules="$modules msvc-linux"
+
modules="$modules etc"
modules="$modules private"
-modules="$modules build2-toolchain"
# We don't tag git/, etc/, and private/.
#
@@ -30,9 +32,9 @@ brep \
libbbot \
bbot \
libstd-modules \
-buildos \
msvc-linux \
-build2-toolchain"
+build2-toolchain \
+buildos"
# Submodule update in build2-toolchain has to be done manually.
#
diff --git a/release.txt b/release.txt
index fad7f9a..fcf4bb0 100644
--- a/release.txt
+++ b/release.txt
@@ -2,12 +2,13 @@
- Add new bot machines/configurations/options from stage to queue to public
-- Replace 0.5.0 and 0.5 in this document with the new version.
+- Replace 0.6.0 and 0.6 in this document with the new version.
- Remove etc/ and private/ from modules in etc/git/modules to reduce
noise during stat. Also, review for any new modules.
-- Review '@@' items [private/ excluded, at least look for @@ TMP]
+- Review '@@' items [private/ excluded, update with new modules, at least
+ look for @@ TMP]
etc/review | less -R
@@ -60,9 +61,6 @@
- Bootstrap then update and test local
- @@ Need to manually clean old the project builds because they
- pick up old version.hxx (during dep extraction).
-
cd build2
b clean
git cout build2/version.hxx build2/b-options.?xx
@@ -80,17 +78,19 @@
rm -r staging/0/*
rm -r staging/repository/1/*/
- - Restage (step 1 above, with -b):
+ - Restage with -b:
etc/stage -b
- Check /0/ and /1/ for anything stray
+ - restage hello (libstd-modules)
+
- Upgrade brep on cppget.org (queue and main repo) using stage
- Queue packages:
- - Change BUILD2_REPO in build2_toolchain build script to queue
+ - Change BUILD2_REPO in build2_toolchain build scripts to queue
- Cleanup queue repo:
@@ -191,7 +191,7 @@
- Commit and tag private/
- git tag -a 0.5.0 -m "Tag version 0.5.0" && git push --tags
+ git tag -a 0.6.0 -m "Tag version 0.6.0" && git push --tags
- Tag & Commit hello
@@ -200,8 +200,8 @@
cd hello
./foreach-git stat
- ./foreach-git -x libhello-1.0 tag -a build2-0.5.0 -m "Tag for build2 version 0.5.0"
- git -C libhello-1.0 tag -a 1.0/build2-0.5.0 -m "Tag for build2 version 0.5.0"
+ ./foreach-git -x libhello-1.0 tag -a build2-0.6.0 -m "Tag for build2 version 0.6.0"
+ git -C libhello-1.0 tag -a 1.0/build2-0.6.0 -m "Tag for build2 version 0.6.0"
./foreach-git push --tags
- Tag & Commit
@@ -218,7 +218,7 @@
For build2 projects, review tag_modules in etc/git/modules, then:
- ./tag.sh 0.5.0
+ ./tag.sh 0.6.0
./push.sh
- Increment versions and open master for business
@@ -238,6 +238,35 @@
- Regenerate odb & cli docs everywhere (packages and build2-toolchain).
+ New sequence:
+
+ ~ rebuild ODB compiler
+
+ b '{clean update}(build2/ libbutl/)'
+
+ cd ../odb/builds/default/
+ b update # errors are ok
+ b update
+
+ b clean libbpkg/
+ cd bpkg/bpkg
+ b clean
+ b --match-only # errors are ok
+ ./odb.sh
+ cd ..
+ b
+
+ cd brep
+ b clean
+ b --match-only # errors are ok
+ cd libbrep
+ b hxx{version}
+ ./odb.sh
+ cd ..
+ b
+
+ ~ the rest is like in local test above
+
- Update/test local (see early steps of this list).
- Make symlinks for new version in baseutils (for both baseutils and mingw,
@@ -261,8 +290,8 @@
- Commit and tag
- git tag -a 0.5.0 -m "Tag version 0.5.0" && git push --tags
+ git tag -a 0.6.0 -m "Tag version 0.6.0" && git push --tags
-- Snapshot buildos-5 subvolume as buildos-5-0.5.0
+- Snapshot buildos-5 subvolume as buildos-5-0.6.0
- btrfs subvolume snapshot buildos-5 buildos-5-0.5.0
+ btrfs subvolume snapshot buildos-5 buildos-5-0.6.0
diff --git a/review b/review
index 3d739ac..a8a0f98 100755
--- a/review
+++ b/review
@@ -6,7 +6,7 @@
#
usage="usage: $0"
-modules="libbutl build2 libbpkg bpkg brep build2-toolchain"
+modules="libbutl build2 libbpkg bpkg brep libbbot bbot libstd-modules build2-toolchain"
owd=`pwd`
trap "{ cd $owd; exit 1; }" ERR
diff --git a/stage b/stage
index ed56874..a168a84 100755
--- a/stage
+++ b/stage
@@ -174,4 +174,3 @@ etc/stage-pkg -c $mode build2 \
brep \
bbot \
libstd-modules
-
diff --git a/version b/version
index 33a4b3f..4b5b0b0 100755
--- a/version
+++ b/version
@@ -8,19 +8,22 @@ usage="usage: etc/version"
# No max, always >=.
#
-build2_min=0.5.0-
-bpkg_min=0.5.0-
+build2_min=0.6.0-
+bpkg_min=0.6.0-
-ver=0.6.0-a.0.z
+ver=0.7.0-a.0.z
+#ver=0.6.0
mods=(libstd-modules libbutl libbpkg libbbot)
-odb_ver=2.5.0-b.4.z
+odb_ver=2.5.0-b.6.z
+#odb_ver=2.5.0-b.5
odb_mods=(libodb libodb-sqlite libodb-pgsql)
-xml_ver=1.1.0-b.1.z
+xml_ver=1.1.0-b.2.z
+#xml_ver=1.1.0-b.2
xml_mods=(libstudxml)
-all=(libstd-modules libbutl build2 libbpkg bpkg libbbot brep bbot msvc-linux build2-toolchain)
+all=(libstd-modules libbutl build2 libbpkg bpkg libbbot brep bbot build2-toolchain msvc-linux buildos)
# In manifests for alpha/beta we use an exact match. For snapshots -- snapshot
# range. Otherwise an X.Y.* range.