Kaydet (Commit) 257bcb1a authored tarafından Caolán McNamara's avatar Caolán McNamara

get internal python invocations working

üst 6c6d88b8
...@@ -60,7 +60,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) ...@@ -60,7 +60,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
$(filter_GEN_svg_Script_hxx) : \ $(filter_GEN_svg_Script_hxx) : \
$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx)
$(call gb_Output_announce,$@,build,PY ,1) $(call gb_Output_announce,$@,build,PY ,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs_native, \
$(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \ $(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \
$(filter_SRC_svg_PresentationEngine) \ $(filter_SRC_svg_PresentationEngine) \
$(filter_GEN_svg_Script_hxx)) $(filter_GEN_svg_Script_hxx))
......
...@@ -334,7 +334,7 @@ gb_PYTHONTARGET := ...@@ -334,7 +334,7 @@ gb_PYTHONTARGET :=
gb_PYTHON := $(PYTHON) gb_PYTHON := $(PYTHON)
else else
gb_PYTHONTARGET := $(OUTDIR)/bin/python gb_PYTHONTARGET := $(OUTDIR)/bin/python
gb_PYTHON := $(gb_PYTHON_PRECOMMAND) PYTHONPATH=$(SOLARLIBDIR)/python $(gb_PYTHONTARGET) gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
endif endif
export gb_AWK export gb_AWK
......
...@@ -447,4 +447,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLA ...@@ -447,4 +447,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLA
# Configuration # Configuration
gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -532,4 +532,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$( ...@@ -532,4 +532,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
# Configuration # Configuration
gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -418,4 +418,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU ...@@ -418,4 +418,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU
# Configuration # Configuration
gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
# Python
gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -504,4 +504,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU ...@@ -504,4 +504,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU
# Configuration # Configuration
gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
# Python
gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -761,4 +761,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_RE ...@@ -761,4 +761,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_RE
# Configuration # Configuration
gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -685,4 +685,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_ ...@@ -685,4 +685,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_
# Configuration # Configuration
gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
# vim: set noet sw=4: # vim: set noet sw=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment