From ce726c4e580115f88b84555925d08d3d47cc548f Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 15 Feb 2019 07:49:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 + cmake/cmlib | 2 +- cmake/generators | 1 + tools/cmake-generator.sh | 206 --------------------------------------- tools/qtcreator-debug.sh | 8 -- 5 files changed, 5 insertions(+), 215 deletions(-) create mode 160000 cmake/generators delete mode 100755 tools/cmake-generator.sh delete mode 100755 tools/qtcreator-debug.sh diff --git a/.gitmodules b/.gitmodules index 51c0358..8d01ce0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "cmake/cmlib"] path = cmake/cmlib url = ../../f1x1t/cmlib +[submodule "cmake/generators"] + path = cmake/generators + url = ssh://git@gitlab.2/f1x1t/cmake-generators diff --git a/cmake/cmlib b/cmake/cmlib index 8b1bfef..c247c35 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 8b1bfefdb30fc8eccfedd3777290063d0eac2611 +Subproject commit c247c359f98e6cbc176922d8759dadc4f2f770f1 diff --git a/cmake/generators b/cmake/generators new file mode 160000 index 0000000..6c31d9f --- /dev/null +++ b/cmake/generators @@ -0,0 +1 @@ +Subproject commit 6c31d9f67ee65910127b42e3f2ca3b272dbb9ab8 diff --git a/tools/cmake-generator.sh b/tools/cmake-generator.sh deleted file mode 100755 index 263716e..0000000 --- a/tools/cmake-generator.sh +++ /dev/null @@ -1,206 +0,0 @@ -#!/bin/bash - -set -o errexit -o pipefail -o noclobber -o nounset - -# Test if getopt exists -command -v getopt >/dev/null 2>&1 || { echo "can't execute getopt"; exit 1; } - -# Test if getopt works -! getopt --test 2> /dev/null -[[ ${PIPESTATUS[0]} -ne 4 ]] && { exit 2; } - -# List of available options -OPTIONS=g:t:qcfs:b:o: -LONGOPTS=generator:,type:,qtcreator,cmake,force,source-dir:,build-dir:,output-dir: - -# Parse options -! PARSED=$(getopt --options=$OPTIONS --longoptions=$LONGOPTS --name "$0" -- "$@") -[[ ${PIPESTATUS[0]} -ne 0 ]] && exit 3 - -# Read getopt's output to handle the quoting right -eval set -- "$PARSED" - -# Default generator -GENERATOR="Unix Makefiles" - -# Generate single build type -SINGLE_TYPE="n" - -# Generate QtCreator build types -QTCREATOR="n" - -# Generate CMake build types -CMAKE="n" - -# Force destructive actions -FORCE="n" - -# Default source directory is current -SOURCE_DIR="$(dirname $(pwd))" - -# Default build directory is ../build -BUILD_DIR="$(dirname -- "${SOURCE_DIR}/." | sed 's/\(.*\)\/.*/\1\/build/')" - -# Default output directory is ../output -OUTPUT_DIR="$(dirname -- "${SOURCE_DIR}/." | sed 's/\(.*\)\/.*/\1\/output/')" - -while true; do - case "$1" in - -g|--generator) - GENERATOR="$2" - shift 2 - ;; - -t|--type) - SINGLE_TYPE="$2" - shift 2 - ;; - -q|--qtcreator) - QTCREATOR="y" - shift - ;; - -c|--cmake) - CMAKE="y" - shift - ;; - -f|--force) - FORCE="y" - shift - ;; - -s|--source-dir) - SOURCE_DIR="$2" - shift 2 - ;; - -b|--build-dir) - BUILD_DIR="$2" - shift 2 - ;; - -o|--output-dir) - OUTPUT_DIR="$2" - shift 2 - ;; - --) - shift - break - ;; - *) - echo "Programming error" - exit 3 - ;; - esac -done - -CMAKE_ARGS=" " -[ ! -z "${@}" ] && CMAKE_ARGS="${@}" - -[ ! -f "${SOURCE_DIR}/CMakeLists.txt" ] && { echo "Source directory does not contain CMakeLists.txt"; exit 4; } - -if [ -d "${BUILD_DIR}" ]; then - if [ "x${FORCE}" == "xy" ]; then - rm -rf "${BUILD_DIR}" - else - echo "Build directory already exists. Use --force to remove this directory or do it manually" - exit 5 - fi -fi - -if [ "x${SINGLE_TYPE}" != "xn" ]; then - case "${SINGLE_TYPE}" in - None|Debug|Release|Profile|RelWithDebInfo|MinSizeRel) - true - ;; - *) - echo "Wrong CMake build type" - exit 6 - ;; - esac -fi - -export CMAKE -export QTCREATOR -export GENERATOR -export SOURCE_DIR -export BUILD_DIR -export OUTPUT_DIR -export CMAKE_ARGS - -CMAKE_BUILD_TYPES=(None Debug Release RelWithDebInfo MinSizeRel) -QTCREATOR_BUILD_TYPES=(qtNone qtDebug qtRelease qtProfile) - -generate_configuration() { - local BUILD_TYPE="${!#}" - local BUILD="$BUILD_TYPE" - echo $BUILD_TYPE - - if [ "x$QTCREATOR" == "xy" ]; then - case "$BUILD_TYPE" in - qtNone) - BUILD="unknown" - BUILD_TYPE="None" - ;; - qtDebug) - BUILD="debug" - BUILD_TYPE="Debug" - ;; - qtRelease) - BUILD="release" - BUILD_TYPE="Release" - ;; - qtProfile) - BUILD="profile" - BUILD_TYPE="Profile" - ;; - esac - fi - - GEN_DIR="${BUILD_DIR}" - [ "x${SINGLE_TYPE}" == "xn" ] && GEN_DIR="${BUILD_DIR}/${BUILD}" - [ -d "${GEN_DIR}" ] && return 0 - mkdir -p "${GEN_DIR}" - pushd "${GEN_DIR}" 2>/dev/null - cmake -G "${GENERATOR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS} "${SOURCE_DIR}" - if [ "x$GENERATOR" == "xNinja" ]; then - # Generate fake Makefile, so make can run ninja build - cat > Makefile </dev/null -} - -export -f generate_configuration - -BUILD_TYPES="" - -if [ "x$SINGLE_TYPE" != "xn" ]; then - BUILD_TYPES="${SINGLE_TYPE}" -else - [ "x$QTCREATOR" == "xy" ] && BUILD_TYPES+=" ${QTCREATOR_BUILD_TYPES[@]}" - [ "x$CMAKE" == "xy" ] && BUILD_TYPES+=" ${CMAKE_BUILD_TYPES[@]}" -fi - -if [ "x${BUILD_TYPES}" == "x" ]; then - echo "No build type selected." - echo "Use -c for default CMake build types" - echo "Use -q for build types for QtCreator" - echo "Use -t name for build with type 'name'" - exit 0 -fi - -# Try to work in parallel -if [ -x "$(command -v parallel)" ]; then - PV=$(parallel --version | head -n 1 | awk '{ print $3; }') - if [ "$PV" -lt "20131121" ]; then - parallel generate_configuration ::: ${BUILD_TYPES} - elif [ "$PV" -lt "20141023" ]; then - parallel --no-notice generate_configuration ::: ${BUILD_TYPES} - else - parallel --will-cite generate_configuration ::: ${BUILD_TYPES} - fi -else - for T in ${BUILD_TYPES}; do generate_configuration "${T}"; done -fi - diff --git a/tools/qtcreator-debug.sh b/tools/qtcreator-debug.sh deleted file mode 100755 index b1069a7..0000000 --- a/tools/qtcreator-debug.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -GENERATOR=make -[ -x "$(command -v ninja)" ] && GENERATOR=Ninja -PROJECT=$(grep -i "^Project" ../CMakeLists.txt | awk -F'[()]' '{print $2}') - -"$(dirname $0)/cmake-generator.sh" -g "${GENERATOR}" -f -b "${HOME}/opt/${PROJECT}" -t Debug -- -DINSTALL_TO_OPT=ON -