Skip to content

Sourcery refactored master branch #1

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sourcery refactored master branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions dependencies/np3-windows/bullet/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,20 @@ def run(temp_dir: str):
os.mkdir(install_dir)

os.environ["PATH"] = os.path.dirname(__np__.find_build_tool_exe("ninja", "ninja.exe")) + os.pathsep + os.environ["PATH"]
__np__.run_build_tool_exe("cmake", "cmake.exe", "-G", "Ninja",
"-DCMAKE_BUILD_TYPE=Release", "-DBUILD_CPU_DEMOS=OFF",
"-DBUILD_OPENGL3_DEMOS=OFF", "-DBUILD_UNIT_TESTS=OFF",
"-DINSTALL_LIBS=ON",
"-DCMAKE_INSTALL_PREFIX=" + install_dir,
src_dir)
__np__.run_build_tool_exe(
"cmake",
"cmake.exe",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
"-DBUILD_CPU_DEMOS=OFF",
"-DBUILD_OPENGL3_DEMOS=OFF",
"-DBUILD_UNIT_TESTS=OFF",
"-DINSTALL_LIBS=ON",
f'-DCMAKE_INSTALL_PREFIX={install_dir}',
src_dir,
)

Comment on lines -24 to +37
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function run refactored with the following changes:

__np__.run_build_tool_exe("ninja", "ninja.exe")
__np__.run_build_tool_exe("ninja", "ninja.exe", "install")

Expand Down
27 changes: 17 additions & 10 deletions dependencies/np3-windows/freetype/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,23 @@ def run(temp_dir: str):
os.mkdir(install_dir)

os.environ["PATH"] = os.path.dirname(__np__.find_build_tool_exe("ninja", "ninja.exe")) + os.pathsep + os.environ["PATH"]
__np__.run_build_tool_exe("cmake", "cmake.exe", "-G", "Ninja",
"-DCMAKE_INSTALL_PREFIX=" + install_dir,
"-DCMAKE_BUILD_TYPE=Release",
"-DZLIB_ROOT=" + __np__.find_dep_root("zlib"),
"-DWITH_HarfBuzz=ON", "-DWITH_BZip2=OFF",
"-DWITH_PNG=OFF",
"-DHARFBUZZ_INCLUDE_DIRS=" + __np__.find_dep_include("harfbuzz"),
"-DPC_HARFBUZZ_INCLUDEDIR=" + __np__.find_dep_include("harfbuzz"),
"-DPC_HARFBUZZ_LIBDIR=" + __np__.find_dep_libs("harfbuzz"),
src_dir)
__np__.run_build_tool_exe(
"cmake",
"cmake.exe",
"-G",
"Ninja",
f'-DCMAKE_INSTALL_PREFIX={install_dir}',
"-DCMAKE_BUILD_TYPE=Release",
"-DZLIB_ROOT=" + __np__.find_dep_root("zlib"),
"-DWITH_HarfBuzz=ON",
"-DWITH_BZip2=OFF",
"-DWITH_PNG=OFF",
"-DHARFBUZZ_INCLUDE_DIRS=" + __np__.find_dep_include("harfbuzz"),
"-DPC_HARFBUZZ_INCLUDEDIR=" + __np__.find_dep_include("harfbuzz"),
"-DPC_HARFBUZZ_LIBDIR=" + __np__.find_dep_libs("harfbuzz"),
src_dir,
)

Comment on lines -26 to +42
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function run refactored with the following changes:

__np__.run_build_tool_exe("ninja", "ninja.exe")
__np__.run_build_tool_exe("ninja", "ninja.exe", "install")

Expand Down
49 changes: 33 additions & 16 deletions dependencies/np3-windows/harfbuzz/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,20 @@ def run(temp_dir: str):

os.environ["PATH"] = os.path.dirname(__np__.find_build_tool_exe("ninja", "ninja.exe")) + os.pathsep + os.environ[
"PATH"]
__np__.run_build_tool_exe("cmake", "cmake.exe", "-G", "Ninja",
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_INSTALL_PREFIX=" + ft_install_dir,
"-DZLIB_ROOT=" + __np__.find_dep_root("zlib"),
"-DWITH_HarfBuzz=OFF", "-DWITH_BZip2=OFF",
"-DWITH_PNG=OFF", ft_src_dir)
__np__.run_build_tool_exe(
"cmake",
"cmake.exe",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
f'-DCMAKE_INSTALL_PREFIX={ft_install_dir}',
"-DZLIB_ROOT=" + __np__.find_dep_root("zlib"),
"-DWITH_HarfBuzz=OFF",
"-DWITH_BZip2=OFF",
"-DWITH_PNG=OFF",
ft_src_dir,
)

Comment on lines -31 to +44
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function run refactored with the following changes:

__np__.run_build_tool_exe("ninja", "ninja.exe")

__np__.run_build_tool_exe("ninja", "ninja.exe", "install")
Expand All @@ -52,16 +60,25 @@ def run(temp_dir: str):
install_dir = os.path.join(temp_dir, "install")
os.mkdir(install_dir)

__np__.run_build_tool_exe("cmake", "cmake.exe", "-G", "Ninja",
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_INSTALL_PREFIX=" + install_dir,
"-DCMAKE_PREFIX_PATH=" + ft_install_dir,
"-DHB_HAVE_FREETYPE=ON", "-DHB_BUILD_TESTS=OFF",
"-DHB_BUILD_UTILS=OFF", "-DHB_BUILD_SUBSET=OFF",
"-DHB_HAVE_INTROSPECTION=OFF", "-DHB_HAVE_CORETEXT=OFF",
f"-DFREETYPE_INCLUDE_DIR_freetype2={ft_install_dir}/include/freetype2",
f"-DFREETYPE_INCLUDE_DIR_ft2build={ft_install_dir}/include/freetype2",
src_dir)
__np__.run_build_tool_exe(
"cmake",
"cmake.exe",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
f'-DCMAKE_INSTALL_PREFIX={install_dir}',
f'-DCMAKE_PREFIX_PATH={ft_install_dir}',
"-DHB_HAVE_FREETYPE=ON",
"-DHB_BUILD_TESTS=OFF",
"-DHB_BUILD_UTILS=OFF",
"-DHB_BUILD_SUBSET=OFF",
"-DHB_HAVE_INTROSPECTION=OFF",
"-DHB_HAVE_CORETEXT=OFF",
f"-DFREETYPE_INCLUDE_DIR_freetype2={ft_install_dir}/include/freetype2",
f"-DFREETYPE_INCLUDE_DIR_ft2build={ft_install_dir}/include/freetype2",
src_dir,
)

__np__.run_build_tool_exe("ninja", "ninja.exe")

__np__.run_build_tool_exe("ninja", "ninja.exe", "install")
Expand Down