From 925d4bfae9567647eb70b1cd204d9ded3511b9eb Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 19 Sep 2024 02:01:28 -0400 Subject: [PATCH] push --- .gitignore | 6 +++ .gitmodules | 3 ++ .idea/.gitignore | 8 +++ .idea/COSC-4P80-Assignment-1.iml | 2 + .idea/misc.xml | 7 +++ .idea/modules.xml | 8 +++ .idea/vcs.xml | 8 +++ CMakeLists.txt | 35 +++++++++++++ commit.py | 86 ++++++++++++++++++++++++++++++++ lib/blt | 1 + src/main.cpp | 6 +++ 11 files changed, 170 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 .idea/.gitignore create mode 100644 .idea/COSC-4P80-Assignment-1.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 CMakeLists.txt create mode 100755 commit.py create mode 160000 lib/blt create mode 100644 src/main.cpp diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0ad02d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +cmake-build*/ +build/ +out/ +./cmake-build*/ +./build/ +./out/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..484b3a7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lib/blt"] + path = lib/blt + url = https://github.com/Tri11Paragon/BLT.git diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/COSC-4P80-Assignment-1.iml b/.idea/COSC-4P80-Assignment-1.iml new file mode 100644 index 0000000..f08604b --- /dev/null +++ b/.idea/COSC-4P80-Assignment-1.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0b76fe5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..fa978fc --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..0a294a1 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..f9d83f1 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.25) +project(COSC-4P80-Assignment-1 VERSION 0.0.2) + +option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) +option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) +option(ENABLE_TSAN "Enable the thread data race sanitizer" OFF) + +set(CMAKE_CXX_STANDARD 17) + +add_subdirectory(lib/blt) + +include_directories(include/) +file(GLOB_RECURSE PROJECT_BUILD_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + +add_executable(COSC-4P80-Assignment-1 ${PROJECT_BUILD_FILES}) + +target_compile_options(COSC-4P80-Assignment-1 PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment) +target_link_options(COSC-4P80-Assignment-1 PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment) + +target_link_libraries(COSC-4P80-Assignment-1 PRIVATE BLT) + +if (${ENABLE_ADDRSAN} MATCHES ON) + target_compile_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=address) + target_link_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=address) +endif () + +if (${ENABLE_UBSAN} MATCHES ON) + target_compile_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=undefined) + target_link_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=undefined) +endif () + +if (${ENABLE_TSAN} MATCHES ON) + target_compile_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=thread) + target_link_options(COSC-4P80-Assignment-1 PRIVATE -fsanitize=thread) +endif () diff --git a/commit.py b/commit.py new file mode 100755 index 0000000..b39f82d --- /dev/null +++ b/commit.py @@ -0,0 +1,86 @@ +#!/usr/bin/python3 + +import subprocess + +#--------------------------------------- +# CONFIG +#--------------------------------------- + +VERSION_BEGIN_STR = " VERSION " +VERSION_END_STR = ")" +PATCH_LIMIT = 100000 + +#--------------------------------------- +# DO NOT TOUCH +#--------------------------------------- + +def load_cmake(): + cmake_file = open("CMakeLists.txt", 'r') + cmake_text = cmake_file.read() + cmake_file.close() + return cmake_text + +def write_cmake(cmake_text): + cmake_file = open("CMakeLists.txt", 'w') + cmake_file.write(cmake_text) + cmake_file.close() + +def get_version(cmake_text): + begin = cmake_text.find(VERSION_BEGIN_STR) + len(VERSION_BEGIN_STR) + end = cmake_text.find(VERSION_END_STR, begin) + return (cmake_text[begin:end], begin, end) + +def split_version(cmake_text): + version, begin, end = get_version(cmake_text) + version_parts = version.split('.') + return (version_parts, begin, end) + +def recombine(cmake_text, version_parts, begin, end): + constructed_version = version_parts[0] + '.' + version_parts[1] + '.' + version_parts[2] + constructed_text_begin = cmake_text[0:begin] + constrcuted_text_end = cmake_text[end::] + return constructed_text_begin + constructed_version + constrcuted_text_end + + +def inc_major(cmake_text): + version_parts, begin, end = split_version(cmake_text) + version_parts[0] = str(int(version_parts[0]) + 1) + version_parts[1] = '0' + version_parts[2] = '0' + return recombine(cmake_text, version_parts, begin, end) + +def inc_minor(cmake_text): + version_parts, begin, end = split_version(cmake_text) + version_parts[1] = str(int(version_parts[1]) + 1) + version_parts[2] = '0' + return recombine(cmake_text, version_parts, begin, end) + +def inc_patch(cmake_text): + version_parts, begin, end = split_version(cmake_text) + if int(version_parts[2]) + 1 >= PATCH_LIMIT: + return inc_minor(cmake_text) + version_parts[2] = str(int(version_parts[2]) + 1) + return recombine(cmake_text, version_parts, begin, end) + +cmake_text = load_cmake() +cmake_version = get_version(cmake_text)[0] +print(f"Current Version: {cmake_version}") + +try: + type = input("What kind of commit is this ((M)ajor, (m)inor, (p)atch)? ") + + if type.startswith('M'): + print("Selected major") + write_cmake(inc_major(cmake_text)) + elif type.startswith('m'): + print("Selected minor") + write_cmake(inc_minor(cmake_text)) + elif type.startswith('p') or type.startswith('P') or len(type) == 0: + print("Selected patch") + write_cmake(inc_patch(cmake_text)) + + subprocess.call(["git", "add", "*"]) + subprocess.call(["git", "commit"]) + subprocess.call(["sh", "-c", "git remote | xargs -L1 git push --all"]) +except KeyboardInterrupt: + print("\nCancelling!") diff --git a/lib/blt b/lib/blt new file mode 160000 index 0000000..d1aaf4d --- /dev/null +++ b/lib/blt @@ -0,0 +1 @@ +Subproject commit d1aaf4db9468cfafe10cffcaea48ee2908f6b05f diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..6f2b004 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + std::cout << "Hello World!" << std::endl; +}