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 --- .gitmodules | 3 +++ BOOTSTRAP-UNIX.cli | 2 +- BOOTSTRAP-WINDOWS-CLANG.cli | 2 +- BOOTSTRAP-WINDOWS-MINGW.cli | 2 +- BOOTSTRAP-WINDOWS-MSVC.cli | 2 +- UPGRADE.cli | 1 + build-clang.bat.in | 3 ++- build-mingw.bat.in | 3 ++- build-msvc.bat.in | 3 ++- build.sh.in | 3 ++- buildfile | 26 ++++++++++++++------------ libbuild2-autoconf | 1 + submodules/libbuild2-autoconf | 1 + tests/libbuild2-autoconf-tests | 1 + 14 files changed, 33 insertions(+), 20 deletions(-) create mode 120000 libbuild2-autoconf create mode 160000 submodules/libbuild2-autoconf create mode 120000 tests/libbuild2-autoconf-tests diff --git a/.gitmodules b/.gitmodules index 8c319ab..d4deead 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,3 +35,6 @@ [submodule "submodules/libbuild2-kconfig"] path = submodules/libbuild2-kconfig url = https://github.com/build2/libbuild2-kconfig.git +[submodule "submodules/libbuild2-autoconf"] + path = submodules/libbuild2-autoconf + url = https://github.com/build2/libbuild2-autoconf.git diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli index 70e9a08..412041d 100644 --- a/BOOTSTRAP-UNIX.cli +++ b/BOOTSTRAP-UNIX.cli @@ -348,7 +348,7 @@ $ bdep --version Finally, we build and install the standard build system modules: \ -$ bpkg build --for install libbuild2-kconfig +$ bpkg build --for install libbuild2-autoconf libbuild2-kconfig $ bpkg install --all-pattern=libbuild2-* \ diff --git a/BOOTSTRAP-WINDOWS-CLANG.cli b/BOOTSTRAP-WINDOWS-CLANG.cli index c837d87..e02913e 100644 --- a/BOOTSTRAP-WINDOWS-CLANG.cli +++ b/BOOTSTRAP-WINDOWS-CLANG.cli @@ -264,7 +264,7 @@ C:\build2\bin\bdep.exe Finally, we build and install the standard build system modules: \ -> bpkg build --for install libbuild2-kconfig +> bpkg build --for install libbuild2-autoconf libbuild2-kconfig > bpkg install --all-pattern=libbuild2-* \ diff --git a/BOOTSTRAP-WINDOWS-MINGW.cli b/BOOTSTRAP-WINDOWS-MINGW.cli index 20a975b..d9d7582 100644 --- a/BOOTSTRAP-WINDOWS-MINGW.cli +++ b/BOOTSTRAP-WINDOWS-MINGW.cli @@ -267,7 +267,7 @@ C:\build2\bin\bdep.exe Finally, we build and install the standard build system modules: \ -> bpkg build --for install libbuild2-kconfig +> bpkg build --for install libbuild2-autoconf libbuild2-kconfig > bpkg install --all-pattern=libbuild2-* \ diff --git a/BOOTSTRAP-WINDOWS-MSVC.cli b/BOOTSTRAP-WINDOWS-MSVC.cli index 2a066f8..ef4b9b7 100644 --- a/BOOTSTRAP-WINDOWS-MSVC.cli +++ b/BOOTSTRAP-WINDOWS-MSVC.cli @@ -238,7 +238,7 @@ C:\build2\bin\bdep.exe Finally, we build and install the standard build system modules: \ -> bpkg build --for install libbuild2-kconfig +> bpkg build --for install libbuild2-autoconf libbuild2-kconfig > bpkg install --all-pattern=libbuild2-* \ diff --git a/UPGRADE.cli b/UPGRADE.cli index 202a2a6..586f12a 100644 --- a/UPGRADE.cli +++ b/UPGRADE.cli @@ -122,6 +122,7 @@ previous releases): $ bpkg build --for install ... # new in 0.14.0: libbuild2-kconfig +# new in 0.15.0: libbuild2-autoconf \ Once this is done, we can proceed to installing: diff --git a/build-clang.bat.in b/build-clang.bat.in index 02fb49f..51d7e13 100644 --- a/build-clang.bat.in +++ b/build-clang.bat.in @@ -80,7 +80,8 @@ rem rem NOTE: we currently print the list as a single line and will need to rem somehow change that when it becomes too long. rem -set "standard_modules=kconfig" +set "standard_modules=autoconf, kconfig" +set "autoconf_ver=@AUTOCONF_VERSION@" set "kconfig_ver=@KCONFIG_VERSION@" rem The bpkg configuration directory. diff --git a/build-mingw.bat.in b/build-mingw.bat.in index 6bb4841..03f3ab8 100644 --- a/build-mingw.bat.in +++ b/build-mingw.bat.in @@ -79,7 +79,8 @@ rem rem NOTE: we currently print the list as a single line and will need to rem somehow change that when it becomes too long. rem -set "standard_modules=kconfig" +set "standard_modules=autoconf, kconfig" +set "autoconf_ver=@AUTOCONF_VERSION@" set "kconfig_ver=@KCONFIG_VERSION@" rem The bpkg configuration directory. diff --git a/build-msvc.bat.in b/build-msvc.bat.in index b920fd2..6d72012 100644 --- a/build-msvc.bat.in +++ b/build-msvc.bat.in @@ -69,7 +69,8 @@ rem rem NOTE: we currently print the list as a single line and will need to rem somehow change that when it becomes too long. rem -set "standard_modules=kconfig" +set "standard_modules=autoconf, kconfig" +set "autoconf_ver=@AUTOCONF_VERSION@" set "kconfig_ver=@KCONFIG_VERSION@" rem The bpkg configuration directory. diff --git a/build.sh.in b/build.sh.in index 8bd0d3a..e7c7acc 100644 --- a/build.sh.in +++ b/build.sh.in @@ -22,7 +22,8 @@ bdep_ver="@BDEP_VERSION@" # NOTE: we currently print the list as a single line and will need to somehow # change that when it becomes too long. # -standard_modules="kconfig" +standard_modules="autoconf, kconfig" +autoconf_ver="@AUTOCONF_VERSION@" kconfig_ver="@KCONFIG_VERSION@" # The bpkg configuration directory. 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 }} } diff --git a/libbuild2-autoconf b/libbuild2-autoconf new file mode 120000 index 0000000..8f9c866 --- /dev/null +++ b/libbuild2-autoconf @@ -0,0 +1 @@ +submodules/libbuild2-autoconf/libbuild2-autoconf \ No newline at end of file diff --git a/submodules/libbuild2-autoconf b/submodules/libbuild2-autoconf new file mode 160000 index 0000000..f0715ce --- /dev/null +++ b/submodules/libbuild2-autoconf @@ -0,0 +1 @@ +Subproject commit f0715ced26e2b8fcb38003d5fa42b277694c4b49 diff --git a/tests/libbuild2-autoconf-tests b/tests/libbuild2-autoconf-tests new file mode 120000 index 0000000..38b1b4a --- /dev/null +++ b/tests/libbuild2-autoconf-tests @@ -0,0 +1 @@ +../submodules/libbuild2-autoconf/libbuild2-autoconf-tests \ No newline at end of file -- cgit v1.1