A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
aa72529
..
1421468
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-88,6
+88,9
@@
fi
mkdir $WORKSPACE/build
cd $WORKSPACE/build
mkdir $WORKSPACE/build
cd $WORKSPACE/build
+# This is for Windows:
+PATH="$WORKSPACE/build/lib:$PATH"
+
if test "$(uname -o)" != "Msys"; then
echo "XX"
echo "XX Build the archive out of the tree"
if test "$(uname -o)" != "Msys"; then
echo "XX"
echo "XX Build the archive out of the tree"
@@
-100,9
+103,12
@@
if test "$(uname -o)" != "Msys"; then
echo "XX"
echo "XX Open the resulting archive"
echo "XX"
echo "XX"
echo "XX Open the resulting archive"
echo "XX"
- tar xzf `cat VERSION`.tar.gz
+ gunzip `cat VERSION`.tar.gz
+ tar xf `cat VERSION`.tar
cd `cat VERSION`
cd `cat VERSION`
- SRCFOLDER="."
+ mkdir build
+ cd build
+ SRCFOLDER=".."
else
#for windows we don't make dist, but we still want to build out of source
SRCFOLDER=$WORKSPACE
else
#for windows we don't make dist, but we still want to build out of source
SRCFOLDER=$WORKSPACE
@@
-128,7
+134,7
@@
make -j$NUMBER_OF_PROCESSORS VERBOSE=1
if test "$(uname -o)" != "Msys"; then
cd $WORKSPACE/build
if test "$(uname -o)" != "Msys"; then
cd $WORKSPACE/build
- cd `cat VERSION`
+ cd `cat VERSION`
/build
fi
TRES=0
fi
TRES=0