Merge pull request #7 from travis-ci/revert-5-revert-4-meat-exe-rename

Reinstate #4

Author: BanzaiMan

.travis.yml

@@ -3,38 +3,34 @@ language: python
 matrix:
   include:
     - sudo: required
-      services:
-        - docker
-      env:
-        - RELEASE=trusty
+      services: docker
+      env: RELEASE=trusty
     - sudo: required
-      env:
-        - RELEASE=precise
+      env: RELEASE=precise
 
 env:
   global:
-    - VERSION='3.6-dev'
-    - ALIAS='nightly'
+  - VERSION='3.5.0'
+  - ALIAS='3.5'
 
 install:
-  - pushd /opt/pyenv/
-  - sudo git checkout master
-  - sudo git pull
-  - popd
+- pushd /opt/pyenv/
+- sudo git checkout master
+- sudo git pull
+- popd
 
 before_script:
-  - 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
-  - 'export LSB_RELEASE=${LSB_RELEASE:-$(lsb_release -rs || echo ${$(sw_vers -productVersion)%*.*})}'
-  - 'export OS_NAME=${OS_NAME:-$(lsb_release -is | tr "A-Z" "a-z" || "osx")}'
-  - 'export ARCH=${ARCH:-$(uname -m)}'
-  - 'export PACKAGES=${PACKAGES:-pip numpy nose pytest mock wheel}'
+- 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
+- 'export LSB_RELEASE=${LSB_RELEASE:-$(lsb_release -rs || echo ${$(sw_vers -productVersion)%*.*})}'
+- 'export OS_NAME=${OS_NAME:-$(lsb_release -is | tr "A-Z" "a-z" || echo "osx")}'
+- 'export ARCH=${ARCH:-$(uname -m)}'
+- 'export PACKAGES=${PACKAGES:-pip numpy nose pytest mock wheel}'
 
-script: ./build-python
+script: ./bin/compile
 
-after_success: ./create-archive
+after_success: ./bin/archive
 
-after_failure:
-  - cat /tmp/python-build.*.log
+after_failure: cat /tmp/python-build.*.log
 
 addons:
   artifacts:

README.md

@@ -1,2 +1,3 @@
-# cpython-builder
+# `cpython-builder`
+
 Clones and builds CPython using `python-build`

bin/archive

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+if [[ ! $LSB_RELEASE ]] ; then
+  echo 'Missing LSB_RELEASE'
+  exit 1
+fi
+
+if [[ ! $INSTALL_DEST ]] ; then
+  echo 'Missing INSTALL_DEST'
+  exit 1
+fi
+
+if [[ ! $VERSION ]] ; then
+  echo 'Missing VERSION'
+  exit 1
+fi
+
+set -o xtrace
+
+: ${TAR_PATHS:=}
+: ${DESTS:=}
+
+if [[ $VERSION =~ ^python|pypy ]] ; then
+  VERSION="${VERSION}"
+  SHORT_VERSION="${VERSION}"
+else
+  SHORT_VERSION="python${VERSION}"
+  VERSION="python-${VERSION}"
+fi
+
+TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$VERSION $HOME/virtualenv/${SHORT_VERSION}"
+DESTS="$TRAVIS_BUILD_DIR/$LSB_RELEASE/${VERSION}.tar.bz2"
+
+if [[ $ALIAS ]] ; then
+  if [[ $ALIAS =~ ^python|pypy ]] ; then
+    SHORT_ALIAS="${ALIAS}"
+    LONG_ALIAS="${ALIAS}"
+  else
+    SHORT_ALIAS="python${ALIAS}"
+    LONG_ALIAS="python-${ALIAS}"
+  fi
+  TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$ALIAS $HOME/virtualenv/${SHORT_ALIAS}"
+  DESTS="$DESTS $TRAVIS_BUILD_DIR/$LSB_RELEASE/${LONG_ALIAS}.tar.bz2"
+fi
+
+for DEST in $DESTS ; do
+  mkdir -p $(dirname $DEST)
+  tar -cjf $DEST $TAR_PATHS
+
+  pushd $(dirname $DEST) &>/dev/null
+
+  shopt -s nullglob
+  for f in *.* ; do
+    sha256sum $f > ${f}.sha256sum.txt
+  done
+
+  popd &>/dev/null
+
+  echo "---> $DEST"
+done