I guess Bjoern knows most about this, adding him to cc list, think he is
on vacation now but surely will look when he gets back
Noel
On 10/08/11 22:56, 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
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
