Tweaks to the merger and make release scripts.

This commit is contained in:
Relintai 2024-09-14 20:12:13 +02:00
parent ab61a7b2df
commit ec57a87255
2 changed files with 16 additions and 6 deletions

View File

@ -3,7 +3,7 @@ mkdir -p out
mkdir -p out/core
mkdir -p out/object
mkdir -p out/render_core
mkdir -p out/gui
mkdir -p out/render_gui
mkdir -p out/render_immediate
mkdir -p out/render_objects
mkdir -p out/full
@ -26,9 +26,9 @@ python tools/merger/join.py --template tools/merger/sfw_render_core.h.inl --path
python tools/merger/join.py --template tools/merger/sfw_render_core.cpp.inl --path . --output tools/merger/out/render_core/sfw.cpp
python tools/merger/join.py --template tools/merger/sfw_3rd.x.inl --path . --output tools/merger/out/render_core/sfw_3rd.m
python tools/merger/join.py --template tools/merger/sfw_gui.h.inl --path . --output tools/merger/out/gui/sfw.h
python tools/merger/join.py --template tools/merger/sfw_gui.cpp.inl --path . --output tools/merger/out/gui/sfw.cpp
python tools/merger/join.py --template tools/merger/sfw_3rd.x.inl --path . --output tools/merger/out/gui/sfw_3rd.m
python tools/merger/join.py --template tools/merger/sfw_gui.h.inl --path . --output tools/merger/out/render_gui/sfw.h
python tools/merger/join.py --template tools/merger/sfw_gui.cpp.inl --path . --output tools/merger/out/render_gui/sfw.cpp
python tools/merger/join.py --template tools/merger/sfw_3rd.x.inl --path . --output tools/merger/out/render_gui/sfw_3rd.m
python tools/merger/join.py --template tools/merger/sfw_render_immediate.h.inl --path . --output tools/merger/out/render_immediate/sfw.h
python tools/merger/join.py --template tools/merger/sfw_render_immediate.cpp.inl --path . --output tools/merger/out/render_immediate/sfw.cpp
@ -63,8 +63,8 @@ clang-format --Wno-error=unknown -i tools/merger/out/render_core/sfw.h
clang-format --Wno-error=unknown -i tools/merger/out/render_core/sfw.cpp
#clang-format --Wno-error=unknown -i tools/merger/out/render_core/sfw_3rd.m
clang-format --Wno-error=unknown -i tools/merger/out/gui/sfw.h
clang-format --Wno-error=unknown -i tools/merger/out/gui/sfw.cpp
clang-format --Wno-error=unknown -i tools/merger/out/render_gui/sfw.h
clang-format --Wno-error=unknown -i tools/merger/out/render_gui/sfw.cpp
#clang-format --Wno-error=unknown -i tools/merger/out/gui/sfw_3rd.m
clang-format --Wno-error=unknown -i tools/merger/out/render_immediate/sfw.h

View File

@ -100,6 +100,16 @@ cp "$current_in_fol/sfw.cpp" "$current_out_fol/sfw.cpp"
cp "$current_in_fol/sfw_3rd.m" "$current_out_fol/sfw_3rd.m"
cp "$doc_folder/sfw_render_core.html" "$current_out_fol/sfw.html"
# Render GUI
current_in_fol=$project_root_folder/tools/merger/out/render_gui
current_out_fol=$sfw_out_folder/merged/render_gui
mkdir -p "$current_out_fol"
cp "$current_in_fol/sfw.h" "$current_out_fol/sfw.h"
cp "$current_in_fol/sfw.cpp" "$current_out_fol/sfw.cpp"
cp "$current_in_fol/sfw_3rd.m" "$current_out_fol/sfw_3rd.m"
cp "$doc_folder/sfw_render_gui.html" "$current_out_fol/sfw.html"
# Render Immediate
current_in_fol=$project_root_folder/tools/merger/out/render_immediate
current_out_fol=$sfw_out_folder/merged/render_immediate