Revert "Merge pull request #29 from xPaw/travis-ci"
This reverts commit17b8858408
, reversing changes made to0375d6469a
.
This commit is contained in:
parent
4c473451c9
commit
d3e8b9066c
11
.travis.yml
11
.travis.yml
|
@ -1,11 +0,0 @@
|
||||||
language: cpp
|
|
||||||
compiler:
|
|
||||||
- clang
|
|
||||||
before_script:
|
|
||||||
- sudo apt-get update -qq
|
|
||||||
- sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
|
|
||||||
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR
|
|
||||||
script:
|
|
||||||
- mkdir build && cd build
|
|
||||||
- python ../configure.py --enable-optimize
|
|
||||||
- ambuild
|
|
|
@ -1,6 +1,5 @@
|
||||||
# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
|
# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
|
||||||
import os, sys
|
import os, sys
|
||||||
import re
|
|
||||||
|
|
||||||
builder.SetBuildFolder('/')
|
builder.SetBuildFolder('/')
|
||||||
|
|
||||||
|
@ -18,19 +17,16 @@ outputs = [
|
||||||
]
|
]
|
||||||
|
|
||||||
with open(os.path.join(builder.sourcePath, '.git', 'HEAD')) as fp:
|
with open(os.path.join(builder.sourcePath, '.git', 'HEAD')) as fp:
|
||||||
head_contents = fp.read().strip()
|
git_state = fp.read().strip().split(':')[1].strip()
|
||||||
if re.search('^[a-fA-F0-9]{40}$', head_contents):
|
|
||||||
git_head_path = os.path.join(builder.sourcePath, '.git', 'HEAD')
|
git_head_path = os.path.join(builder.sourcePath, '.git', git_state)
|
||||||
else:
|
if not os.path.exists(git_head_path):
|
||||||
git_state = fp.read().strip().split(':')[1].strip()
|
git_head_path = os.path.join(builder.sourcePath, '.git', 'HEAD')
|
||||||
git_head_path = os.path.join(builder.sourcePath, '.git', git_state)
|
|
||||||
if not os.path.exists(git_head_path):
|
|
||||||
git_head_path = os.path.join(builder.sourcePath, '.git', 'HEAD')
|
|
||||||
|
|
||||||
sources = [
|
sources = [
|
||||||
os.path.join(builder.sourcePath, 'product.version'),
|
os.path.join(builder.sourcePath, 'product.version'),
|
||||||
|
|
||||||
# This is a hack, but we need some way to only run this script when Git changes.
|
# This is a hack, but we need some way to only run this script when HG changes.
|
||||||
git_head_path,
|
git_head_path,
|
||||||
|
|
||||||
# The script source is a dependency, of course...
|
# The script source is a dependency, of course...
|
||||||
|
|
Loading…
Reference in New Issue
Block a user