Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index 

Patches licensed under LGPLv3+/MPL 1.1 ( or what ever Bjoern Michaelsen prefers :-) )


A series of 7 suggested patches to fix some bugs and migrate to One Git in Bjoern Michaelsen 
Jenkins Continuous Integration Serversetup found in contrib/dev-tools/ubuntu-jenkins

Patch descriptions:
---------------------------------------------------------------------------------------------------
0001-Bugfix-Prevent-redundant-tarfile-downloads.patch

Bugfix: Prevent redundant tarfile downloads.

'./download' sources 'Env.Host.sh', not 'LinuxX86-64Env.Set.sh',so we must add
'set_tarfile_location.sh' to 'Env.Host.sh' after first './autogen.sh' run.
I speculate if this is an artifact of the cloning from the master and "down-branching"
to 3-4 !!!? - Maybe ./download should be called after the second autogen.sh though I
can't yet see through the consequences of that?

---------------------------------------------------------------------------------------------------
0002-Bugfix-x86-processor-architecture-agnostic.patch

Bugfix: x86 processor architecture agnostic.

Checks if 2nd. run of 'autogen.sh' has generated 'LinuxX86Env.Set.sh' or
'LinuxX86-64Env.Set.sh' and use the appropriate one.

---------------------------------------------------------------------------------------------------
0003-Bugfix-Using-the-new-Env.Host.sh-in-libreoffice-mast.patch

Bugfix: Using the new 'Env.Host.sh' in libreoffice-master instead of hardcoding 
'LinuxX86-64Env.Set.sh'

---------------------------------------------------------------------------------------------------
0004-Bugfix-libreoffice-master-job-needs-a-make-before-ma.patch

Bugfix: 'libreoffice-master' job needs a 'make' before 'make dev-install'

'dev-install' has dependencies to the 'all' target but it's not reflected in the
lo-root makefile.

---------------------------------------------------------------------------------------------------
0005-Migrate-to-One-Git-keep-possibility-for-3-4-build.patch

Migrate to One Git, keep possibility for 3-4 build.

- Cloning from 'repo-mirror/core.git' for 'libreoffice-master'.
- Cloning from 'repo-mirror-pre-one-git/bootstrap.git' for 'libreoffice-3-4'.
- Adding a 'repo-mirror-pre-one-git' to still support the 'libreoffice-3-4' job
- Disable cron schedule for the new (old) 'repo-mirror-pre-one-git'.

Adding 2 repo-mirrors to support both the new master and the 'libreoffice-3-4'
seems a bit unnecessary, but as I understand from asking on #libreoffice-dev
the new one-git master can't be used to checkout libreoffice.3.4.
Also tried a './g checkout libreoffice-3-4' on the new one-git repo
Output: "error: pathspec 'libreoffice-3-4' did not match any file(s) known to git."

A solution might be to only mirror the old locked remote master gits and locally use
the onegit.sh conversion script located in
'anongit.freedesktop.org/libreoffice/contrib/dev-tools/onegit' to create a new
copy and then 'git fetch --all --tags' to update it to the newest?

---------------------------------------------------------------------------------------------------
0006-Using-the-JENKINS_HOME-variable.patch

Using the ${JENKINS_HOME} variable

Using the ${JENKINS_HOME} variable instead of hardcoding to the '~/.jenkins' path
This commit sets up an easier transition to a more generalized install procedure
see: https://wiki.jenkins-ci.org/display/JENKINS/Winstone
and https://wiki.jenkins-ci.org/display/JENKINS/Administering+Jenkins
for the ${JENKINS_HOME} variable

---------------------------------------------------------------------------------------------------
0007-Install-Jenkins-in-current-dir-instead-of-.jenkins.patch

Install Jenkins in current dir in stead of ~/.jenkins

Let Jenkins be installed in current dir instead of force to '~/.jenkins'
'setup-ubuntu-jenkins.sh' now creates a 'start-lo-jenkins.sh' with the appropriate startup arguments

---------------------------------------------------------------------------------------------------

TODO:
- Add the ccache lines to './autogen.sh' command line instead of concatenating to 
'XEnv.Set.sh/Env.Host.sh'
- Let installer choose between installing Jenkins default dir ('~/.jenkins') or current dir.



--Henrik Jensen
(HenrikJ on #libreoffice-dev)
From f82ffb467f01f23adc1a6afc348790108d8b6ada Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 20:40:08 +0200
Subject: [PATCH 1/7] Bugfix: Prevent redundant tarfile downloads.

'./download' sources 'Env.Host.sh', not 'LinuxX86-64Env.Set.sh',so we must add
'set_tarfile_location.sh' to 'Env.Host.sh' after first './autogen.sh' run.
I speculate if this is an artifact of the cloning from the master and "down-branching"
to 3-4 !!!? - Maybe ./download should be called after the second autogen.sh though I
can't yet see through the consequences of that?
---
 ubuntu-jenkins/jobs/libreoffice-3-4/config.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
index abd9ffe..dad2f93 100644
--- a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
@@ -17,7 +17,7 @@
 [ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/bootstrap.git ${WORKSPACE}
 git pull
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; LinuxX86-64Env.Set.sh
+cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
 ./download
 ./g checkout libreoffice-3-4
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-- 
1.7.4.1


From b90cbb4e59e735974c074584ee2f63750256dbed Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 20:49:28 +0200
Subject: [PATCH 2/7] Bugfix: x86 processor architecture agnostic.

Checks if 2nd. run of 'autogen.sh' has generated 'LinuxX86Env.Set.sh' or
'LinuxX86-64Env.Set.sh' and use the appropriate one.
---
 ubuntu-jenkins/jobs/libreoffice-3-4/config.xml |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
index dad2f93..7cfb07c 100644
--- a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
@@ -21,18 +21,24 @@ cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
 ./download
 ./g checkout libreoffice-3-4
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; LinuxX86-64Env.Set.sh
-echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; LinuxX86-64Env.Set.sh
-echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; LinuxX86-64Env.Set.sh
-echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; LinuxX86-64Env.Set.sh
+if [ -e LinuxX86Env.Set.sh ]
+then
+  ENV_SET_SH=LinuxX86Env.Set.sh
+else
+  ENV_SET_SH=LinuxX86-64Env.Set.sh
+fi
+cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; $ENV_SET_SH
+echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; $ENV_SET_SH
+echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; $ENV_SET_SH
+echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; $ENV_SET_SH
 ./g stash save
 ./g pull -r
 ./g -f stash pop
 ./g branch -v
 #./g --set-push-user YOURUSERNAMEHERE
-. $WORKSPACE/LinuxX86-64Env.Set.sh &amp;&amp; cd $SOLARSRC/instsetoo_native &amp;&amp; 
$SOLARENV/bin/build.pl --all -P4 -- -P4
-. $WORKSPACE/LinuxX86-64Env.Set.sh &amp;&amp; cd $SOLARSRC/smoketestoo_native &amp;&amp; dmake 
localinstall
-. $WORKSPACE/LinuxX86-64Env.Set.sh &amp;&amp; cd $WORKSPACE &amp;&amp; 
$SOLARENV/bin/subsequenttests -j10 -l9 -k
+. $WORKSPACE/$ENV_SET_SH &amp;&amp; cd $SOLARSRC/instsetoo_native &amp;&amp; 
$SOLARENV/bin/build.pl --all -P4 -- -P4
+. $WORKSPACE/$ENV_SET_SH &amp;&amp; cd $SOLARSRC/smoketestoo_native &amp;&amp; dmake localinstall
+. $WORKSPACE/$ENV_SET_SH &amp;&amp; cd $WORKSPACE &amp;&amp; $SOLARENV/bin/subsequenttests -j10 
-l9 -k
 </command>
     </hudson.tasks.Shell>
   </builders>
-- 
1.7.4.1


From 8a53985b28333b956e7c280564b4f05bd0ed6f11 Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 20:57:27 +0200
Subject: [PATCH 3/7] Bugfix: Using the new 'Env.Host.sh' in libreoffice-master instead of 
hardcoding 'LinuxX86-64Env.Set.sh'

---
 ubuntu-jenkins/jobs/libreoffice-master/config.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ubuntu-jenkins/jobs/libreoffice-master/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
index b75b187..12bce8d 100644
--- a/ubuntu-jenkins/jobs/libreoffice-master/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
@@ -17,18 +17,18 @@
 [ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/bootstrap.git ${WORKSPACE}
 git pull
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; LinuxX86-64Env.Set.sh
-echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; LinuxX86-64Env.Set.sh
-echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; LinuxX86-64Env.Set.sh
-echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; LinuxX86-64Env.Set.sh
+cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
+echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; Env.Host.sh
+echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; Env.Host.sh
+echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; Env.Host.sh
 ./download
 ./g stash save
 ./g pull -r
 ./g -f stash pop
 ./g branch -v
 #./g --set-push-user YOURUSERNAMEHERE
-. $WORKSPACE/LinuxX86-64Env.Set.sh &amp;&amp; make dev-install
-. $WORKSPACE/LinuxX86-64Env.Set.sh &amp;&amp; make subsequentcheck -j5 -k -f 
$WORKSPACE/GNUmakefile.mk
+. $WORKSPACE/Env.Host.sh &amp;&amp; make dev-install
+. $WORKSPACE/Env.Host.sh &amp;&amp; make subsequentcheck -j5 -k -f $WORKSPACE/GNUmakefile.mk
 </command>
     </hudson.tasks.Shell>
   </builders>
-- 
1.7.4.1


From d95b62971b55046f0e3fc91f29f6e622d9cfc5e4 Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 21:04:42 +0200
Subject: [PATCH 4/7] Bugfix: 'libreoffice-master' job needs a 'make' before 'make dev-install'

'dev-install' has dependencies to the 'all' target but it's not reflected in the
lo-root makefile.
---
 ubuntu-jenkins/jobs/libreoffice-master/config.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ubuntu-jenkins/jobs/libreoffice-master/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
index 12bce8d..14e6ca0 100644
--- a/ubuntu-jenkins/jobs/libreoffice-master/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
@@ -27,6 +27,7 @@ echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; Env.H
 ./g -f stash pop
 ./g branch -v
 #./g --set-push-user YOURUSERNAMEHERE
+. $WORKSPACE/Env.Host.sh &amp;&amp; make
 . $WORKSPACE/Env.Host.sh &amp;&amp; make dev-install
 . $WORKSPACE/Env.Host.sh &amp;&amp; make subsequentcheck -j5 -k -f $WORKSPACE/GNUmakefile.mk
 </command>
-- 
1.7.4.1


From 4a2cb41e4efe3dfa02d6ee010b9de0f2179ee24b Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 21:31:31 +0200
Subject: [PATCH 5/7] Migrate to One Git, keep possibility for 3-4 build.

- Cloning from 'repo-mirror/core.git' for 'libreoffice-master'.
- Cloning from 'repo-mirror-pre-one-git/bootstrap.git' for 'libreoffice-3-4'.
- Adding a 'repo-mirror-pre-one-git' to still support the 'libreoffice-3-4' job
- Disable cron schedule for the new (old) 'repo-mirror-pre-one-git'.

Adding 2 repo-mirrors to support both the new master and the 'libreoffice-3-4'
seems a bit unnecessary, but as I understand from asking on #libreoffice-dev
the new one-git master can't be used to checkout libreoffice.3.4.
Also tried a './g checkout libreoffice-3-4' on the new one-git repo
Output: "error: pathspec 'libreoffice-3-4' did not match any file(s) known to git."

A solution might be to only mirror the old locked remote master gits and locally use
the onegit.sh conversion script located in
'anongit.freedesktop.org/libreoffice/contrib/dev-tools/onegit' to create a new
copy and then 'git fetch --all --tags' to update it to the newest?
---
 ubuntu-jenkins/jobs/libreoffice-3-4/config.xml     |    2 +-
 ubuntu-jenkins/jobs/libreoffice-master/config.xml  |    2 +-
 .../jobs/repo-mirror-pre-one-git/config.xml        |   46 ++++++++++++++++++++
 ubuntu-jenkins/jobs/repo-mirror/config.xml         |    5 +-
 4 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 ubuntu-jenkins/jobs/repo-mirror-pre-one-git/config.xml

diff --git a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
index 7cfb07c..2505682 100644
--- a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
@@ -13,7 +13,7 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>BASEURL=`readlink -f ${WORKSPACE}/../../repo-mirror/workspace/`
+      <command>BASEURL=`readlink -f ${WORKSPACE}/../../repo-mirror-pre-one-git/workspace/`
 [ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/bootstrap.git ${WORKSPACE}
 git pull
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
diff --git a/ubuntu-jenkins/jobs/libreoffice-master/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
index 14e6ca0..71953e7 100644
--- a/ubuntu-jenkins/jobs/libreoffice-master/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
@@ -14,7 +14,7 @@
   <builders>
     <hudson.tasks.Shell>
       <command>BASEURL=`readlink -f ${WORKSPACE}/../../repo-mirror/workspace/`
-[ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/bootstrap.git ${WORKSPACE}
+[ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/core.git ${WORKSPACE}
 git pull
 ./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
 cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
diff --git a/ubuntu-jenkins/jobs/repo-mirror-pre-one-git/config.xml 
b/ubuntu-jenkins/jobs/repo-mirror-pre-one-git/config.xml
new file mode 100644
index 0000000..5ccc2fb
--- /dev/null
+++ b/ubuntu-jenkins/jobs/repo-mirror-pre-one-git/config.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>sync local LibreOffice repositories for 3.4.x versions</description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/usr/bin/env python
+
+import os
+import os.path
+import subprocess
+
+workspace = os.environ[&apos;WORKSPACE&apos;]
+baseurl = &apos;git://anongit.freedesktop.org/libreoffice/&apos;
+repos = [&apos;artwork&apos;, &apos;base&apos;, &apos;bootstrap&apos;, &apos;calc&apos;, 
&apos;components&apos;, &apos;extensions&apos;, &apos;extras&apos;, &apos;filters&apos;, 
&apos;help&apos;, &apos;impress&apos;, &apos;libs-core&apos;, &apos;libs-extern&apos;, 
&apos;libs-extern-sys&apos;, &apos;libs-gui&apos;, &apos;postprocess&apos;, &apos;sdk&apos;, 
&apos;testing&apos;, &apos;ure&apos;, &apos;writer&apos;]
+
+state = []
+for (repo, repodir) in ((repo, os.path.join(workspace, repo+&apos;.git&apos;)) for repo in repos):
+    if os.path.isdir(repodir):
+        os.chdir(repodir)
+        os.system(&apos;git fetch --all --tags&apos;)
+    else:
+       os.mkdir(repodir)       
+        os.system(&apos;git clone --bare --mirror %s%s %s&apos; % (baseurl, repo, repodir))
+    os.chdir(repodir)
+    state.append(&apos;%s:\n&apos; % repo)
+    for line in subprocess.check_output([&apos;git&apos;, &apos;branch&apos;, 
&apos;--verbose&apos;]).split(&apos;\n&apos;):
+        state.append(&apos;    %s\n&apos; % line)
+
+open(os.path.join(workspace, &apos;gitstate.txt&apos;),&apos;w&apos;).writelines(state)
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
+
diff --git a/ubuntu-jenkins/jobs/repo-mirror/config.xml b/ubuntu-jenkins/jobs/repo-mirror/config.xml
index 791d028..c329421 100644
--- a/ubuntu-jenkins/jobs/repo-mirror/config.xml
+++ b/ubuntu-jenkins/jobs/repo-mirror/config.xml
@@ -25,7 +25,7 @@ import subprocess
 
 workspace = os.environ[&apos;WORKSPACE&apos;]
 baseurl = &apos;git://anongit.freedesktop.org/libreoffice/&apos;
-repos = [&apos;artwork&apos;, &apos;base&apos;, &apos;bootstrap&apos;, &apos;calc&apos;, 
&apos;components&apos;, &apos;extensions&apos;, &apos;extras&apos;, &apos;filters&apos;, 
&apos;help&apos;, &apos;impress&apos;, &apos;libs-core&apos;, &apos;libs-extern&apos;, 
&apos;libs-extern-sys&apos;, &apos;libs-gui&apos;, &apos;postprocess&apos;, &apos;sdk&apos;, 
&apos;testing&apos;, &apos;ure&apos;, &apos;writer&apos;]
+repos = [ &apos;core&apos;, &apos;binfilter&apos;, &apos;dictionaries&apos;, &apos;help&apos;, 
&apos;translations&apos;]
 
 state = []
 for (repo, repodir) in ((repo, os.path.join(workspace, repo+&apos;.git&apos;)) for repo in repos):
@@ -46,4 +46,5 @@ open(os.path.join(workspace, &apos;gitstate.txt&apos;),&apos;w&apos;).writelines
   </builders>
   <publishers/>
   <buildWrappers/>
-</project>
\ No newline at end of file
+</project>
+
-- 
1.7.4.1


From 94161f0c10f324236bcca3918af9b47c3c8cb51b Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 21:49:55 +0200
Subject: [PATCH 6/7] Using the ${JENKINS_HOME} variable

Using the ${JENKINS_HOME} variable instead of hardcoding to the '~/.jenkins' path
This commit sets up an easier transition to a more generalized install procedure
see: https://wiki.jenkins-ci.org/display/JENKINS/Winstone
and https://wiki.jenkins-ci.org/display/JENKINS/Administering+Jenkins
for the ${JENKINS_HOME} variable
---
 ubuntu-jenkins/jobs/libreoffice-3-4/config.xml    |    8 ++++----
 ubuntu-jenkins/jobs/libreoffice-master/config.xml |    4 ++--
 ubuntu-jenkins/jobs/tarfiles/config.xml           |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
index 2505682..b1981ac 100644
--- a/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-3-4/config.xml
@@ -16,18 +16,18 @@
       <command>BASEURL=`readlink -f ${WORKSPACE}/../../repo-mirror-pre-one-git/workspace/`
 [ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/bootstrap.git ${WORKSPACE}
 git pull
-./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
+./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${JENKINS_HOME}/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
+cat ${JENKINS_HOME}/set_tarfile_location.sh &gt;&gt; Env.Host.sh
 ./download
 ./g checkout libreoffice-3-4
-./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
+./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${JENKINS_HOME}/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
 if [ -e LinuxX86Env.Set.sh ]
 then
   ENV_SET_SH=LinuxX86Env.Set.sh
 else
   ENV_SET_SH=LinuxX86-64Env.Set.sh
 fi
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; $ENV_SET_SH
+cat ${JENKINS_HOME}/set_tarfile_location.sh &gt;&gt; $ENV_SET_SH
 echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; $ENV_SET_SH
 echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; $ENV_SET_SH
 echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; $ENV_SET_SH
diff --git a/ubuntu-jenkins/jobs/libreoffice-master/config.xml 
b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
index 71953e7..62c4bf7 100644
--- a/ubuntu-jenkins/jobs/libreoffice-master/config.xml
+++ b/ubuntu-jenkins/jobs/libreoffice-master/config.xml
@@ -16,8 +16,8 @@
       <command>BASEURL=`readlink -f ${WORKSPACE}/../../repo-mirror/workspace/`
 [ -d ${WORKSPACE}/.git ] || git clone ${BASEURL}/core.git ${WORKSPACE}
 git pull
-./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${HOME}/.jenkins/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
-cat ${HOME}/.jenkins/set_tarfile_location.sh &gt;&gt; Env.Host.sh
+./autogen.sh --disable-mozilla --disable-binfilter --with-junit=${JENKINS_HOME}/junit-4.9b2.jar 
--with-num-cpus=4 --with-max-jobs=4
+cat ${JENKINS_HOME}/set_tarfile_location.sh &gt;&gt; Env.Host.sh
 echo &apos;export CC=&quot;ccache gcc&quot;&apos; &gt;&gt; Env.Host.sh
 echo &apos;export CXX=&quot;ccache g++&quot;&apos; &gt;&gt; Env.Host.sh
 echo &quot;export CCACHE_BASEDIR=\&quot;${WORKSPACE}\&quot;&quot; &gt;&gt; Env.Host.sh
diff --git a/ubuntu-jenkins/jobs/tarfiles/config.xml b/ubuntu-jenkins/jobs/tarfiles/config.xml
index 72986b1..a887b4b 100644
--- a/ubuntu-jenkins/jobs/tarfiles/config.xml
+++ b/ubuntu-jenkins/jobs/tarfiles/config.xml
@@ -13,9 +13,9 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>echo &quot;export TARFILE_LOCATION=\&quot;${WORKSPACE}\&quot;&quot; &gt; 
${HOME}/.jenkins/set_tarfile_location.sh</command>
+      <command>echo &quot;export TARFILE_LOCATION=\&quot;${WORKSPACE}\&quot;&quot; &gt; 
${JENKINS_HOME}/set_tarfile_location.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers/>
-</project>
\ No newline at end of file
+</project>
-- 
1.7.4.1


From 26abe195b3b35979823d4ea9442d1ef8a48076e9 Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Wed, 10 Aug 2011 21:55:13 +0200
Subject: [PATCH 7/7] Install Jenkins in current dir instead of ~/.jenkins

A 'jenkins' dir is created where the ubuntu-jenkins is installed.
'setup-ubuntu-jenkins.sh' now creates a 'start-lo-jenkins.sh' with the appropriate startup arguments

TODO:
- Let installer choose between installing Jenkins default dir ('~/.jenkins') or current dir.
---
 ubuntu-jenkins/setup-ubuntu-jenkins.sh |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ubuntu-jenkins/setup-ubuntu-jenkins.sh b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
index 9f0e968..fc7f242 100755
--- a/ubuntu-jenkins/setup-ubuntu-jenkins.sh
+++ b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 set -e
-mkdir ${HOME}/.jenkins
-cd ${HOME}/.jenkins
+mkdir jenkins
+cd jenkins
 wget http://mirrors.jenkins-ci.org/war/latest/jenkins.war
 wget --no-check-certificate https://github.com/downloads/KentBeck/junit/junit-4.9b2.jar
 git clone git://anongit.freedesktop.org/libreoffice/contrib/dev-tools dev-tools
 mv dev-tools/ubuntu-jenkins/jobs jobs
 rm -rf dev-tools
+cd ..
+echo "#!bin/sh" > start-lo-jenkins.sh
+echo "java -DJENKINS_HOME=$(pwd)/jenkins -jar $(pwd)/jenkins/jenkins.war">> start-lo-jenkins.sh
+chmod u+x start-lo-jenkins.sh
 echo "done."
-echo "You can start your LibreOffice Ubuntu Jenkins server with: java -jar ~/.jenkins/jenkins.war"
+echo "You can start your LibreOffice Ubuntu Jenkins server with: $(pwd)/start-lo-jenkins.sh"
 echo "It will then be running at http://localhost:8080";
+
-- 
1.7.4.1

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.