1 files changed, 3 insertions, 124 deletions
diff --git a/project/ci/appveyor/cmake.py b/project/ci/appveyor/cmake.py
index b720f6b..6df28f2 100644
--- a/project/ci/appveyor/cmake.py
+++ b/project/ci/appveyor/cmake.py
@@ -3,135 +3,14 @@
 # For details, see https://github.com/egor-tensin/cmake-common.
 # Distributed under the MIT License.
 
-R'''Build a CMake project on AppVeyor.
-
-This is similar to build.py, but auto-fills some parameters for build.py from
-the AppVeyor-defined environment variables.
-
-The project is built in C:\Projects\build.
-'''
-
-import argparse
-from enum import Enum
-import logging
-import os
-import sys
-
-from project.cmake.build import BuildParameters, build
-from project.configuration import Configuration
-from project.platform import Platform
+from project.ci.cmake import build_ci
+from project.ci.dirs import AppVeyor
 from project.utils import setup_logging
 
 
-class Image(Enum):
-    VS_2013 = 'Visual Studio 2013'
-    VS_2015 = 'Visual Studio 2015'
-    VS_2017 = 'Visual Studio 2017'
-    VS_2019 = 'Visual Studio 2019'
-
-    def __str__(self):
-        return self.value
-
-    @staticmethod
-    def parse(s):
-        try:
-            return Image(s)
-        except ValueError as e:
-            raise ValueError(f'unsupported AppVeyor image: {s}') from e
-
-
-class Generator(Enum):
-    VS_2013 = 'Visual Studio 12 2013'
-    VS_2015 = 'Visual Studio 14 2015'
-    VS_2017 = 'Visual Studio 15 2017'
-    VS_2019 = 'Visual Studio 16 2019'
-
-    def __str__(self):
-        return self.value
-
-    @staticmethod
-    def from_image(image):
-        if image is Image.VS_2013:
-            return Generator.VS_2013
-        if image is Image.VS_2015:
-            return Generator.VS_2015
-        if image is Image.VS_2017:
-            return Generator.VS_2017
-        if image is Image.VS_2019:
-            return Generator.VS_2019
-        raise RuntimeError(f"don't know which generator to use for image: {image}")
-
-
-def _env(name):
-    if name not in os.environ:
-        raise RuntimeError(f'undefined environment variable: {name}')
-    return os.environ[name]
-
-
-def _check_appveyor():
-    if 'APPVEYOR' not in os.environ:
-        raise RuntimeError('not running on AppVeyor')
-
-
-def _get_src_dir():
-    return _env('APPVEYOR_BUILD_FOLDER')
-
-
-def _get_build_dir():
-    return R'C:\Projects\build'
-
-
-def _get_generator():
-    image = Image.parse(_env('APPVEYOR_BUILD_WORKER_IMAGE'))
-    return Generator.from_image(image)
-
-
-def _get_platform():
-    return Platform.parse(_env('PLATFORM'))
-
-
-def _get_configuration():
-    return Configuration.parse(_env('CONFIGURATION'))
-
-
-def _parse_args(argv=None):
-    if argv is None:
-        argv = sys.argv[1:]
-    logging.info('Command line arguments: %s', argv)
-
-    parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-
-    parser.add_argument('--install', metavar='DIR', dest='install_dir',
-                        help='install directory')
-    parser.add_argument('--boost', metavar='DIR', dest='boost_dir',
-                        help='set Boost directory path')
-    parser.add_argument('cmake_args', nargs='*', metavar='CMAKE_ARG', default=[],
-                        help='additional CMake arguments, to be passed verbatim')
-    return parser.parse_args(argv)
-
-
-def build_appveyor(argv=None):
-    args = _parse_args(argv)
-    _check_appveyor()
-
-    cmake_args = ['-G', str(_get_generator())]
-    cmake_args += args.cmake_args
-
-    params = BuildParameters(_get_src_dir(),
-                             build_dir=_get_build_dir(),
-                             install_dir=args.install_dir,
-                             platform=_get_platform(),
-                             configuration=_get_configuration(),
-                             boost_dir=args.boost_dir,
-                             cmake_args=cmake_args)
-    build(params)
-
-
 def main(argv=None):
     with setup_logging():
-        build_appveyor(argv)
+        build_ci(AppVeyor(), argv)
 
 
 if __name__ == '__main__':