Commit e69f82cf authored by Reinout van Rees's avatar Reinout van Rees

Merged master

parents f9053aa1 4cf5773f
...@@ -6,11 +6,19 @@ env: ...@@ -6,11 +6,19 @@ env:
- PYTHON_VER=3.3 - PYTHON_VER=3.3
- PYTHON_VER=3.4 - PYTHON_VER=3.4
sudo: false
cache:
directories:
- pythons
# Note on this cache directories: "make build" downloads pythons elsewhere,
# but installs the compiled bin/lib/share in pythons/pythonx.y/ .
notifications: notifications:
email: email:
- buildout-development@googlegroups.com - buildout-development@googlegroups.com
install: install:
- ls -al pythons
- deactivate - deactivate
- make build - make build
......
...@@ -29,6 +29,11 @@ Unreleased ...@@ -29,6 +29,11 @@ Unreleased
higher for this functionality. higher for this functionality.
[lrowe] [lrowe]
- Updated buildout's `travis-ci <https://travis-ci.org/buildout/buildout>`_
configuration so that tests run much quicker so that buildout is easier and
quicker to develop.
[reinout]
- When bootstrapping, the ``develop-eggs/`` directory is first removed. This - When bootstrapping, the ``develop-eggs/`` directory is first removed. This
prevents old left-over ``.egg-link`` files from breaking buildout's careful prevents old left-over ``.egg-link`` files from breaking buildout's careful
package collection mechanism. package collection mechanism.
......
HERE = $(shell pwd) HERE = $(shell pwd)
PYTHON_VER ?= 2.7 PYTHON_VER ?= 2.7
PYTHON_PATH = $(HERE)/python$(PYTHON_VER) PYTHON_PATH = $(HERE)/pythons/$(PYTHON_VER)
PYTHON_BUILD_DIR = $(HERE)/python_builds
ifeq ($(PYTHON_VER),2.6) ifeq ($(PYTHON_VER),2.6)
PYTHON_MINOR ?= 2.6.8 PYTHON_MINOR ?= 2.6.8
...@@ -32,28 +33,29 @@ BUILD_DIRS = $(PYTHON_PATH) bin build develop-eggs eggs parts ...@@ -32,28 +33,29 @@ BUILD_DIRS = $(PYTHON_PATH) bin build develop-eggs eggs parts
all: build all: build
$(PYTHON_PATH): $(PYTHON_PATH)/bin/$(PYTHON_EXE):
@echo "Installing Python" @echo "Installing Python"
mkdir -p $(PYTHON_PATH) mkdir -p $(PYTHON_PATH)
cd $(PYTHON_PATH) && \ mkdir -p $(PYTHON_BUILD_DIR)
cd $(PYTHON_BUILD_DIR) && \
curl --progress-bar --location $(PYTHON_DOWNLOAD) | tar -zx curl --progress-bar --location $(PYTHON_DOWNLOAD) | tar -zx
ifeq ($(PYTHON_VER),2.6) ifeq ($(PYTHON_VER),2.6)
cd $(PYTHON_PATH) && \ cd $(PYTHON_BUILD_DIR) && \
curl --progress-bar -L https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch curl --progress-bar -L https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch
cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \ cd $(PYTHON_BUILD_DIR)/$(PYTHON_ARCHIVE) && \
patch -p0 < ../ssl.patch patch -p0 < ../ssl.patch
endif endif
cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \ cd $(PYTHON_BUILD_DIR)/$(PYTHON_ARCHIVE) && \
./configure --prefix $(PYTHON_PATH) $(PYTHON_CONFIGURE_ARGS) >/dev/null 2>&1 && \ ./configure --prefix $(PYTHON_PATH) $(PYTHON_CONFIGURE_ARGS) >/dev/null 2>&1 && \
make >/dev/null 2>&1 && \ make >/dev/null 2>&1 && \
make install >/dev/null 2>&1 make install >/dev/null 2>&1
@echo "Finished installing Python" @echo "Finished installing Python"
build: $(PYTHON_PATH) build: $(PYTHON_PATH)/bin/$(PYTHON_EXE)
$(PYTHON_PATH)/bin/$(PYTHON_EXE) dev.py $(PYTHON_PATH)/bin/$(PYTHON_EXE) dev.py
clean: clean:
rm -rf $(BUILD_DIRS) rm -rf $(BUILD_DIRS) $(PYTHON_BUILD_DIR)
test: test:
$(HERE)/bin/test -1 -v $(HERE)/bin/test -1 -v
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment