You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/09/06 22:27:32 UTC
[1/2] git commit: ci: fix configure path for out of tree builds
Updated Branches:
refs/heads/master 9cc51385e -> 9a7e6caa7
ci: fix configure path for out of tree builds
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9a7e6caa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9a7e6caa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9a7e6caa
Branch: refs/heads/master
Commit: 9a7e6caa7007133ccef8afd54f50f8e364016351
Parents: e172ba1
Author: James Peach <jp...@apache.org>
Authored: Fri Sep 6 13:27:18 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Sep 6 13:27:25 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a7e6caa/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index e5c7f01..6db5bde 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -35,7 +35,7 @@
- shell: |
cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
export DEB_BUILD_HARDENING
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
make -j2 V=1
make check
make install
@@ -59,7 +59,7 @@
export CXX=clang++
export CXXFLAGS="-Qunused-arguments -std=c++11"
export WITH_LIBCPLUSPLUS=yes
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
make -j2 V=1
make check
make install
@@ -81,7 +81,7 @@
autoreconf -fi
- shell: |
cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_DEBUG
+ "${WORKSPACE}"/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_DEBUG
gmake -j2 V=1
gmake check
gmake install
@@ -109,7 +109,7 @@
export CXXFLAGS=-m64
export CPPFLAGS=-I/opt/omni/include
export LDFLAGS="-L/opt/omni/lib/amd64 -R/opt/omni/lib/amd64"
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
gmake -j2 V=1
gmake check
gmake install
Re: [2/2] git commit: ci: always build out of tree
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> ci: always build out of tree
Good idea!
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
[2/2] git commit: ci: always build out of tree
Posted by jp...@apache.org.
ci: always build out of tree
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e172ba1d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e172ba1d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e172ba1d
Branch: refs/heads/master
Commit: e172ba1db1338c2198e93901c32a4fe4d3f70da8
Parents: 9cc5138
Author: James Peach <jp...@apache.org>
Authored: Thu Sep 5 09:06:05 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Sep 6 13:27:25 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 48 +++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e172ba1d/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index cae3da1..e5c7f01 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -29,18 +29,20 @@
builders:
- shell: |
git clean -d -f -x -q
+ mkdir -p "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
mkdir -p "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
autoreconf -fi
- shell: |
+ cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
export DEB_BUILD_HARDENING
./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- - shell: make -j2 V=1
- - shell: make check
- - shell: make install
- - shell: |
+ make -j2 V=1
+ make check
+ make install
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
- - shell: make distclean
+ make distclean
- shell: |
+ rm -rf "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
- builder:
@@ -48,21 +50,23 @@
builders:
- shell: |
git clean -d -f -x -q
+ mkdir -p "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
mkdir -p "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
autoreconf -fi
- shell: |
+ cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
export CC=clang
export CXX=clang++
export CXXFLAGS="-Qunused-arguments -std=c++11"
export WITH_LIBCPLUSPLUS=yes
./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- - shell: make -j2 V=1
- - shell: make check
- - shell: make install
- - shell: |
+ make -j2 V=1
+ make check
+ make install
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
- - shell: make distclean
+ make distclean
- shell: |
+ rm -rf "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
# XXX if we can pass down a $MAKE environment variable from the project, then we can
@@ -73,16 +77,18 @@
- shell: |
git clean -d -f -x -q
mkdir -p "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
+ mkdir -p "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
autoreconf -fi
- shell: |
+ cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_DEBUG
- - shell: gmake -j2 V=1
- - shell: gmake check
- - shell: gmake install
- - shell: |
+ gmake -j2 V=1
+ gmake check
+ gmake install
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
- - shell: gmake distclean
+ gmake distclean
- shell: |
+ rm -rf "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
- builder:
@@ -91,8 +97,10 @@
- shell: |
git clean -d -f -x -q
mkdir -p "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
+ mkdir -p "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
autoreconf -fi
- shell: |
+ cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
export PATH=/sbin:~/bin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/omni/bin:/opt/gcc-4.6.3/bin/:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin:/usr/dt/bin:/usr/openwin/bin
export CC=/opt/gcc-4.6.3/bin/gcc
export CXX=/opt/gcc-4.6.3/bin/g++
@@ -102,14 +110,14 @@
export CPPFLAGS=-I/opt/omni/include
export LDFLAGS="-L/opt/omni/lib/amd64 -R/opt/omni/lib/amd64"
./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- - shell: gmake -j2 V=1
- - shell: gmake check
- - shell: gmake install
- - shell: |
+ gmake -j2 V=1
+ gmake check
+ gmake install
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
- - shell: gmake distclean
+ gmake distclean
- shell: |
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
+ rm -rf "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
- job-template:
name: '{node}-{branch}-{tag}-regression'