More build tweakery

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",

build-helpers/make-linux-build-docker-inner-part-2.sh

+#! /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"

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"