New build+bootstrap script for second phase

tools/bootstrap.py

@@ -0,0 +1,82 @@
+import argparse
+from pathlib import Path
+import subprocess
+import os
+from typing import Sequence
+import sys
+import shutil
+
+BOOTSTRAP_PHASES = [
+    'bootstrap-p1',
+]
+
+HERE = Path(__file__).parent.absolute()
+PROJECT_ROOT = HERE.parent
+BUILD_DIR = PROJECT_ROOT / '_build'
+BOOTSTRAP_DIR = BUILD_DIR / '_bootstrap'
+PREBUILT_DIR = PROJECT_ROOT / '_prebuilt'
+
+
+def _run_quiet(args) -> None:
+    cmd = [str(s) for s in args]
+    res = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    if res.returncode != 0:
+        print(f'Subprocess command {cmd} failed '
+              f'[{res.returncode}]:\n{res.stdout.decode()}')
+        raise subprocess.CalledProcessError(res.returncode, cmd)
+
+
+def _clone_bootstrap_phase(ph: str) -> None:
+    print(f'Cloning: {ph}')
+    if BOOTSTRAP_DIR.exists():
+        shutil.rmtree(BOOTSTRAP_DIR)
+    _run_quiet([
+        'git',
+        'clone',
+        '--depth=1',
+        f'--branch={ph}',
+        f'file://{PROJECT_ROOT}',
+        BOOTSTRAP_DIR,
+    ])
+
+
+def _build_bootstrap_phase(ph: str, args: argparse.Namespace) -> None:
+    print(f'Running build: {ph} (Please wait a moment...)')
+    env = os.environ.copy()
+    env['DDS_BOOTSTRAP_PREV_EXE'] = PREBUILT_DIR / 'dds'
+    subprocess.check_call(
+        [
+            sys.executable,
+            str(BOOTSTRAP_DIR / 'tools/build.py'),
+            f'--cxx={args.cxx}',
+        ],
+        env=env,
+    )
+
+
+def _pull_executable() -> None:
+    prebuild_dir = (PROJECT_ROOT / '_prebuilt')
+    prebuild_dir.mkdir(exist_ok=True)
+    exe, = list(BOOTSTRAP_DIR.glob('_build/dds*'))
+    exe.rename(prebuild_dir / exe.name)
+
+
+def _run_boot_phase(phase: str, args: argparse.Namespace) -> None:
+    _clone_bootstrap_phase(phase)
+    _build_bootstrap_phase(phase, args)
+    _pull_executable()
+
+
+def main(argv: Sequence[str]) -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '--cxx', help='The C++ compiler to use for the build', required=True)
+    args = parser.parse_args(argv)
+    for phase in BOOTSTRAP_PHASES:
+        _run_boot_phase(phase, args)
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))

tools/build.py

@@ -1,310 +1,71 @@
 #!/usr/bin/env python3
 
 import argparse
+from contextlib import contextmanager
 import os
 from pathlib import Path
-import multiprocessing
-import itertools
-from concurrent.futures import ThreadPoolExecutor
-from typing import Sequence, Iterable, Dict, Tuple, List, NamedTuple
+from typing import Sequence
 import subprocess
-import time
-import re
 import sys
+import shutil
+import tempfile
 
 ROOT = Path(__file__).parent.parent.absolute()
-
-INCLUDE_DIRS = [
-    'external/taywee-args/include',
-    'external/spdlog/include',
-    'external/wil/include',
-    'external/ranges-v3/include',
-    'external/nlohmann-json/include',
-]
-
-
-class BuildOptions(NamedTuple):
-    cxx: Path
-    jobs: int
-    static: bool
-    debug: bool
-    asan: bool
-
-    @property
-    def is_msvc(self) -> bool:
-        return is_msvc(self.cxx)
-
-    @property
-    def obj_suffix(self) -> str:
-        return '.obj' if self.is_msvc else '.o'
-
-
-def is_msvc(cxx: Path) -> bool:
-    return (not 'clang' in cxx.name) and 'cl' in cxx.name
-
-
-def have_ccache() -> bool:
-    try:
-        subprocess.check_output(['ccache', '--version'])
-        return True
-    except FileNotFoundError:
-        return False
-
-
-def have_sccache() -> bool:
-    try:
-        subprocess.check_output(['sccache', '--version'])
-        return True
-    except FileNotFoundError:
-        return False
-
-
-def _create_compile_command(opts: BuildOptions, cpp_file: Path,
-                            obj_file: Path) -> List[str]:
-    if not opts.is_msvc:
-        cmd = [
-            str(opts.cxx),
-            f'-I{ROOT / "src"}',
-            '-std=c++17',
-            '-Wall',
-            '-Wextra',
-            '-Werror',
-            '-Wshadow',
-            '-Wconversion',
-            '-fdiagnostics-color',
-            '-DFMT_HEADER_ONLY=1',
-            '-pthread',
-            '-c',
-            str(cpp_file),
-            f'-o{obj_file}',
-        ]
-        if opts.asan:
-            cmd.append('-fsanitize=address')
-        if have_ccache():
-            cmd.insert(0, 'ccache')
-        elif have_sccache():
-            cmd.insert(0, 'sccache')
-        if opts.static:
-            cmd.append('-static')
-        if opts.debug:
-            cmd.extend(('-g', '-O0'))
-        else:
-            cmd.append('-O2')
-        cmd.extend(
-            itertools.chain.from_iterable(('-isystem', str(ROOT / subdir))
-                                          for subdir in INCLUDE_DIRS))
-        return cmd
-    else:
-        cmd = [
-            str(opts.cxx),
-            '/W4',
-            '/WX',
-            '/nologo',
-            '/EHsc',
-            '/std:c++latest',
-            '/permissive-',
-            '/experimental:preprocessor',
-            '/wd5105',  # winbase.h
-            '/wd4459',  # Shadowing
-            '/DWIN32_LEAN_AND_MEAN',
-            '/DNOMINMAX',
-            '/DFMT_HEADER_ONLY=1',
-            '/D_CRT_SECURE_NO_WARNINGS',
-            '/diagnostics:caret',
-            '/experimental:external',
-            f'/I{ROOT / "src"}',
-            str(cpp_file),
-            '/c',
-            f'/Fo{obj_file}',
-        ]
-        if have_ccache():
-            cmd.insert(0, 'ccache')
-        if opts.debug:
-            cmd.extend(('/Od', '/DEBUG', '/Z7'))
-        else:
-            cmd.append('/O2')
-        if opts.static:
-            cmd.append('/MT')
-        else:
-            cmd.append('/MD')
-        cmd.extend(f'/external:I{ROOT / subdir}' for subdir in INCLUDE_DIRS)
-        return cmd
-
-
-def _compile_src(opts: BuildOptions, cpp_file: Path) -> Tuple[Path, Path]:
-    build_dir = ROOT / '_build'
-    src_dir = ROOT / 'src'
-    relpath = cpp_file.relative_to(src_dir)
-    obj_path = build_dir / '_obj' / relpath.with_name(relpath.name + opts.obj_suffix)
-    obj_path.parent.mkdir(exist_ok=True, parents=True)
-    cmd = _create_compile_command(opts, cpp_file, obj_path)
-    msg = f'Compile C++ file: {cpp_file.relative_to(ROOT)}'
-    print(msg)
-    start = time.time()
-    res = subprocess.run(
-        cmd,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-    )
-    if res.returncode != 0:
-        raise RuntimeError(
-            f'Compile command ({cmd}) failed for {cpp_file}:\n{res.stdout.decode()}'
-        )
-    stdout: str = res.stdout.decode()
-    stdout = re.sub(r'^{cpp_file.name}\r?\n', stdout, '')
-    fname_head = f'{cpp_file.name}\r\n'
-    if stdout:
-        print(stdout, end='')
-    end = time.time()
-    print(f'{msg} - Done: {end - start:.2n}s')
-    return cpp_file, obj_path
-
-
-def compile_sources(opts: BuildOptions,
-                    sources: Iterable[Path]) -> Dict[Path, Path]:
-    pool = ThreadPoolExecutor(opts.jobs)
-    return {
-        src: obj
-        for src, obj in pool.map(lambda s: _compile_src(opts, s), sources)
-    }
-
-
-def _create_archive_command(opts: BuildOptions,
-                            objects: Iterable[Path]) -> Tuple[Path, List[str]]:
-    if opts.is_msvc:
-        lib_file = ROOT / '_build/libdds.lib'
-        cmd = ['lib', '/nologo', f'/OUT:{lib_file}', *map(str, objects)]
-        return lib_file, cmd
-    else:
-        lib_file = ROOT / '_build/libdds.a'
-        cmd = ['ar', 'rsc', str(lib_file), *map(str, objects)]
-        return lib_file, cmd
-
-
-def make_library(opts: BuildOptions, objects: Iterable[Path]) -> Path:
-    lib_file, cmd = _create_archive_command(opts, objects)
-    if lib_file.exists():
-        lib_file.unlink()
-    print(f'Creating static library {lib_file}')
-    subprocess.check_call(cmd)
-    return lib_file
-
-
-def _create_exe_link_command(opts: BuildOptions, obj: Path, lib: Path,
-                             out: Path) -> List[str]:
-    if not opts.is_msvc:
-        cmd = [
-            str(opts.cxx),
-            '-pthread',
-            str(obj),
-            str(lib),
-            '-lstdc++fs',
-            f'-o{out}',
-        ]
-        if opts.asan:
-            cmd.append('-fsanitize=address')
-        if opts.static:
-            cmd.extend((
-                '-static',
-                # See: https://stackoverflow.com/questions/35116327/when-g-static-link-pthread-cause-segmentation-fault-why
-                '-Wl,--whole-archive',
-                '-lpthread',
-                '-Wl,--no-whole-archive',
-            ))
-        return cmd
-    else:
-        cmd = [
-            str(opts.cxx),
-            '/nologo',
-            '/W4',
-            '/WX',
-            '/Z7',
-            '/DEBUG',
-            'rpcrt4.lib',
-            f'/Fe{out}',
-            str(lib),
-            str(obj),
-        ]
-        if opts.debug:
-            cmd.append('/DEBUG')
-        if opts.static:
-            cmd.append('/MT')
-        else:
-            cmd.append('/MD')
-        return cmd
-
-
-def link_exe(opts: BuildOptions, obj: Path, lib: Path, *,
-             out: Path = None) -> Path:
-    if out is None:
-        basename = obj.stem
-        out = ROOT / '_build/test' / (basename + '.exe')
-        out.parent.mkdir(exist_ok=True, parents=True)
-
-    print(f'Linking executable {out}')
-    cmd = _create_exe_link_command(opts, obj, lib, out)
-    subprocess.check_call(cmd)
-    return out
-
-
-def run_test(exe: Path) -> None:
-    print(f'Running test: {exe}')
-    subprocess.check_call([str(exe)])
+BUILD_DIR = ROOT / '_build'
+
+
+@contextmanager
+def _generate_toolchain(cxx: str):
+    with tempfile.NamedTemporaryFile(
+            suffix='-dds-toolchain.dds', mode='wb') as f:
+        comp_id = 'GNU'
+        flags = ''
+        link_flags = ''
+        if cxx in ('cl', 'cl.exe'):
+            comp_id = 'MSVC'
+            flags += '/experimental:preprocessor '
+            link_flags += 'rpcrt4.lib '
+        content = f'''
+            Compiler-ID: {comp_id}
+            C++-Compiler: {cxx}
+            C++-Version: C++17
+            Debug: True
+            Flags: {flags}
+            Link-Flags: {link_flags}'''
+        print('Using generated toolchain file: ' + content)
+        f.write(content.encode('utf-8'))
+        f.flush()
+        yield Path(f.name)
 
 
 def main(argv: Sequence[str]) -> int:
     parser = argparse.ArgumentParser()
-    parser.add_argument(
-        '--test', action='store_true', help='Build and run tests')
     parser.add_argument(
         '--cxx', help='Path/name of the C++ compiler to use.', required=True)
-    parser.add_argument(
-        '--jobs',
-        '-j',
-        type=int,
-        help='Set number of parallel build threads',
-        default=multiprocessing.cpu_count() + 2)
-    parser.add_argument(
-        '--debug',
-        action='store_true',
-        help='Build with debug information and disable optimizations')
-    parser.add_argument(
-        '--static', action='store_true', help='Build a static executable')
-    parser.add_argument('--asan', action='store_true', help='Enable Address Sanitizer')
     args = parser.parse_args(argv)
 
-    all_sources = set(ROOT.glob('src/**/*.cpp'))
-    test_sources = set(ROOT.glob('src/**/*.test.cpp'))
-    main_sources = set(ROOT.glob('src/**/*.main.cpp'))
-
-    lib_sources = (all_sources - test_sources) - main_sources
-
-    build_opts = BuildOptions(
-        cxx=Path(args.cxx),
-        jobs=args.jobs,
-        static=args.static,
-        asan=args.asan,
-        debug=args.debug)
-
-    objects = compile_sources(build_opts, sorted(all_sources))
-
-    lib = make_library(build_opts, (objects[p] for p in lib_sources))
+    dds_bootstrap_env_key = 'DDS_BOOTSTRAP_PREV_EXE'
+    if dds_bootstrap_env_key not in os.environ:
+        raise RuntimeError(
+            'A previous-phase bootstrapped executable must be available via $DDS_BOOTSTRAP_PREV_EXE'
+        )
+    dds_exe = os.environ[dds_bootstrap_env_key]
 
-    test_objs = (objects[p] for p in test_sources)
-    pool = ThreadPoolExecutor(build_opts.jobs)
-    test_exes = list(
-        pool.map(lambda o: link_exe(build_opts, o, lib), test_objs))
+    print(f'Using previously built DDS executable: {dds_exe}')
 
-    main_exe = link_exe(
-        build_opts,
-        objects[next(iter(main_sources))],
-        lib,
-        out=ROOT / '_build/dds')
+    if BUILD_DIR.exists():
+        shutil.rmtree(BUILD_DIR)
 
-    if args.test:
-        list(pool.map(run_test, test_exes))
+    with _generate_toolchain(args.cxx) as tc_fpath:
+        subprocess.check_call([
+            dds_exe,
+            'build',
+            '-A',
+            f'-T{tc_fpath}',
+            f'-p{ROOT}',
+            f'--out={BUILD_DIR}',
+        ])
 
-    print(f'Main executable generated at {main_exe}')
     return 0