Re: [Libreoffice] [PATCH] Series of fixes and migration to One Git for contrib/dev-tools/ubuntu-jenkins

A few more suggested patches to 'setup-ubuntu-jenkins.sh'

( committed to local clone after  0007-Install-Jenkins-in-current-dir-instead-of-.jenkins.patch
so I guess they are dependent )

Patch descriptions:
---------------------------------------------------------------------------------------------------
0001-Add-install-path-to-cmdln.-args.patch:
Add install path to cmdln. args.

Per default installs in ~/.jenkins or the path added to the command line
of setup-ubuntu-jenkins.sh

---------------------------------------------------------------------------------------------------
0002-Add-simple-instructions-for-h-help.patch:
Add simple instructions for -h/--help

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

--Henrik Jensen
(HenrikJ on #libreoffice-dev)

On Wed, 2011-08-10 at 22:56 +0100, Henrik Jensen wrote:
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)
> _______________________________________________ LibreOffice mailing list 
> LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
From 5830b0fdb689e01c622bb10c29aba21985e9da2d Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Fri, 12 Aug 2011 12:41:44 +0200
Subject: [PATCH 1/2] Add install path to cmdln. args.

Per default installs in ~/.jenkins or the path added to the command line
of setup-ubuntu-jenkins.sh
---
 ubuntu-jenkins/setup-ubuntu-jenkins.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ubuntu-jenkins/setup-ubuntu-jenkins.sh b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
index fc7f242..ae187ab 100755
--- a/ubuntu-jenkins/setup-ubuntu-jenkins.sh
+++ b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 set -e
-mkdir jenkins
-cd jenkins
+instdir=${1:-~/.jenkins}
+mkdir -p "$instdir"
+cd "$instdir"
 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
+echo "java -DJENKINS_HOME=$(pwd) -jar $(pwd)/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: $(pwd)/start-lo-jenkins.sh"
-- 
1.7.4.1

From cfc231c16a7fd97723726268e7b7003c861ceff0 Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Fri, 12 Aug 2011 14:02:31 +0200
Subject: [PATCH 2/2] Add simple instructions for -h/--help

---
 ubuntu-jenkins/setup-ubuntu-jenkins.sh |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ubuntu-jenkins/setup-ubuntu-jenkins.sh b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
index ae187ab..507cea9 100755
--- a/ubuntu-jenkins/setup-ubuntu-jenkins.sh
+++ b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
@@ -1,5 +1,16 @@
 #!/bin/sh
 set -e
+case "$1" in
+       -h | --help)
+       cat << EOF
+Usage: $(basename "$0") [OPTION]... [PATH]
+Installs Jenkins in PATH if given or defaults to '~/.jenkins'
+
+Options:
+  -h, --help     display this help and exit
+EOF
+       exit 0;;
+esac
 instdir=${1:-~/.jenkins}
 mkdir -p "$instdir"
 cd "$instdir"
-- 
1.7.4.1