aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--build-mingw.bat2
-rw-r--r--build-msvc.bat2
-rwxr-xr-xbuild.sh2
-rw-r--r--build/bootstrap.build7
-rw-r--r--buildfile5
-rw-r--r--manifest7
-rw-r--r--version1
8 files changed, 18 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 68e3c03..b6e0eb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ INSTALL
UPGRADE
BOOTSTRAP-*
!BOOTSTRAP-*.cli
+version
diff --git a/build-mingw.bat b/build-mingw.bat
index 02e1e87..b41073b 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -43,7 +43,7 @@ rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha"
rem Bpkg configuration directory.
rem
-set "cver=0.5-a1"
+set "cver=0.5-b.0"
set "cdir=build2-toolchain-%cver%"
rem Compiler.
diff --git a/build-msvc.bat b/build-msvc.bat
index 1b5e897..2e05958 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -43,7 +43,7 @@ rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha"
rem Bpkg configuration directory.
rem
-set "cver=0.5-a1"
+set "cver=0.5-b.0"
set "cdir=build2-toolchain-%cver%"
rem Installation directory.
diff --git a/build.sh b/build.sh
index c9ff07b..d25072f 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ fi
# Bpkg configuration directory.
#
-cver="0.5-a1"
+cver="0.5-b.0"
cdir="build2-toolchain-$cver"
diag ()
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 8eb2b6a..4641d38 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -5,10 +5,11 @@
project = build2-toolchain
subprojects = libbutl build2 libsqlite3 libodb libodb-sqlite libbpkg bpkg
-using build@0.4.0
+using version
-version = 0.5.0-a1
-dist.package = $project-$version
+# Since we are not a package, omit snapshot sn.
+#
+dist.package = $project-$version.project_id
using config
using dist
diff --git a/buildfile b/buildfile
index 8f80581..b0b2ee2 100644
--- a/buildfile
+++ b/buildfile
@@ -14,9 +14,10 @@ BOOTSTRAP-UNIX \
BOOTSTRAP-WINDOWS
./: $d doc{$i README version} cli{$i} \
-file{build.sh build-msvc.bat build-mingw.bat}
+ file{build.sh build-msvc.bat build-mingw.bat manifest}
-include $d
+doc{version}: file{manifest} # Generated by the version module.
+doc{version}: dist = true
# Don't install the BOOTSTRAP/INSTALL files. But UPGRADE could be useful.
#
diff --git a/manifest b/manifest
new file mode 100644
index 0000000..2454ec9
--- /dev/null
+++ b/manifest
@@ -0,0 +1,7 @@
+: 1
+
+# Note: not a real package, just for the version module.
+#
+version: 0.5.0-b.0.z
+depends: * build2 >= 0.5.0-
+depends: * bpkg >= 0.5.0-
diff --git a/version b/version
deleted file mode 100644
index d1f4eb1..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-0.5.0-a1