summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2014-06-02 11:30:11 +0000
committerDamien Doligez <damien.doligez-inria.fr>2014-06-02 11:30:11 +0000
commit2c67f4f75550ae82c85cf2d6b4593bcd912f7dd9 (patch)
treea85f818878eb85c3d84db5fc515dd57ad3c0cd69
parent45473851e8b5766d870ceda498a5270070c27d07 (diff)
tools/ci-build: add possibility of changing directory on unix-like architectures
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14940 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rwxr-xr-xtools/ci-build8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/ci-build b/tools/ci-build
index de96090eb..814ffdab7 100755
--- a/tools/ci-build
+++ b/tools/ci-build
@@ -16,7 +16,9 @@
# arguments:
# 1. architecture: bsd, macos, linux, cygwin, mingw, mingw64, msvc, msvc64
-# 2. for windows, directory in which to build (trunk, 4.02, etc)
+# 2. directory in which to build (trunk, 4.02, etc)
+# for windows, this is relative to $HOME/jenkins-workspace
+# for bsd, macos, linux, this is "." or an absolute directory
# 3. options:
# -conf configure-option
# -patch1 file-name apply patch with -p1
@@ -75,7 +77,7 @@ done
# default values
make=make
instdir="$HOME/ocaml-tmp-install"
-workdir=.
+workdir="$branch"
docheckout=false
nt=
@@ -83,7 +85,7 @@ case "$arch" in
bsd)
make=gmake
;;
- macos) ;; # FIXME to be checked
+ macos) ;;
linux) ;;
cygwin)
workdir="$HOME/jenkins-workspace/$branch"