Build: improve make icons detection of Inkscape and Blender on macOS
Respect INKSCAPE_BIN and BLENDER_BIN environment variables if set, make expected Inkscape path show when missing, simplify code.
This commit is contained in:
parent
407dbdbcdc
commit
7c9c916b02
10
GNUmakefile
10
GNUmakefile
@ -570,14 +570,10 @@ source_archive_complete: .FORCE
|
||||
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
|
||||
@$(PYTHON) ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
|
||||
|
||||
INKSCAPE_BIN?="inkscape"
|
||||
icons: .FORCE
|
||||
@BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
|
||||
"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
|
||||
@INKSCAPE_BIN=$(INKSCAPE_BIN) \
|
||||
"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
|
||||
@INKSCAPE_BIN=$(INKSCAPE_BIN) \
|
||||
"$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
|
||||
@BLENDER_BIN=$(BLENDER_BIN) "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
|
||||
"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
|
||||
"$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
|
||||
|
||||
icons_geom: .FORCE
|
||||
@BLENDER_BIN=$(BLENDER_BIN) \
|
||||
|
@ -10,12 +10,11 @@ import sys
|
||||
|
||||
BASEDIR = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", "inkscape")
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
inkscape_app_path = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
if os.path.exists(inkscape_app_path):
|
||||
inkscape_bin = inkscape_app_path
|
||||
inkscape_bin = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
else:
|
||||
inkscape_bin = "inkscape"
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", inkscape_bin)
|
||||
|
||||
cmd = (
|
||||
inkscape_bin,
|
||||
|
@ -26,19 +26,12 @@ if sys.platform[:3] == "win":
|
||||
env["SystemDrive"] = os.environ.get("SystemDrive", "")
|
||||
env["SystemRoot"] = os.environ.get("SystemRoot", "")
|
||||
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", "inkscape")
|
||||
blender_bin = os.environ.get("BLENDER_BIN", "blender")
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
inkscape_app_path = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
if os.path.exists(inkscape_app_path):
|
||||
inkscape_bin = inkscape_app_path
|
||||
blender_app_path = '/Applications/Blender.app/Contents/MacOS/Blender'
|
||||
if os.path.exists(blender_app_path):
|
||||
blender_bin = blender_app_path
|
||||
else:
|
||||
blender_bin = "Blender"
|
||||
|
||||
inkscape_bin = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
else:
|
||||
inkscape_bin = "inkscape"
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", inkscape_bin)
|
||||
blender_bin = os.environ.get("BLENDER_BIN", "blender")
|
||||
|
||||
cmd = (
|
||||
inkscape_bin,
|
||||
|
@ -10,12 +10,11 @@ import sys
|
||||
|
||||
BASEDIR = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", "inkscape")
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
inkscape_app_path = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
if os.path.exists(inkscape_app_path):
|
||||
inkscape_bin = inkscape_app_path
|
||||
inkscape_bin = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
|
||||
else:
|
||||
inkscape_bin = "inkscape"
|
||||
inkscape_bin = os.environ.get("INKSCAPE_BIN", inkscape_bin)
|
||||
|
||||
cmd = (
|
||||
inkscape_bin,
|
||||
|
Loading…
Reference in New Issue
Block a user