Skip to content

template_processor: Allow to skip files or directories #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fetzerch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

template_processor: Allow to skip files or directories #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9790d3e
config: Don't generate depends/windows/mingw for 2048
fetzerch Mar 19, 2018
8deedd6
templates: Conditionally generate mingw dependency
fetzerch Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kodi_game_scripting/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

# core: {(Libretro repo, Makefile, Directory)}
ADDONS = {
'2048': ('libretro-2048', 'Makefile.libretro', '.', 'jni', {}),
'2048': ('libretro-2048', 'Makefile.libretro', '.', 'jni', {'nomingw': True}),
'4do': ('4do-libretro', 'Makefile', '.', 'jni', {}),
'beetle-bsnes': ('beetle-bsnes-libretro', 'Makefile', '.', 'jni', {'soname': 'mednafen_snes'}),
'beetle-gba': ('beetle-gba-libretro', 'Makefile', '.', 'jni', {'soname': 'mednafen_gba'}),
Expand Down
2 changes: 2 additions & 0 deletions kodi_game_scripting/template_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ def __getattr__(self, key):
os.path.dirname(os.path.join(destination, outfile)))
with open(outfile_path, 'w') as outfile_ctx:
outfile_ctx.write(content)
else:
print(" Skipping empty file")

# Other files are just copied
else:
Expand Down
1 change: 0 additions & 1 deletion templates/addon/depends/common/{{ game.name }}/windows-deps.txt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions templates/addon/depends/common/{{ game.name }}/windows-deps.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% if not config.nomingw %}
mingw
{% endif %}
2 changes: 2 additions & 0 deletions ...epends/windows/mingw/01-make.bat.in.patch → ...nds/windows/mingw/01-make.bat.in.patch.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% if not config.nomingw %}
--- /dev/null
+++ b/make.bat.in
@@ -0,0 +1,5 @@
Expand All @@ -6,3 +7,4 @@
+
+SET PATH=@CMAKE_CURRENT_SOURCE_DIR@\@MINGW_PATH@\bin;@CMAKE_CURRENT_SOURCE_DIR@\usr\bin;%PATH%
+make.exe %*
{% endif %}
2 changes: 2 additions & 0 deletions ...ndows/mingw/02-MinGWConfig.cmake.in.patch → ...ws/mingw/02-MinGWConfig.cmake.in.patch.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{% if not config.nomingw %}
--- /dev/null
+++ b/MinGWConfig.cmake.in
@@ -0,0 +1,1 @@
+set(MINGW_MAKE @CMAKE_CURRENT_SOURCE_DIR@/@MINGW_PATH@/bin/make.bat)
{% endif %}
2 changes: 2 additions & 0 deletions ...ddon/depends/windows/mingw/CMakeLists.txt → ...n/depends/windows/mingw/CMakeLists.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% if not config.nomingw %}
cmake_minimum_required(VERSION 3.4)

project(mingw)
Expand Down Expand Up @@ -34,3 +35,4 @@ configure_file(MinGWConfig.cmake.in MinGWConfig.cmake @ONLY)
configure_file(make.bat.in ${CMAKE_CURRENT_SOURCE_DIR}/${MINGW_PATH}/bin/make.bat @ONLY)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/MinGWConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX})
{% endif %}
2 changes: 2 additions & 0 deletions .../addon/depends/windows/mingw/mingw.sha256 → ...don/depends/windows/mingw/mingw.sha256.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{% if not config.nomingw %}
bb1f1a0b35b3d96bf9c15092da8ce969a84a134f7b08811292fbc9d84d48c65d
{% endif %}
2 changes: 2 additions & 0 deletions ...tes/addon/depends/windows/mingw/mingw.txt → .../addon/depends/windows/mingw/mingw.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{% if not config.nomingw %}
mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20161025.tar.xz
{% endif %}