always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup python modules, makefiles

Browse Source
This commit is contained in:
Laurent Perron
2017-10-02 15:25:53 +02:00
parent 7892f0be4b
commit ae8fa98dba
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/Makefile.python
View File

@@ -4,16 +4,16 @@
WINDOWS_PATH_TO_PYTHON =
# Set this variable to use it as PYTHONPATH
WINDOWS_PYTHONPATH =
WINDOWS_PYTHONPATH =
###############################Unix specific part################################
# Set UNIX_PYTHON_VER to the version number of the Python installation on your computer that you wish to use with or-tools.
#Example : UNIX_PYTHON_VER = 3.5 or UNIX_PYTHON_VER = 2.7
UNIX_PYTHON_VER =
UNIX_PYTHON_VER =
# Set this variable to use it as PYTHONPATH.
UNIX_PYTHONPATH =
UNIX_PYTHONPATH =
##################################################################################
@@ -34,21 +34,21 @@ endif
ifeq ($(SYSTEM),win)
PYTHON_EXECUTABLE = $(WINDOWS_PATH_TO_PYTHON)$Spython
#Set PYTHONPATH only when WINDOWS_PYTHONPATH is used.
#Set PYTHONPATH only when WINDOWS_PYTHONPATH is used.
ifneq ($(WINDOWS_PYTHONPATH),)
SET_PYTHONPATH = @set PYTHONPATH=$(WINDOWS_PYTHONPATH) &&
endif
else #UNIX
PYTHON_EXECUTABLE = python$(UNIX_PYTHON_VER)
#Set PYTHONPATH only when UNIX_PYTHONPATH is used.
#Set PYTHONPATH only when UNIX_PYTHONPATH is used.
ifneq ($(UNIX_PYTHONPATH),)
SET_PYTHONPATH = @PYTHONPATH=$(UNIX_PYTHONPATH)
endif
endif #ifeq ($(SYSTEM),win)
install:
$(PYTHON_EXECUTABLE) setup.py install --user
install:
@echo Please run pip install ortools
$(SET_PYTHONPATH) $(PYTHON_EXECUTABLE) check_python_deps.py --log=ERROR
check:
@@ -59,4 +59,4 @@ rpy: $(EX)
$(SET_PYTHONPATH) $(PYTHON_EXECUTABLE) check_python_deps.py --log=ERROR
$(SET_PYTHONPATH) $(PYTHON_EXECUTABLE) $(EX) $(ARGS)
print-% : ; @echo $* = $($*)
print-% : ; @echo $* = $($*)