From ccc0582dd2168e832780c31a92e7cb4ccaefe061 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 30 Jan 2016 14:18:07 -0600
Subject: [PATCH] More build tweakery
---
build-helpers/loopy.spec | 2 +-
.../make-linux-build-docker-inner-part-2.sh | 35 +++++++++++++++++++
.../make-linux-build-docker-inner.sh | 33 ++---------------
3 files changed, 38 insertions(+), 32 deletions(-)
create mode 100755 build-helpers/make-linux-build-docker-inner-part-2.sh
diff --git a/build-helpers/loopy.spec b/build-helpers/loopy.spec
index e97a7a4d4..14116ec53 100644
--- a/build-helpers/loopy.spec
+++ b/build-helpers/loopy.spec
@@ -12,7 +12,7 @@ from os.path import expanduser
import packaging # pip install packaging to add
-a = Analysis(['bin/loopy'],
+a = Analysis(['../bin/loopy'],
pathex=[expanduser('~/src/loopy')],
hiddenimports=[
"appdirs",
diff --git a/build-helpers/make-linux-build-docker-inner-part-2.sh b/build-helpers/make-linux-build-docker-inner-part-2.sh
new file mode 100755
index 000000000..0d551018f
--- /dev/null
+++ b/build-helpers/make-linux-build-docker-inner-part-2.sh
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+set -e
+set -x
+
+VENV_VERSION="virtualenv-1.9.1"
+rm -Rf "$VENV_VERSION"
+curl -k https://pypi.python.org/packages/source/v/virtualenv/$VENV_VERSION.tar.gz | tar xfz -
+
+$VENV_VERSION/virtualenv.py --system-site-packages --no-setuptools .env
+
+source .env/bin/activate
+
+curl -k https://ssl.tiker.net/software/ez_setup.py | python -
+curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -
+
+pip install packaging
+
+PYTHON_VER=$(python -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')
+if test "$PYTHON_VER" = "2.6"; then
+ pip install pyinstaller==2.1
+else
+ pip install pyinstaller
+fi
+
+git clone --recursive git://github.com/inducer/loopy
+cd loopy
+
+grep -v pyopencl requirements.txt > myreq.txt
+pip install -r myreq.txt
+python setup.py install
+
+chown -R user /tmp/build
+
+su user -p -c "cd /tmp/build && source .env/bin/activate && cd loopy && ./build-helpers/run-pyinstaller.sh"
diff --git a/build-helpers/make-linux-build-docker-inner.sh b/build-helpers/make-linux-build-docker-inner.sh
index 321aa8666..119609a3c 100755
--- a/build-helpers/make-linux-build-docker-inner.sh
+++ b/build-helpers/make-linux-build-docker-inner.sh
@@ -9,36 +9,7 @@ cd /tmp/build
useradd -d /home/user -m -s /bin/bash user
yum install -y centos-release-SCL
-yum install -y git python27 python27-python-devel tar gcc gcc-c++ mercurial numpy libffi-devel
+yum install -y git python27 python27-python-devel python27-numpy tar gcc gcc-c++ mercurial libffi-devel
-VENV_VERSION="virtualenv-1.9.1"
-rm -Rf "$VENV_VERSION"
-curl -k https://pypi.python.org/packages/source/v/virtualenv/$VENV_VERSION.tar.gz | tar xfz -
+scl enable python27 /mnt/make-linux-build-docker-inner-part-2.sh
-VIRTUALENV=virtualenv
-scl enable python27 "$VENV_VERSION/virtualenv.py --system-site-packages --no-setuptools .env"
-
-source .env/bin/activate
-
-curl -k https://ssl.tiker.net/software/ez_setup.py | python -
-curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -
-
-pip install packaging
-
-PYTHON_VER=$(python -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')
-if test "$PYTHON_VER" = "2.6"; then
- pip install pyinstaller==2.1
-else
- pip install pyinstaller
-fi
-
-git clone --recursive git://github.com/inducer/loopy
-cd loopy
-
-grep -v pyopencl requirements.txt > myreq.txt
-pip install -r myreq.txt
-python setup.py install
-
-chown -R user /tmp/build
-
-su user -p -c "cd /tmp/build && source .env/bin/activate && cd loopy && ./build-helpers/run-pyinstaller.sh"
--
GitLab