diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-02-15 11:19:08 -0500 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-02-16 15:23:00 -0500 |
commit | f06ae104dc3caf9b4ff01a0b2d49b09ace88faad (patch) | |
tree | 488669992e6d375450e18a2c92659be3f93f7a88 /contrib | |
parent | 5e29fdffd2f72212d699316f9b27e1bf9d6c715c (diff) |
Some cleanup and copyright updating
* update some copyrights for 2013
* cleaned up some comments/ifdefs, indentation
* some spelling corrections
* add some missing makefiles
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/configure-in-place | 16 | ||||
-rwxr-xr-x | contrib/mac-build | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/contrib/configure-in-place b/contrib/configure-in-place index 9da584d36..81517cfe4 100755 --- a/contrib/configure-in-place +++ b/contrib/configure-in-place @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash -ex # # configure-in-place # Morgan Deters <mdeters@cs.nyu.edu> for CVC4 -# Copyright (c) 2010, 2011 The CVC4 Project +# Copyright (c) 2010-2013 The CVC4 Project # # usage: configure-in-place [ arguments... ] # @@ -10,9 +10,9 @@ # should be invoked). # -if [ -e .svn ]; then +if [ -e .git ] && ! [ x"$1" = x-f ]; then echo - echo "DO NOT USE THIS IN SUBVERSION WORKING DIRECTORIES!" + echo "DO NOT USE THIS IN GIT WORKING DIRECTORIES!" echo echo "You might accidentally commit Makefiles in the source directories" echo "improperly, since they exist in the source directory for" @@ -21,6 +21,10 @@ if [ -e .svn ]; then exit 1 fi +if [ x"$1" = x-f ]; then + shift +fi + ./configure "$@" -. builds/current -builds/$(CURRENT_BUILD)/config.status +CURRENT_BUILD="$(grep '^CURRENT_BUILD *= *' builds/current | awk 'BEGIN {FS=" *= *"} {print$2}')" +builds/$CURRENT_BUILD/config.status diff --git a/contrib/mac-build b/contrib/mac-build index 834191a0c..2501b667d 100755 --- a/contrib/mac-build +++ b/contrib/mac-build @@ -16,6 +16,7 @@ if [ $# -ne 0 ]; then echo "MacPorts must be installed (but this script installs prerequisite port" >&2 echo "packages for CVC4). If this script is successful, it prints a configure" >&2 echo "line that you can use to configure CVC4." >&2 + exit 1 fi function reporterror { |