Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kracken256
Kracken256 committed Aug 15, 2024
1 parent a67ccd4 commit c5b591a
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 33 deletions.
4 changes: 1 addition & 3 deletions env/Debug.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ RUN echo "cmake -S /app -B /app/build/debug -DCMAKE_BUILD_TYPE=Debug" >> /opt/bu
RUN echo "cmake --build /app/build/debug -j`nproc`" >> /opt/build.sh
RUN echo "mkdir -p /app/bin" >> /opt/build.sh
RUN echo "rm -rf /app/bin/*" >> /opt/build.sh
RUN echo "cp /app/build/debug/*/*.so /app/bin/" >> /opt/build.sh
# RUN echo "cp /app/build/debug/qcc/qcc /app/bin/qcc" >> /opt/build.sh
# RUN echo "cp /app/build/debug/qld/qld /app/bin/qld" >> /opt/build.sh
RUN echo "cp /app/build/debug/*/*.a /app/bin/" >> /opt/build.sh
RUN echo "cp /app/build/debug/qpkg/qpkg /app/bin/qpkg" >> /opt/build.sh
RUN echo "chmod -R 777 /app/bin/" >> /opt/build.sh
RUN chmod +x /opt/build.sh
Expand Down
4 changes: 1 addition & 3 deletions env/Release.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ RUN echo "cmake -S /app -B /app/build/release -DCMAKE_BUILD_TYPE=Release" >> /op
RUN echo "cmake --build /app/build/release -j`nproc`" >> /opt/build.sh
RUN echo "mkdir -p /app/bin" >> /opt/build.sh
RUN echo "rm -rf /app/bin/*" >> /opt/build.sh
RUN echo "cp /app/build/release/*/*.so /app/bin/" >> /opt/build.sh
# RUN echo "cp /app/build/release/qcc/qcc /app/bin/qcc" >> /opt/build.sh
# RUN echo "cp /app/build/release/qld/qld /app/bin/qld" >> /opt/build.sh
RUN echo "cp /app/build/release/*/*.a /app/bin/" >> /opt/build.sh
RUN echo "cp /app/build/release/qpkg/qpkg /app/bin/qpkg" >> /opt/build.sh
RUN echo "chmod -R 777 /app/bin/" >> /opt/build.sh
RUN chmod +x /opt/build.sh
Expand Down
10 changes: 5 additions & 5 deletions libquix-core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

#================== SET BUILD FLAGS ==================
SET(BUILD_FLAGS_COMMON -g -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments -Wno-mismatched-tags)
SET(BUILD_FLAGS_COMMON -g -fPIC -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments -Wno-mismatched-tags)
SET(PROJECT_RELEASE_FLAGS ${BUILD_FLAGS_COMMON} -O3 -DNDEBUG -DQCORE_ID=${QCORE_ID})
SET(PROJECT_DEBUG_FLAGS ${BUILD_FLAGS_COMMON} -O0 -fsanitize=address -fsanitize=undefined -Wno-error=unused-variable -Wno-unused-parameter -DQCORE_ID="undefined")

Expand All @@ -26,14 +26,14 @@ file(GLOB_RECURSE CXX_SOURCES "src/*.cc")

#================== CREATE BUILD ==================
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
#================== CREATE SHAREDLIB DEBUG BUILD ==================
add_library(quix-core SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB DEBUG BUILD ==================
add_library(quix-core STATIC ${CXX_SOURCES})
target_include_directories(quix-core PUBLIC src include)
target_compile_options(quix-core PRIVATE ${PROJECT_DEBUG_FLAGS})
target_link_libraries(quix-core PRIVATE )
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
#================== CREATE SHAREDLIB RELEASE BUILD ================
add_library(quix-core SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB RELEASE BUILD ================
add_library(quix-core STATIC ${CXX_SOURCES})
target_include_directories(quix-core PUBLIC src include)
target_compile_options(quix-core PRIVATE ${PROJECT_RELEASE_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -flto)
target_link_options(quix-core PRIVATE -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/symexport.map -flto)
Expand Down
Empty file removed libquix-delta/.gitkeep
View file
Empty file.
10 changes: 5 additions & 5 deletions libquix-lexer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

#================== SET BUILD FLAGS ==================
SET(BUILD_FLAGS_COMMON -g -Wall -Wextra -pedantic -Werror -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments)
SET(BUILD_FLAGS_COMMON -g -fPIC -Wall -Wextra -pedantic -Werror -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments)
SET(PROJECT_RELEASE_FLAGS ${BUILD_FLAGS_COMMON} -O3 -DNDEBUG -DQLEX_ID=${QLEX_ID})
SET(PROJECT_DEBUG_FLAGS ${BUILD_FLAGS_COMMON} -O0 -fsanitize=fuzzer -fsanitize=address -fsanitize=undefined -Wno-error=unused-variable -Wno-error=unused-function -Wno-unused-parameter -DQLEX_ID="undefined")

Expand All @@ -33,8 +33,8 @@ file(GLOB_RECURSE CXX_SOURCES "src/*.cc")

#================== CREATE BUILD ==================
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
#================== CREATE SHAREDLIB DEBUG BUILD ==================
add_library(quix-lexer SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB DEBUG BUILD ==================
add_library(quix-lexer STATIC ${CXX_SOURCES})
target_include_directories(quix-lexer PUBLIC src include ${CMAKE_SOURCE_DIR}/libquix-core/include)
target_compile_options(quix-lexer PRIVATE ${PROJECT_DEBUG_FLAGS})
target_link_libraries(quix-lexer PRIVATE quix-core)
Expand All @@ -44,8 +44,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_subdirectory(tests)
add_subdirectory(fuzzer)
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
#================== CREATE SHAREDLIB RELEASE BUILD ================
add_library(quix-lexer SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB RELEASE BUILD ================
add_library(quix-lexer STATIC ${CXX_SOURCES})
target_include_directories(quix-lexer PUBLIC src include ${CMAKE_SOURCE_DIR}/libquix-core/include)
target_compile_options(quix-lexer PRIVATE ${PROJECT_RELEASE_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -flto)
target_link_options(quix-lexer PRIVATE -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/symexport.map -flto)
Expand Down
Empty file removed libquix-llvm/.gitkeep
View file
Empty file.
Empty file removed libquix-optimizer/.gitkeep
View file
Empty file.
10 changes: 5 additions & 5 deletions libquix-parser/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

#================== SET BUILD FLAGS ==================
SET(BUILD_FLAGS_COMMON -g -Wall -Wextra -pedantic -Werror -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments)
SET(BUILD_FLAGS_COMMON -g -fPIC -Wall -Wextra -pedantic -Werror -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments)
SET(PROJECT_RELEASE_FLAGS ${BUILD_FLAGS_COMMON} -O3 -DNDEBUG -DQPARSE_ID=${QPARSE_ID})
SET(PROJECT_DEBUG_FLAGS ${BUILD_FLAGS_COMMON} -O0 -fsanitize=fuzzer -fsanitize=address -fsanitize=undefined -Wno-error=unused-variable -Wno-error=unused-function -Wno-unused-parameter -DQPARSE_ID="undefined")

Expand All @@ -32,8 +32,8 @@ file(GLOB_RECURSE CXX_SOURCES "src/*.cc")

#================== CREATE BUILD ==================
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
#================== CREATE SHAREDLIB DEBUG BUILD ==================
add_library(quix-parser SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB DEBUG BUILD ==================
add_library(quix-parser STATIC ${CXX_SOURCES})
target_include_directories(quix-parser PUBLIC src include
${CMAKE_SOURCE_DIR}/libquix-core/include
${CMAKE_SOURCE_DIR}/libquix-lexer/include)
Expand All @@ -45,8 +45,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_subdirectory(tests)
add_subdirectory(fuzzer)
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
#================== CREATE SHAREDLIB RELEASE BUILD ================
add_library(quix-parser SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB RELEASE BUILD ================
add_library(quix-parser STATIC ${CXX_SOURCES})
target_include_directories(quix-parser PUBLIC src include
${CMAKE_SOURCE_DIR}/libquix-core/include
${CMAKE_SOURCE_DIR}/libquix-lexer/include)
Expand Down
Empty file removed libquix-prep/.gitkeep
View file
Empty file.
8 changes: 4 additions & 4 deletions libquix-qxir/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ file(GLOB_RECURSE CXX_SOURCES "src/*.cc")

#================== CREATE BUILD ==================
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
#================== CREATE SHAREDLIB DEBUG BUILD ==================
add_library(quix-qxir SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB DEBUG BUILD ==================
add_library(quix-qxir STATIC ${CXX_SOURCES})
target_include_directories(quix-qxir PUBLIC src include
${CMAKE_SOURCE_DIR}/libquix-core/include
${CMAKE_SOURCE_DIR}/libquix-lexer/include
Expand All @@ -46,8 +46,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_subdirectory(tests)
add_subdirectory(fuzzer)
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
#================== CREATE SHAREDLIB RELEASE BUILD ================
add_library(quix-qxir SHARED ${CXX_SOURCES})
#================== CREATE STATICLIB RELEASE BUILD ================
add_library(quix-qxir STATIC ${CXX_SOURCES})
target_include_directories(quix-qxir PUBLIC src include
${CMAKE_SOURCE_DIR}/libquix-core/include
${CMAKE_SOURCE_DIR}/libquix-lexer/include
Expand Down
2 changes: 1 addition & 1 deletion libquix-qxir/include/quix-qxir/Node.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ namespace qxir {

template <typename T>
constexpr T *getType() {
/// TODO: Optimize this.
/// TODO: Optimize this via deduplication.

if constexpr (std::is_same_v<T, U1Ty>) {
return new (Arena<U1Ty>().allocate(1)) U1Ty();
Expand Down
14 changes: 7 additions & 7 deletions qpkg/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)


#================== CALCULATE BUILD ID ==================
execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -type f -name "*.*" -exec sha256sum {} \; COMMAND sha256sum
OUTPUT_VARIABLE SHA256SUMS OUTPUT_STRIP_TRAILING_WHITESPACE)
Expand All @@ -19,16 +18,17 @@ file(GLOB_RECURSE QPKG_CXX_SOURCES "src/*.cc")

add_executable(qpkg ${QPKG_CXX_SOURCES})
target_include_directories(qpkg PRIVATE src )
target_compile_options(qpkg PRIVATE -Werror -O3 -g -Wall -Wextra -Wpedantic -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments -Wno-error=overlength-strings -Wno-predefined-identifier-outside-function)
target_compile_options(qpkg PRIVATE -Werror -O3 -g -fPIC -Wall -Wextra -Wpedantic -Wno-mismatched-tags -Wno-gnu-zero-variadic-macro-arguments -Wno-error=overlength-strings -Wno-predefined-identifier-outside-function)

if (CMAKE_BUILD_TYPE STREQUAL "Release")
target_compile_options(qpkg PRIVATE -DQPKG_ID=${QPKG_ID} -flto)
target_link_libraries(qpkg PRIVATE yaml-cpp boost_filesystem quix-qxir quix-parser quix-lexer quix-core)
target_link_options(qpkg PRIVATE -flto)
target_compile_options(qpkg PRIVATE -DQPKG_ID=${QPKG_ID} -flto)
target_link_libraries(qpkg PRIVATE libyaml-cpp.a libboost_filesystem.a quix-qxir quix-parser quix-lexer quix-core)
target_link_options(qpkg PRIVATE -flto -static-libgcc -static-libstdc++)
add_dependencies(qpkg quix-parser quix-lexer quix-core quix-qxir)
else()
target_compile_options(qpkg PRIVATE -DQPKG_ID="undefined")
target_link_libraries(qpkg PRIVATE yaml-cpp boost_filesystem quix-qxir quix-parser quix-lexer quix-core -fsanitize=address -fsanitize=undefined )
target_compile_options(qpkg PRIVATE -DQPKG_ID="undefined")
target_link_libraries(qpkg PRIVATE libyaml-cpp.a libboost_filesystem.a quix-qxir quix-parser quix-lexer quix-core -fsanitize=address -fsanitize=undefined)
target_link_options(qpkg PRIVATE -static-libgcc -static-libstdc++)
add_dependencies(qpkg quix-parser quix-lexer quix-core quix-qxir)
endif()

Expand Down

0 comments on commit c5b591a

Please sign in to comment.