From d3e8b9066c583c22064305af5436ba17db6e72a5 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 5 Jun 2014 10:11:38 -0700 Subject: [PATCH] Revert "Merge pull request #29 from xPaw/travis-ci" This reverts commit 17b88584088138b14887e0e8ed30b15a7f0bcb2c, reversing changes made to 0375d6469adca1674f4bda2e38a3fcc6b0304c0e. --- .travis.yml | 11 ----------- support/Versioning | 16 ++++++---------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d023c0e..00000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/support/Versioning b/support/Versioning index 32cc21e4..ea01a5df 100644 --- a/support/Versioning +++ b/support/Versioning @@ -1,6 +1,5 @@ # vim: set ts=8 sts=2 sw=2 tw=99 et ft=python: import os, sys -import re builder.SetBuildFolder('/') @@ -18,19 +17,16 @@ outputs = [ ] with open(os.path.join(builder.sourcePath, '.git', 'HEAD')) as fp: - head_contents = fp.read().strip() - if re.search('^[a-fA-F0-9]{40}$', head_contents): - git_head_path = os.path.join(builder.sourcePath, '.git', 'HEAD') - else: - git_state = fp.read().strip().split(':')[1].strip() - 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') + git_state = fp.read().strip().split(':')[1].strip() + +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 = [ 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, # The script source is a dependency, of course...