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

cmake: cleanup

Browse Source
This commit is contained in:
Corentin Le Molgat
2024-07-12 15:50:55 +02:00
parent d38fcfbee0
commit f5d9ea77be
8 changed files with 88 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/Makefile.port.mk
View File

@@ -288,7 +288,7 @@ ifeq ($(OR_TOOLS_PATCH),)
$(warning you are using a shallow copy)
OR_TOOLS_PATCH:= 9999
else
OR_TOOLS_PATCH:= $(shell git rev-list --count v$(OR_TOOLS_MAJOR).0..HEAD)
OR_TOOLS_PATCH:= $(shell git rev-list --count --quiet v$(OR_TOOLS_MAJOR).0..HEAD || echo 0)
endif
else
$(warning you are not using a .git archive)

12
makefiles/docker/centos/Dockerfile
View File

@@ -27,18 +27,18 @@ RUN wget -q "https://cmake.org/files/v3.28/cmake-3.28.3-linux-x86_64.sh" \
&& rm cmake-3.28.3-linux-x86_64.sh
CMD [ "/usr/bin/bash" ]
# Install SWIG 4.1.1
# Install SWIG 4.2.1
FROM base AS swig
RUN dnf -y update \
&& dnf -y install pcre2-devel \
&& dnf clean all \
&& rm -rf /var/cache/dnf \
&& wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.1.1.tar.gz" \
&& tar xvf swig-4.1.1.tar.gz \
&& rm swig-4.1.1.tar.gz \
&& cd swig-4.1.1 \
&& wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \
&& tar xvf swig-4.2.1.tar.gz \
&& rm swig-4.2.1.tar.gz \
&& cd swig-4.2.1 \
&& ./configure --prefix=/usr \
&& make -j 4 \
&& make install \
&& cd .. \
&& rm -rf swig-4.1.1
&& rm -rf swig-4.2.1