diff options
Diffstat (limited to 'buildfile')
| -rw-r--r-- | buildfile | 39 |
1 files changed, 22 insertions, 17 deletions
@@ -13,15 +13,15 @@ assert ($build.meta_operation == 'dist' || \ # Package repository URL (or path). # build2_repo="https://stage.build2.org/1" -# build2_repo="https://pkg.cppget.org/1/queue/alpha" -# build2_repo="https://pkg.cppget.org/1/alpha" +#build2_repo="https://pkg.cppget.org/1/queue/alpha" +#build2_repo="https://pkg.cppget.org/1/alpha" # @@ Note that the project directories order is important (prerequisites go # first). # -# See also subprojects in bootstrap.build. +# NOTE: see also subprojects in bootstrap.build if changing anything here. # -d = libpkgconf/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ +d = libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ if ($build.meta_operation == 'dist') @@ -53,16 +53,20 @@ pt = '^version: (.+)$' # modules to locate all the places): # # - this buildfile +# - build/bootstrap.build (submodules; should be handled automatically) # - build scripts: build.sh.in and build-*.bat.in -# - documentation: BOOTSTRAP-*.cli and UPGRADE.cli (mention as new module) +# - documentation: BOOTSTRAP-*.cli and UPGRADE.cli (multiple places) # - install scripts: prepare, build2-install.sh, and build2-install-*.bat -# - build2.org/www/ (both public and stage) +# - build2.org/www/ (module docs symlinks for both public and stage, etc) +# - make sure the module has `builds: all` in its manifest +# - make sure the module is listed in the mod array in etc/bootstrap # -ver = $process.run_regex($bp 'info:' $src_root/, "$pt", '\1') -build2_ver = $process.run_regex($bp 'info:' $src_root/build2/, "$pt", '\1') -bpkg_ver = $process.run_regex($bp 'info:' $src_root/bpkg/, "$pt", '\1') -bdep_ver = $process.run_regex($bp 'info:' $src_root/bdep/, "$pt", '\1') -kconfig_ver = $process.run_regex($bp 'info:' $src_root/libbuild2-kconfig/, "$pt", '\1') +ver = $process.run_regex($bp 'info:' $src_root/, "$pt", '\1') +build2_ver = $process.run_regex($bp 'info:' $src_root/build2/, "$pt", '\1') +bpkg_ver = $process.run_regex($bp 'info:' $src_root/bpkg/, "$pt", '\1') +bdep_ver = $process.run_regex($bp 'info:' $src_root/bdep/, "$pt", '\1') +autoconf_ver = $process.run_regex($bp 'info:' $src_root/libbuild2-autoconf/, "$pt", '\1') +kconfig_ver = $process.run_regex($bp 'info:' $src_root/libbuild2-kconfig/, "$pt", '\1') # Generate install scripts from templates and include them into the # distribution. @@ -96,12 +100,13 @@ for s: exe{build.sh} file{build-msvc.bat build-clang.bat build-mingw.bat} cver = "$cver-$ab.$pr" end - sed -e 's%@BUILD2_REPO@%'$build2_repo'%' $p >$t - sed -e 's/@CONFIG_VER@/'$cver'/' -i $t - sed -e 's/@BUILD2_VERSION@/'$build2_ver'/' -i $t - sed -e 's/@BPKG_VERSION@/'$bpkg_ver'/' -i $t - sed -e 's/@BDEP_VERSION@/'$bdep_ver'/' -i $t - sed -e 's/@KCONFIG_VERSION@/'$kconfig_ver'/' -i $t + sed -e 's%@BUILD2_REPO@%'$build2_repo'%' $p >$t + sed -e 's/@CONFIG_VER@/'$cver'/' -i $t + sed -e 's/@BUILD2_VERSION@/'$build2_ver'/' -i $t + sed -e 's/@BPKG_VERSION@/'$bpkg_ver'/' -i $t + sed -e 's/@BDEP_VERSION@/'$bdep_ver'/' -i $t + sed -e 's/@AUTOCONF_VERSION@/'$autoconf_ver'/' -i $t + sed -e 's/@KCONFIG_VERSION@/'$kconfig_ver'/' -i $t }} } |