From a061a6aa4a9b402fbb769b4037ca796e115774e6 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 25 Nov 2021 11:35:19 +0300 Subject: Add autoconf standard pre-installed build system module --- buildfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'buildfile') diff --git a/buildfile b/buildfile index 78b026e..4c3b9bd 100644 --- a/buildfile +++ b/buildfile @@ -56,13 +56,14 @@ pt = '^version: (.+)$' # - build scripts: build.sh.in and build-*.bat.in # - documentation: BOOTSTRAP-*.cli and UPGRADE.cli (mention as new module) # - 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) # -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 +97,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 }} } -- cgit v1.1