Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos.buildout
Commits
548fd28c
Commit
548fd28c
authored
Jun 11, 2015
by
Reinout van Rees
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-ordering the makefile directories a bit to benefit travis caching
parent
b5379e87
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
.travis.yml
.travis.yml
+1
-5
Makefile
Makefile
+8
-6
No files found.
.travis.yml
View file @
548fd28c
...
@@ -9,11 +9,7 @@ env:
...
@@ -9,11 +9,7 @@ env:
sudo
:
false
sudo
:
false
cache
:
cache
:
directories
:
directories
:
-
python2.6
-
pythons
-
python2.7
-
python3.2
-
python3.3
-
python3.4
# Note on these cache directories: "make build" downloads and installs a fresh
# Note on these cache directories: "make build" downloads and installs a fresh
# python in those directories.
# python in those directories.
...
...
Makefile
View file @
548fd28c
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
...
@@ -35,15 +36,16 @@ all: build
...
@@ -35,15 +36,16 @@ all: build
$(PYTHON_PATH)/bin/$(PYTHON_EXE)
:
$(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
...
@@ -53,7 +55,7 @@ build: $(PYTHON_PATH)/bin/$(PYTHON_EXE)
...
@@ -53,7 +55,7 @@ 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment