From 4d715e391b47d9b9e075539948cc9e493e3ad7fa Mon Sep 17 00:00:00 2001 From: sorgom <110917257+sorgom@users.noreply.github.com> Date: Sat, 22 Mar 2025 17:26:50 +0100 Subject: [PATCH 1/5] mainly precommit --- .gitHooks/pre-commit | 23 +++++++---------------- submodules/sompy | 2 +- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitHooks/pre-commit b/.gitHooks/pre-commit index 7b4cef7..c31472e 100644 --- a/.gitHooks/pre-commit +++ b/.gitHooks/pre-commit @@ -4,7 +4,7 @@ # availabilty of python py=$(which py || which python || which python3) if [[ -z $py ]] -then +then echo "No python found" exit 0 fi @@ -15,22 +15,13 @@ cd $(git rev-parse --show-toplevel) # path to sompy python scripts sompy=$(pwd)/submodules/sompy/somutil -# files regarded as text files to be cleaned -txts= -# extensions of text files sorted by likeliness -xtxt="h cpp cmd py md lua" +all=() for file in $(git diff-index --cached --name-only HEAD); do - if [[ -f $file ]] - then - for ext in $xtxt; do - if [[ $file == *.$ext ]]; then txts="$txts $file"; break; fi - done - fi + if [ -f $file ]; then all+=($file); fi done -if [[ -n $txts ]]; then - echo cleaning text files - $py $sompy/cleanTxt.py -l $txts -fi -for file in $txts; do git add $file; done +echo all: ${#all[@]} +$py $sompy/cleanTxt.py -l ${all[@]} + +for file in ${all[@]}; do git add $file; done diff --git a/submodules/sompy b/submodules/sompy index c39bb1c..1a06326 160000 --- a/submodules/sompy +++ b/submodules/sompy @@ -1 +1 @@ -Subproject commit c39bb1ce3e0692d04551ebf7675c209ce36bc1a2 +Subproject commit 1a06326c14a955467a1c4682cdab12d131c71626 From dd768e244d53a9f7ed935f14cc16c21cef9bc375 Mon Sep 17 00:00:00 2001 From: sorgom <110917257+sorgom@users.noreply.github.com> Date: Sun, 23 Mar 2025 13:12:32 +0100 Subject: [PATCH 2/5] precommit --- .gitHooks/pre-commit | 10 +++++----- submodules/sompy | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitHooks/pre-commit b/.gitHooks/pre-commit index c31472e..34bcd61 100644 --- a/.gitHooks/pre-commit +++ b/.gitHooks/pre-commit @@ -15,13 +15,13 @@ cd $(git rev-parse --show-toplevel) # path to sompy python scripts sompy=$(pwd)/submodules/sompy/somutil -all=() +txts=() for file in $(git diff-index --cached --name-only HEAD); do - if [ -f $file ]; then all+=($file); fi + if [ -f $file ]; then txts+=($file); fi done -echo all: ${#all[@]} -$py $sompy/cleanTxt.py -l ${all[@]} +echo txt: ${#txts[@]} +done=$($py $sompy/cleanTxt.py -le ${txts[@]}) -for file in ${all[@]}; do git add $file; done +for file in $done; do git add $file; done diff --git a/submodules/sompy b/submodules/sompy index 1a06326..167252f 160000 --- a/submodules/sompy +++ b/submodules/sompy @@ -1 +1 @@ -Subproject commit 1a06326c14a955467a1c4682cdab12d131c71626 +Subproject commit 167252f6c3a8d2a2d2af9f5daa77ebd47ebfa3d0 From 38afbfc964a6473b56d20339799b77a972fd43e6 Mon Sep 17 00:00:00 2001 From: sorgom <110917257+sorgom@users.noreply.github.com> Date: Sun, 23 Mar 2025 13:32:15 +0100 Subject: [PATCH 3/5] precommit; premake --- .gitignore | 4 +- make/Makefile | 40 ++++++++++---------- make/README.md | 9 +++-- make/covbr2html.make | 87 ++++++++++++++++++++++++-------------------- make/premake5.lua | 6 +-- 5 files changed, 78 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 5e93954..d42fcb6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,15 +8,15 @@ tmp/ stuff *.cov *.html +vs # temporary ignored -# Makefile -# *.make *.sln *.vcxproj *.vcxproj.* .vs .vscode +.obsidian # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/make/Makefile b/make/Makefile index 42e5b55..02867c6 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,4 +1,4 @@ -# Alternative GNU Make workspace makefile autogenerated by Premake +# GNU Make workspace makefile autogenerated by Premake ifndef config config=ci @@ -29,32 +29,32 @@ endif PROJECTS := covbr2html -.PHONY: all clean help $(PROJECTS) +.PHONY: all clean help $(PROJECTS) all: $(PROJECTS) covbr2html: ifneq (,$(covbr2html_config)) - @echo "==== Building covbr2html ($(covbr2html_config)) ====" - @${MAKE} --no-print-directory -C . -f covbr2html.make config=$(covbr2html_config) + @echo "==== Building covbr2html ($(covbr2html_config)) ====" + @${MAKE} --no-print-directory -C . -f covbr2html.make config=$(covbr2html_config) endif clean: - @${MAKE} --no-print-directory -C . -f covbr2html.make clean + @${MAKE} --no-print-directory -C . -f covbr2html.make clean help: - @echo "Usage: make [config=name] [target]" - @echo "" - @echo "CONFIGURATIONS:" - @echo " ci" - @echo " trace_on" - @echo " trace_all" - @echo " glob_linux" - @echo " glob_linux_trace_all" - @echo "" - @echo "TARGETS:" - @echo " all (default)" - @echo " clean" - @echo " covbr2html" - @echo "" - @echo "For more information, see https://github.com/premake/premake-core/wiki" \ No newline at end of file + @echo "Usage: make [config=name] [target]" + @echo "" + @echo "CONFIGURATIONS:" + @echo " ci" + @echo " trace_on" + @echo " trace_all" + @echo " glob_linux" + @echo " glob_linux_trace_all" + @echo "" + @echo "TARGETS:" + @echo " all (default)" + @echo " clean" + @echo " covbr2html" + @echo "" + @echo "For more information, see https://github.com/premake/premake-core/wiki" diff --git a/make/README.md b/make/README.md index bd4a809..bfa8a3e 100644 --- a/make/README.md +++ b/make/README.md @@ -6,7 +6,7 @@ covbr2html/make$> make -j ```` - find binary in build folder ````shell -covbr2html/make$> cd ../build +covbr2html/make$> cd ../build/linux covbr2html/build$> ls ```` @@ -20,10 +20,11 @@ covbr2html\make> premake5 vsNNNN ```` ### build ````shell -covbr2html\make> msbuild -m covbr2html.sln +covbr2html\make> cd ../vs +covbr2html\vs> msbuild -m covbr2html.sln ```` - find binary in build folder ````shell -covbr2html\make> cd ../build -covbr2html\build> dir /B *.exe +covbr2html\vs> cd ../build/windows +covbr2html\build\windows> dir /B *.exe ```` diff --git a/make/covbr2html.make b/make/covbr2html.make index 43383e7..b381400 100644 --- a/make/covbr2html.make +++ b/make/covbr2html.make @@ -1,4 +1,4 @@ -# Alternative GNU Make project makefile autogenerated by Premake +# GNU Make project makefile autogenerated by Premake ifndef config config=ci @@ -12,14 +12,23 @@ endif SHELLTYPE := posix ifeq ($(shell echo "test"), "test") - SHELLTYPE := msdos + SHELLTYPE := msdos endif # Configurations # ############################################# +ifeq ($(origin CC), default) + CC = gcc +endif +ifeq ($(origin CXX), default) + CXX = g++ +endif +ifeq ($(origin AR), default) + AR = ar +endif RESCOMP = windres -TARGETDIR = ../build +TARGETDIR = ../build/linux TARGET = $(TARGETDIR)/covbr2html INCLUDES += -I../code -I../submodules/somcpp/include FORCE_INCLUDE += @@ -87,55 +96,55 @@ OBJECTS += $(OBJDIR)/main.o # ############################################# all: $(TARGET) - @: + @: $(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR) - $(PRELINKCMDS) - @echo Linking covbr2html - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) + $(PRELINKCMDS) + @echo Linking covbr2html + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) $(TARGETDIR): - @echo Creating $(TARGETDIR) + @echo Creating $(TARGETDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) + $(SILENT) mkdir -p $(TARGETDIR) else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) + $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) endif $(OBJDIR): - @echo Creating $(OBJDIR) + @echo Creating $(OBJDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) + $(SILENT) mkdir -p $(OBJDIR) else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) + $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) endif clean: - @echo Cleaning covbr2html + @echo Cleaning covbr2html ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(GENERATED) - $(SILENT) rm -rf $(OBJDIR) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(GENERATED) + $(SILENT) rm -rf $(OBJDIR) else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) endif prebuild: | $(OBJDIR) - $(PREBUILDCMDS) + $(PREBUILDCMDS) ifneq (,$(PCH)) $(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER) $(GCH): $(PCH) | prebuild - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" + @echo $(notdir $<) + $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" $(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) touch "$@" + $(SILENT) touch "$@" else - $(SILENT) echo $null >> "$@" + $(SILENT) echo $null >> "$@" endif else $(OBJECTS): | prebuild @@ -146,25 +155,25 @@ endif # ############################################# $(OBJDIR)/Covbr2Html.o: ../code/Covbr2Html.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/Covbr2HtmlGlob.o: ../code/Covbr2HtmlGlob.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/main.o: ../code/main.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/Glob.o: ../submodules/somcpp/src/Glob.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/docopts.o: ../submodules/somcpp/src/docopts.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/fio.o: ../submodules/somcpp/src/fio.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(PCH_PLACEHOLDER).d -endif \ No newline at end of file +endif diff --git a/make/premake5.lua b/make/premake5.lua index c9311f0..90f556a 100644 --- a/make/premake5.lua +++ b/make/premake5.lua @@ -10,11 +10,10 @@ somcpp = '../submodules/somcpp/' somsrc = somcpp .. 'src/' workspace 'covbr2html' - configurations { 'ci', 'trace_on', 'trace_all', 'glob_linux', 'glob_linux_trace_all' } language 'C++' - targetdir '../build' - objdir '../build/%{_TARGET_OS}/%{cfg.name}' + targetdir '../build/%{_TARGET_OS}' + objdir '../build/%{_TARGET_OS}' defines { 'NDEBUG' } optimize 'Speed' kind 'ConsoleApp' @@ -23,6 +22,7 @@ workspace 'covbr2html' warnings 'high' buildoptions { buildoptions_vs } defines { '_CRT_SECURE_NO_WARNINGS' } + location '../vs' filter { 'action:gmake*' } buildoptions { buildoptions_gcc } From f53ddfd79699625565f0d0fba46b0b3832561093 Mon Sep 17 00:00:00 2001 From: sorgom <110917257+sorgom@users.noreply.github.com> Date: Wed, 26 Mar 2025 12:00:42 +0100 Subject: [PATCH 4/5] precommit --- .gitHooks/pre-commit | 11 +++- .gitignore | 1 + make/Makefile | 38 +++++------ make/covbr2html.make | 74 +++++++++++----------- make/lab.make | 147 ------------------------------------------- 5 files changed, 67 insertions(+), 204 deletions(-) delete mode 100644 make/lab.make diff --git a/.gitHooks/pre-commit b/.gitHooks/pre-commit index 34bcd61..87bbbde 100644 --- a/.gitHooks/pre-commit +++ b/.gitHooks/pre-commit @@ -15,10 +15,19 @@ cd $(git rev-parse --show-toplevel) # path to sompy python scripts sompy=$(pwd)/submodules/sompy/somutil +# files to skip +skips="*/Makefile */*.make" + txts=() for file in $(git diff-index --cached --name-only HEAD); do - if [ -f $file ]; then txts+=($file); fi + if [ -f $file ]; then + ok=true + for s in $skips; do + if [[ $file == $s ]]; then ok=false; break; fi + done + if $ok; then txts+=($file); fi + fi done echo txt: ${#txts[@]} diff --git a/.gitignore b/.gitignore index d42fcb6..55df2b0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ stuff *.cov *.html vs +lab.make # temporary ignored *.sln diff --git a/make/Makefile b/make/Makefile index 02867c6..ea1431f 100644 --- a/make/Makefile +++ b/make/Makefile @@ -29,32 +29,32 @@ endif PROJECTS := covbr2html -.PHONY: all clean help $(PROJECTS) +.PHONY: all clean help $(PROJECTS) all: $(PROJECTS) covbr2html: ifneq (,$(covbr2html_config)) - @echo "==== Building covbr2html ($(covbr2html_config)) ====" - @${MAKE} --no-print-directory -C . -f covbr2html.make config=$(covbr2html_config) + @echo "==== Building covbr2html ($(covbr2html_config)) ====" + @${MAKE} --no-print-directory -C . -f covbr2html.make config=$(covbr2html_config) endif clean: - @${MAKE} --no-print-directory -C . -f covbr2html.make clean + @${MAKE} --no-print-directory -C . -f covbr2html.make clean help: - @echo "Usage: make [config=name] [target]" - @echo "" - @echo "CONFIGURATIONS:" - @echo " ci" - @echo " trace_on" - @echo " trace_all" - @echo " glob_linux" - @echo " glob_linux_trace_all" - @echo "" - @echo "TARGETS:" - @echo " all (default)" - @echo " clean" - @echo " covbr2html" - @echo "" - @echo "For more information, see https://github.com/premake/premake-core/wiki" + @echo "Usage: make [config=name] [target]" + @echo "" + @echo "CONFIGURATIONS:" + @echo " ci" + @echo " trace_on" + @echo " trace_all" + @echo " glob_linux" + @echo " glob_linux_trace_all" + @echo "" + @echo "TARGETS:" + @echo " all (default)" + @echo " clean" + @echo " covbr2html" + @echo "" + @echo "For more information, see https://github.com/premake/premake-core/wiki" \ No newline at end of file diff --git a/make/covbr2html.make b/make/covbr2html.make index b381400..f29d228 100644 --- a/make/covbr2html.make +++ b/make/covbr2html.make @@ -12,7 +12,7 @@ endif SHELLTYPE := posix ifeq ($(shell echo "test"), "test") - SHELLTYPE := msdos + SHELLTYPE := msdos endif # Configurations @@ -96,55 +96,55 @@ OBJECTS += $(OBJDIR)/main.o # ############################################# all: $(TARGET) - @: + @: $(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR) - $(PRELINKCMDS) - @echo Linking covbr2html - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) + $(PRELINKCMDS) + @echo Linking covbr2html + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) $(TARGETDIR): - @echo Creating $(TARGETDIR) + @echo Creating $(TARGETDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) + $(SILENT) mkdir -p $(TARGETDIR) else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) + $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) endif $(OBJDIR): - @echo Creating $(OBJDIR) + @echo Creating $(OBJDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) + $(SILENT) mkdir -p $(OBJDIR) else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) + $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) endif clean: - @echo Cleaning covbr2html + @echo Cleaning covbr2html ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(GENERATED) - $(SILENT) rm -rf $(OBJDIR) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(GENERATED) + $(SILENT) rm -rf $(OBJDIR) else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) endif prebuild: | $(OBJDIR) - $(PREBUILDCMDS) + $(PREBUILDCMDS) ifneq (,$(PCH)) $(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER) $(GCH): $(PCH) | prebuild - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" + @echo $(notdir $<) + $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" $(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR) ifeq (posix,$(SHELLTYPE)) - $(SILENT) touch "$@" + $(SILENT) touch "$@" else - $(SILENT) echo $null >> "$@" + $(SILENT) echo $null >> "$@" endif else $(OBJECTS): | prebuild @@ -155,25 +155,25 @@ endif # ############################################# $(OBJDIR)/Covbr2Html.o: ../code/Covbr2Html.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/Covbr2HtmlGlob.o: ../code/Covbr2HtmlGlob.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/main.o: ../code/main.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/Glob.o: ../submodules/somcpp/src/Glob.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/docopts.o: ../submodules/somcpp/src/docopts.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(OBJDIR)/fio.o: ../submodules/somcpp/src/fio.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" + @echo "$(notdir $<)" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(PCH_PLACEHOLDER).d -endif +endif \ No newline at end of file diff --git a/make/lab.make b/make/lab.make deleted file mode 100644 index 5bbec6b..0000000 --- a/make/lab.make +++ /dev/null @@ -1,147 +0,0 @@ -# Alternative GNU Make project makefile autogenerated by Premake - -ifndef config - config=ci -endif - -ifndef verbose - SILENT = @ -endif - -.PHONY: clean prebuild - -SHELLTYPE := posix -ifeq ($(shell echo "test"), "test") - SHELLTYPE := msdos -endif - -# Configurations -# ############################################# - -RESCOMP = windres -TARGETDIR = ../build -TARGET = $(TARGETDIR)/lab -INCLUDES += -I../lab -I../code -I../submodules/somcpp/include -FORCE_INCLUDE += -ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES) -ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -std=c++17 -O3 -pedantic-errors -Wall -ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -std=c++17 -O3 -pedantic-errors -Wall -ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) -LIBS += -LDDEPS += -ALL_LDFLAGS += $(LDFLAGS) -s -pthread -LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) -define PREBUILDCMDS -endef -define PRELINKCMDS -endef -define POSTBUILDCMDS -endef - -ifeq ($(config),ci) -OBJDIR = ../build/linux/ci/ci/lab -DEFINES += -DNDEBUG - -else ifeq ($(config),trace_on) -OBJDIR = ../build/linux/trace_on/trace_on/lab -DEFINES += -DNDEBUG -DTRACE_ON - -else ifeq ($(config),trace_all) -OBJDIR = ../build/linux/trace_all/trace_all/lab -DEFINES += -DNDEBUG -DTRACE_ALL - -endif - -# Per File Configurations -# ############################################# - - -# File sets -# ############################################# - -GENERATED := -OBJECTS := - -GENERATED += $(OBJDIR)/docopts.o -GENERATED += $(OBJDIR)/fglob.o -GENERATED += $(OBJDIR)/fio.o -OBJECTS += $(OBJDIR)/docopts.o -OBJECTS += $(OBJDIR)/fglob.o -OBJECTS += $(OBJDIR)/fio.o - -# Rules -# ############################################# - -all: $(TARGET) - @: - -$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR) - $(PRELINKCMDS) - @echo Linking lab - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) -else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) -endif - -$(OBJDIR): - @echo Creating $(OBJDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) -else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) -endif - -clean: - @echo Cleaning lab -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(GENERATED) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: | $(OBJDIR) - $(PREBUILDCMDS) - -ifneq (,$(PCH)) -$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER) -$(GCH): $(PCH) | prebuild - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" -$(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) touch "$@" -else - $(SILENT) echo $null >> "$@" -endif -else -$(OBJECTS): | prebuild -endif - - -# File Rules -# ############################################# - -$(OBJDIR)/docopts.o: ../submodules/somcpp/src/docopts.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/fglob.o: ../submodules/somcpp/src/fglob.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/fio.o: ../submodules/somcpp/src/fio.cpp - @echo "$(notdir $<)" - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(PCH_PLACEHOLDER).d -endif \ No newline at end of file From 404991704d279f11588aedbf026fea958c48dcde Mon Sep 17 00:00:00 2001 From: sorgom <110917257+sorgom@users.noreply.github.com> Date: Wed, 26 Mar 2025 12:08:24 +0100 Subject: [PATCH 5/5] submodules --- submodules/sompy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/sompy b/submodules/sompy index 167252f..6d5a2d9 160000 --- a/submodules/sompy +++ b/submodules/sompy @@ -1 +1 @@ -Subproject commit 167252f6c3a8d2a2d2af9f5daa77ebd47ebfa3d0 +Subproject commit 6d5a2d911b8b7d8a3020941aaba9b2fb462a219c