Merge pull request #6 from BlackMATov/dev

Dev
2025-12-13 06:59:45 +07:00 · 2020-03-03 01:28:23 +07:00
parent 3909b3b1ab b370676765
commit 23b7c9fa2e
17 changed files with 30 additions and 52 deletions
--- a/.clang_complete
+++ b/.clang_complete
@@ -1,4 +0,0 @@
-Iheaders
-
-std=c++17
-stdlib=libc++
--- 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
--- 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
--- a/scripts/build_clear.bat
+++ 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%
--- a/scripts/build_clear.sh
+++ b/scripts/build_clear.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
+rm -rf $BUILD_DIR
--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- a/scripts/gen_msvc2017_project.bat
+++ b/scripts/gen_msvc2017_project.bat
@@ -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%
--- a/scripts/gen_msvc2019_project.bat
+++ b/scripts/gen_msvc2019_project.bat
@@ -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%
--- a/scripts/gen_xcode_project.sh
+++ b/scripts/gen_xcode_project.sh
@@ -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
--- 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
--- 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
--- 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