From aa54c708b2f667260d654658d380dd47d05d7001 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 4 Nov 2020 17:54:17 +0300 Subject: Add libbuild2-kconfig to installation/upgrade documentation and build scripts --- build-clang.bat.in | 120 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 106 insertions(+), 14 deletions(-) (limited to 'build-clang.bat.in') diff --git a/build-clang.bat.in b/build-clang.bat.in index 1a69072..fe7e26d 100644 --- a/build-clang.bat.in +++ b/build-clang.bat.in @@ -10,15 +10,17 @@ goto start echo. echo Usage: %0 [/?] [^] [^] echo Options: -echo --local Don't build from packages, only from local source. -echo --no-bpkg Don't install bpkg nor bdep (requires --local). -echo --no-bdep Don't install bdep. -echo --install-dir ^ Alternative installation directory. -echo --repo ^ Alternative package repository location. -echo --trust ^ Repository certificate fingerprint to trust. -echo --timeout ^ Network operations timeout in seconds. -echo --make ^ Bootstrap using GNU make instead of batch file. -echo --verbose ^ Diagnostics verbosity level between 0 and 6. +echo --local Don't build from packages, only from local source. +echo --no-bpkg Don't install bpkg nor bdep (requires --local). +echo --no-bdep Don't install bdep. +echo --no-modules Don't install standard build system modules. +echo --modules "" Install only specified standard build system modules. +echo --install-dir ^ Alternative installation directory. +echo --repo ^ Alternative package repository location. +echo --trust ^ Repository certificate fingerprint to trust. +echo --timeout ^ Network operations timeout in seconds. +echo --make ^ Bootstrap using GNU make instead of batch file. +echo --verbose ^ Diagnostics verbosity level between 0 and 6. echo. echo By default the batch file will use clang++.exe as the C++ compiler and echo install into C:\build2. It also expects to find the base utilities in the @@ -34,6 +36,14 @@ echo additional make options, for example: echo. echo %0 --make mingw32-make --make -j8 echo. +echo The script by default installs the following standard build system +echo modules: +echo. +echo %standard_modules% +echo. +echo Use --no-modules to suppress installing build system modules or +echo --modules "" to specify a comma-separated subset to install. +echo. echo See the BOOTSTRAP-WINDOWS-CLANG file for details. echo. goto end @@ -54,6 +64,14 @@ set "build2_ver=@BUILD2_VERSION@" set "bpkg_ver=@BPKG_VERSION@" set "bdep_ver=@BDEP_VERSION@" +rem Standard modules comma-separated list and versions. +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 "kconfig_ver=@KCONFIG_VERSION@" + rem The bpkg configuration directory. rem set "cver=@CONFIG_VER@" @@ -64,6 +82,7 @@ rem set "local=" set "bpkg=true" set "bdep=true" +set "modules=%standard_modules%" set "idir=C:\build2" set "trust=" set "timeout=" @@ -93,6 +112,19 @@ if "_%~1_" == "_--no-bdep_" ( goto options ) +if "_%~1_" == "_--no-modules_" ( + set "modules=" + shift + goto options +) + +if "_%~1_" == "_--modules_" ( + set "modules=%~2" + shift + shift + goto options +) + if "_%~1_" == "_--install-dir_" ( if "_%~2_" == "__" ( echo error: installation directory expected after --install-dir @@ -187,6 +219,14 @@ if "_%bpkg%_" == "__" ( set "bdep=" ) +for %%m in (%modules%) do ( + if "_!%%m_ver!_" == "__" ( + echo error: unknown standard build system module '%%m' + echo info: available standard modules: %standard_modules% + goto error + ) +) + rem Convert a relative path to an absolute. rem for /F "delims=|" %%D in ("%idir%") do set "idir=%%~dpnxD" @@ -299,14 +339,16 @@ build2\build2\b-boot %verbose% configure^ config.install.root=%idir% @if errorlevel 1 goto error -@set "projects=build2/" +@rem Install toolchain. +@rem +@set "projects=build2\" @if "_%bpkg%_" == "_true_" ( - set "projects=%projects% bpkg/" + set "projects=%projects% bpkg\" ) @if "_%bdep%_" == "_true_" ( - set "projects=%projects% bdep/" + set "projects=%projects% bdep\" ) build2\build2\b-boot %verbose% install: %projects% @@ -338,6 +380,26 @@ bdep --version :bdep_vle +@rem Install modules. +@rem +@set "projects=" +@set "tests=" + +@for %%m in (%modules%) do @( + set "projects=!projects! libbuild2-%%m\" + set "tests=!tests! tests\libbuild2-%%m-tests\" +) + +@if "_%projects%_" == "__" goto mods_ile + +b install: %projects:~1% +@if errorlevel 1 goto error + +b noop: %tests:~1% +@if errorlevel 1 goto error + +:mods_ile + @echo off echo. @@ -436,10 +498,40 @@ bdep --version :bdep_vpe -@rem Clean up stage. +@rem Build, install, and verify the build system modules. @rem +@set "packages=" +@set "package_versions=" +@set "tests=" + +@for %%m in (%modules%) do @( + set "packages=!packages! libbuild2-%%m" + set "package_versions=!package_versions! libbuild2-%%m/!%%m_ver!" + set "tests=!tests! tests\libbuild2-%%m-tests\" +) + +@if "_%packages%_" == "__" goto mods_ipe + +bpkg build --for install %package_versions:~1% +@if errorlevel 1 goto error + +bpkg install %packages:~1% +@if errorlevel 1 goto error + +:mods_ipe + cd %owd% -b %verbose% uninstall: build2/ bpkg/ + +@if "_%tests%_" == "__" goto mods_lpe + +b noop: %tests:~1% +@if errorlevel 1 goto error + +:mods_lpe + +@rem Clean up stage. +@rem +b %verbose% uninstall: build2\ bpkg\ @if errorlevel 1 goto error @echo off -- cgit v1.1