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

remove manylinux1 patch file, integrate changes

Browse Source
This commit is contained in:
Federico Ficarelli
2017-09-03 18:15:23 +02:00
parent b0f23806c0
commit ae7b78d0b7
3 changed files with 17 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
makefiles/Makefile.python.mk
View File

@@ -1,4 +1,4 @@
.PHONY : python install_python_modules pypi_archive pyinit pycp pyalgorithms pygraph pylp
.PHONY : python install_python_modules pypi_archive pypi_archive_dir pyinit pycp pyalgorithms pygraph pylp
# Python support using SWIG
@@ -247,9 +247,23 @@ PYPI_ARCHIVE_TEMP_DIR = temp-python$(PYTHON_VERSION)
OR_TOOLS_PYTHON_GEN_SCRIPTS = $(wildcard src/gen/ortools/*/*.py) $(wildcard src/gen/ortools/*/*.cc)
pypi_archive: python $(PYPI_ARCHIVE_TEMP_DIR)
# Stages all the files needed to build the python package.
pypi_archive_dir: python $(PYPI_ARCHIVE_TEMP_DIR)
$(PYPI_ARCHIVE_TEMP_DIR) : $(OR_TOOLS_PYTHON_GEN_SCRIPTS) $(PATCHELF)
# Patches the archive files to be able to build a pypi package.
# Graft libortools if needed and set RPATHs.
pypi_archive: pypi_archive_dir $(PATCHELF)
ifneq ($(PLATFORM),win)
cp lib/libortools.$(LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
ifeq ($(PLATFORM),MACOSX)
tools/fix_python_libraries_on_mac.sh $(PYPI_ARCHIVE_TEMP_DIR)
endif
ifeq ($(PLATFORM),LINUX)
tools/fix_python_libraries_on_linux.sh $(PYPI_ARCHIVE_TEMP_DIR)
endif
endif
$(PYPI_ARCHIVE_TEMP_DIR) : $(OR_TOOLS_PYTHON_GEN_SCRIPTS)
-$(DELREC) $(PYPI_ARCHIVE_TEMP_DIR)
$(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)
$(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)$Sortools
@@ -300,18 +314,10 @@ else
cp lib/_pywraplp.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/linear_solver
cp lib/_pywrapgraph.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/graph
cp lib/_pywrapknapsack_solver.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/algorithms
cp lib/libortools.$(LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
$(SED) -i -e 's/\.dll/\.so/' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e 's/DELETEWIN //g' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e '/DELETEUNIX/d' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e 's/DLL/$(LIB_SUFFIX)/g' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
-rm $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py-e
ifeq ($(PLATFORM),MACOSX)
tools/fix_python_libraries_on_mac.sh $(PYPI_ARCHIVE_TEMP_DIR)
endif
ifeq ($(PLATFORM),LINUX)
tools/fix_python_libraries_on_linux.sh $(PYPI_ARCHIVE_TEMP_DIR)
endif
endif
pypi_upload: pypi_archive

55
tools/docker/Makefile.python.mk.patch
View File

@@ -1,55 +0,0 @@
diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk
index 61d0be945..979479a54 100755
--- a/makefiles/Makefile.python.mk
+++ b/makefiles/Makefile.python.mk
@@ -1,4 +1,4 @@
-.PHONY : python install_python_modules pypi_archive pyinit pycp pyalgorithms pygraph pylp
+.PHONY : python install_python_modules pypi_archive pypi_archive_dir pyinit pycp pyalgorithms pygraph pylp
# Python support using SWIG
@@ -247,9 +247,23 @@ PYPI_ARCHIVE_TEMP_DIR = temp-python$(PYTHON_VERSION)
OR_TOOLS_PYTHON_GEN_SCRIPTS = $(wildcard src/gen/ortools/*/*.py) $(wildcard src/gen/ortools/*/*.cc)
-pypi_archive: python $(PYPI_ARCHIVE_TEMP_DIR)
+# Stages all the files needed to build the python package.
+pypi_archive_dir: python $(PYPI_ARCHIVE_TEMP_DIR)
-$(PYPI_ARCHIVE_TEMP_DIR) : $(OR_TOOLS_PYTHON_GEN_SCRIPTS) $(PATCHELF)
+# Patches the archive files to be able to build a pypi package.
+# Graft libortools if needed and set RPATHs.
+pypi_archive: pypi_archive_dir $(PATCHELF)
+ifneq ($(PLATFORM),win)
+ cp lib/libortools.$(LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
+ifeq ($(PLATFORM),MACOSX)
+ tools/fix_python_libraries_on_mac.sh $(PYPI_ARCHIVE_TEMP_DIR)
+endif
+ifeq ($(PLATFORM),LINUX)
+ tools/fix_python_libraries_on_linux.sh $(PYPI_ARCHIVE_TEMP_DIR)
+endif
+endif
+
+$(PYPI_ARCHIVE_TEMP_DIR) : $(OR_TOOLS_PYTHON_GEN_SCRIPTS)
-$(DELREC) $(PYPI_ARCHIVE_TEMP_DIR)
$(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)
$(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)$Sortools
@@ -300,18 +314,10 @@ else
cp lib/_pywraplp.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/linear_solver
cp lib/_pywrapgraph.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/graph
cp lib/_pywrapknapsack_solver.$(SWIG_LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/algorithms
- cp lib/libortools.$(LIB_SUFFIX) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
$(SED) -i -e 's/\.dll/\.so/' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e 's/DELETEWIN //g' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e '/DELETEUNIX/d' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
$(SED) -i -e 's/DLL/$(LIB_SUFFIX)/g' $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py
- -rm $(PYPI_ARCHIVE_TEMP_DIR)/ortools/setup.py-e
-ifeq ($(PLATFORM),MACOSX)
- tools/fix_python_libraries_on_mac.sh $(PYPI_ARCHIVE_TEMP_DIR)
-endif
-ifeq ($(PLATFORM),LINUX)
- tools/fix_python_libraries_on_linux.sh $(PYPI_ARCHIVE_TEMP_DIR)
-endif
endif
pypi_upload: pypi_archive

7
tools/docker/manylinux1.Dockerfile
View File

@@ -59,10 +59,3 @@ RUN make third_party
COPY build-manylinux1.sh "$BUILD_ROOT"
RUN chmod ugo+x "${BUILD_ROOT}/build-manylinux1.sh"
# TEMPORARY HACK
# Patch Makefile.python.mk to add manylinux1 targets,
# to be removed when changes are integrated into mainstream.
COPY Makefile.python.mk.patch "$BUILD_ROOT"
WORKDIR "$SRC_ROOT"
RUN patch --force -p1 < "${BUILD_ROOT}/Makefile.python.mk.patch"