jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix clash between php and python when running scripts

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10880 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-09-24 19:28:15 +00:00
commit 1d9f63c873
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Examples/Makefile.in
View file

@ -294,15 +294,15 @@ python_static_cpp: $(SRCS)
# -----------------------------------------------------------------
ifeq (,$(PY3))
SCRIPT = runme.py
PYSCRIPT = runme.py
else
SCRIPT = runme3.py
PYSCRIPT = runme3.py
endif
PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
python_run: $(SCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(SCRIPT) >/dev/null
python_run: $(PYSCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) >/dev/null
runme3.py: runme.py
cp $< $@
@ -769,10 +769,10 @@ php4_cpp: $(SRCS)
# -----------------------------------------------------------------
PHP4=@PHP4@
SCRIPT ?= runme.php4
PHP4SCRIPT ?= runme.php4
php4_run:
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(SCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(PHP4SCRIPT)
# -----------------------------------------------------------------
# Cleaning the PHP4 examples

2
Examples/test-suite/php4/Makefile.in
View file

@ -58,7 +58,7 @@ missingtests: missingcpptests missingctests
# a file is found which has _runme.php4 appended after the testcase name.
run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP4SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \
fi;
# Clean: remove the generated .php file