From b3706767659990e333b7d06eb9b7d998f4cebbc1 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Tue, 3 Mar 2020 00:46:15 +0700 Subject: [PATCH] =?UTF-8?q?Happy=20New=20Year=20=F0=9F=A5=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .clang_complete | 4 ---- LICENSE.md | 2 +- headers/enum.hpp/enum.hpp | 2 +- scripts/build_clear.bat | 9 +++++++++ scripts/build_clear.sh | 4 ++++ scripts/build_debug.sh | 4 ++-- scripts/build_debug_x64.bat | 4 ++-- scripts/build_debug_x86.bat | 4 ++-- scripts/build_release.sh | 4 ++-- scripts/build_release_x64.bat | 4 ++-- scripts/build_release_x86.bat | 4 ++-- scripts/gen_msvc2017_project.bat | 12 ------------ scripts/gen_msvc2019_project.bat | 12 ------------ scripts/gen_xcode_project.sh | 7 ------- untests/catch_main.cpp | 2 +- untests/enum_examples.cpp | 2 +- untests/enum_tests.cpp | 2 +- 17 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 .clang_complete create mode 100644 scripts/build_clear.bat create mode 100755 scripts/build_clear.sh delete mode 100644 scripts/gen_msvc2017_project.bat delete mode 100644 scripts/gen_msvc2019_project.bat delete mode 100755 scripts/gen_xcode_project.sh diff --git a/.clang_complete b/.clang_complete deleted file mode 100644 index 93d2b49..0000000 --- a/.clang_complete +++ /dev/null @@ -1,4 +0,0 @@ --Iheaders - --std=c++17 --stdlib=libc++ diff --git a/LICENSE.md b/LICENSE.md index 8435d4c..d096137 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2019, by Matvey Cherevko (blackmatov@gmail.com) +Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/headers/enum.hpp/enum.hpp b/headers/enum.hpp/enum.hpp index 96ff486..d9cd08e 100644 --- a/headers/enum.hpp/enum.hpp +++ b/headers/enum.hpp/enum.hpp @@ -1,7 +1,7 @@ /******************************************************************************* * This file is part of the "https://github.com/blackmatov/enum.hpp" * For conditions of distribution and use, see copyright notice in LICENSE.md - * Copyright (C) 2019, by Matvey Cherevko (blackmatov@gmail.com) + * Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com) ******************************************************************************/ #pragma once diff --git a/scripts/build_clear.bat b/scripts/build_clear.bat new file mode 100644 index 0000000..44375fb --- /dev/null +++ b/scripts/build_clear.bat @@ -0,0 +1,9 @@ +@echo off +set BUILD_DIR=%~dp0%\..\build +rmdir /s /q %BUILD_DIR% || goto :error + +goto :EOF + +:error +echo Failed with error #%errorlevel%. +exit /b %errorlevel% diff --git a/scripts/build_clear.sh b/scripts/build_clear.sh new file mode 100755 index 0000000..ef8a2e3 --- /dev/null +++ b/scripts/build_clear.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -e +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +rm -rf $BUILD_DIR diff --git a/scripts/build_debug.sh b/scripts/build_debug.sh index 97018eb..a069095 100755 --- a/scripts/build_debug.sh +++ b/scripts/build_debug.sh @@ -2,8 +2,8 @@ set -e BUILD_DIR=`dirname "$BASH_SOURCE"`/../build mkdir -p $BUILD_DIR/Debug -cd $BUILD_DIR/Debug +pushd $BUILD_DIR/Debug cmake -DCMAKE_BUILD_TYPE=Debug ../.. cmake --build . ctest --verbose -cd ../.. +popd diff --git a/scripts/build_debug_x64.bat b/scripts/build_debug_x64.bat index 675bd2a..f80c2f3 100644 --- a/scripts/build_debug_x64.bat +++ b/scripts/build_debug_x64.bat @@ -1,11 +1,11 @@ @echo off set BUILD_DIR=%~dp0%\..\build mkdir %BUILD_DIR%\Debug\x64 || goto :error -cd %BUILD_DIR%\Debug\x64 || goto :error +pushd %BUILD_DIR%\Debug\x64 || goto :error cmake ..\..\.. -A x64 || goto :error cmake --build . --config Debug || goto :error ctest --verbose || goto :error -cd ..\..\.. || goto :error +popd || goto :error goto :EOF diff --git a/scripts/build_debug_x86.bat b/scripts/build_debug_x86.bat index b6dcd6d..ee05129 100644 --- a/scripts/build_debug_x86.bat +++ b/scripts/build_debug_x86.bat @@ -1,11 +1,11 @@ @echo off set BUILD_DIR=%~dp0%\..\build mkdir %BUILD_DIR%\Debug\x86 || goto :error -cd %BUILD_DIR%\Debug\x86 || goto :error +pushd %BUILD_DIR%\Debug\x86 || goto :error cmake ..\..\.. -A Win32 || goto :error cmake --build . --config Debug || goto :error ctest --verbose || goto :error -cd ..\..\.. || goto :error +popd || goto :error goto :EOF diff --git a/scripts/build_release.sh b/scripts/build_release.sh index 3a2c5c1..1377504 100755 --- a/scripts/build_release.sh +++ b/scripts/build_release.sh @@ -2,8 +2,8 @@ set -e BUILD_DIR=`dirname "$BASH_SOURCE"`/../build mkdir -p $BUILD_DIR/Release -cd $BUILD_DIR/Release +pushd $BUILD_DIR/Release cmake -DCMAKE_BUILD_TYPE=Release ../.. cmake --build . ctest --verbose -cd ../.. +popd diff --git a/scripts/build_release_x64.bat b/scripts/build_release_x64.bat index 064e867..65e251e 100644 --- a/scripts/build_release_x64.bat +++ b/scripts/build_release_x64.bat @@ -1,11 +1,11 @@ @echo off set BUILD_DIR=%~dp0%\..\build mkdir %BUILD_DIR%\Release\x64 || goto :error -cd %BUILD_DIR%\Release\x64 || goto :error +pushd %BUILD_DIR%\Release\x64 || goto :error cmake ..\..\.. -A x64 || goto :error cmake --build . --config Release || goto :error ctest --verbose || goto :error -cd ..\..\.. || goto :error +popd || goto :error goto :EOF diff --git a/scripts/build_release_x86.bat b/scripts/build_release_x86.bat index 09aa042..1be857b 100644 --- a/scripts/build_release_x86.bat +++ b/scripts/build_release_x86.bat @@ -1,11 +1,11 @@ @echo off set BUILD_DIR=%~dp0%\..\build mkdir %BUILD_DIR%\Release\x86 || goto :error -cd %BUILD_DIR%\Release\x86 || goto :error +pushd %BUILD_DIR%\Release\x86 || goto :error cmake ..\..\.. -A Win32 || goto :error cmake --build . --config Release || goto :error ctest --verbose || goto :error -cd ..\..\.. || goto :error +popd || goto :error goto :EOF diff --git a/scripts/gen_msvc2017_project.bat b/scripts/gen_msvc2017_project.bat deleted file mode 100644 index 85015d6..0000000 --- a/scripts/gen_msvc2017_project.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -mkdir %BUILD_DIR%\msvc2017 || goto :error -cd %BUILD_DIR%\msvc2017 || goto :error -cmake -G "Visual Studio 15 2017" ..\.. || goto :error -start enum.hpp.sln || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/gen_msvc2019_project.bat b/scripts/gen_msvc2019_project.bat deleted file mode 100644 index 00ab28e..0000000 --- a/scripts/gen_msvc2019_project.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -mkdir %BUILD_DIR%\msvc2019 || goto :error -cd %BUILD_DIR%\msvc2019 || goto :error -cmake -G "Visual Studio 16 2019" ..\.. || goto :error -start enum.hpp.sln || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/gen_xcode_project.sh b/scripts/gen_xcode_project.sh deleted file mode 100755 index 614287d..0000000 --- a/scripts/gen_xcode_project.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build -mkdir -p $BUILD_DIR/xcode -cd $BUILD_DIR/xcode -cmake -G Xcode ../.. -open enum.hpp.xcodeproj diff --git a/untests/catch_main.cpp b/untests/catch_main.cpp index 4d76141..8538b37 100644 --- a/untests/catch_main.cpp +++ b/untests/catch_main.cpp @@ -1,7 +1,7 @@ /******************************************************************************* * This file is part of the "https://github.com/blackmatov/enum.hpp" * For conditions of distribution and use, see copyright notice in LICENSE.md - * Copyright (C) 2019 Matvey Cherevko + * Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com) ******************************************************************************/ #define CATCH_CONFIG_MAIN diff --git a/untests/enum_examples.cpp b/untests/enum_examples.cpp index e49598d..602d5e0 100644 --- a/untests/enum_examples.cpp +++ b/untests/enum_examples.cpp @@ -1,7 +1,7 @@ /******************************************************************************* * This file is part of the "https://github.com/blackmatov/enum.hpp" * For conditions of distribution and use, see copyright notice in LICENSE.md - * Copyright (C) 2019, by Matvey Cherevko (blackmatov@gmail.com) + * Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com) ******************************************************************************/ #define CATCH_CONFIG_FAST_COMPILE diff --git a/untests/enum_tests.cpp b/untests/enum_tests.cpp index bd67a75..e739a97 100644 --- a/untests/enum_tests.cpp +++ b/untests/enum_tests.cpp @@ -1,7 +1,7 @@ /******************************************************************************* * This file is part of the "https://github.com/blackmatov/enum.hpp" * For conditions of distribution and use, see copyright notice in LICENSE.md - * Copyright (C) 2019, by Matvey Cherevko (blackmatov@gmail.com) + * Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com) ******************************************************************************/ #define CATCH_CONFIG_FAST_COMPILE