diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 18:27:16 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 18:31:04 +0200 |
| commit | faf69983e43f51130d2edaf5109f978ec4e628e6 (patch) | |
| tree | b330039e09f4f326479b2a903d5fc51a68f4ab9b | |
| parent | d4f832e6d8e3f6e503b5123eb1ab71d77e558fcb (diff) | |
Switch to version module
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build-mingw.bat | 2 | ||||
| -rw-r--r-- | build-msvc.bat | 2 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | build/bootstrap.build | 7 | ||||
| -rw-r--r-- | buildfile | 5 | ||||
| -rw-r--r-- | manifest | 7 | ||||
| -rw-r--r-- | version | 1 |
8 files changed, 18 insertions, 9 deletions
@@ -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. @@ -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 @@ -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 |