Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
Hi Norbert, On 2010-11-23 at 01:55 -0600, Norbert Thiebaud wrote: I built it on Windows too. The only issue I've encountered is that the initial autogen.sh run checks for presence of certain dll files in the external module, and it fails because the external module was not there. The solution was to run g clone first, then run autogen.sh. Argh, that is annoying. I managed to hide the git clone and the ./download step into the make but you can't make before autogen... chicken and egg thing... Any possibility to postpone these check or only do them if the autogen option says --with-system for these dll (i'm guessing here), with the understanding that if you are using the 'built-in' ones they will pulled in ? I am trying to move the checks to the download script for now, but the killer feature would be to use http://kegel.com/wine/winetricks directly, for the download of the pieces ;-) - I'll check if I can do that in one step, or if it'll be really easier to postpone the checks now, and focus on the winetricks usage later. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
On Mon, Nov 22, 2010 at 8:48 PM, Kohei Yoshida kyosh...@novell.com wrote: On Sat, 2010-11-20 at 18:40 -0500, Norbert Thiebaud wrote: On Thu, Nov 18, 2010 at 10:18 PM, Jan Holesovsky ke...@suse.cz wrote: Hi, In case you are interested to try to build without the 'build' repo (the rawbuild/ way), you can try to get the feature/rip-build-repo branch which I hope is going to become the 'official' way of building soon ;-) btw, I got it working on MacOS I built it on Windows too. The only issue I've encountered is that the initial autogen.sh run checks for presence of certain dll files in the external module, and it fails because the external module was not there. The solution was to run g clone first, then run autogen.sh. Argh, that is annoying. I managed to hide the git clone and the ./download step into the make but you can't make before autogen... chicken and egg thing... Any possibility to postpone these check or only do them if the autogen option says --with-system for these dll (i'm guessing here), with the understanding that if you are using the 'built-in' ones they will pulled in ? -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ 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
Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
kendy, here are the patches I have so far on the rip-build-repo branch 0001: the sed to remove bootstrap from the git url and replace it by one of the other repos name didn't work on MacOS... I was too lazy to figure-out why, so I used bash varaible substitution instead :-) 0002: the ./dowmload script in bootstrap is actually what the old fetch_tarball.sh used to be. so bootstrap need now to call the former, since the later doesn't exist anymore 0003: have the download script call g clone when the 'clone' directory does not exist. 0002+0003 combined means that 'make' after autogen.sh is all that is needed. make will call ./bootstrap, which will do the g clone and donwload. 0004: modify the instruction displayed at the end of autogen to reflect the changes introduced by 0002+0003 0005: Not strictly necessary for the purpose of this branch: added a bin directory in bootstrap and a few script to implement the creation of alternate workdir. This is basically transposing to the 'bootstrap' build method, the scrips described by kohei in his blog. in more details: git-new-workdir is a copy of the one that was found in the build repo. this is there to provide a fallback in case the local git install does not have it git-ps1 is a script that return the name of the current branch. repo-list contains the list of the repo (excluding bootstrap). this is to centralized this list and avoid having to maintain it at multiple place in these utility scrips. (I need to modify g to use that file) mkworkdir: is a script to create a workdir, derived from kohei script. I adapted it to the bootstrap build, and changed the arguments to allow for default value when sensible. (for instance: the source git to use is derived from the working directory, if you are in a bootstrap git repo. the target directory can be omitted if a specific environment variable has been set otherwise. I also added the ability to use a name other than the branch name for the name of the workdir. not finished yet but in progress: a tinbuild/buildbot scrip adapted to a bootstrap build. Norbert 0001-Make-the-determination-of-the-remote-repo-url-work-o.patch Description: Binary data 0002-in-the-bootstrap-based-build-fetch_tarball-is-rea.patch Description: Binary data 0003-make-the-download-step-clone-the-others-git-repos.patch Description: Binary data 0004-correct-the-instructions-.-download-and-.-g-clone-ar.patch Description: Binary data 0005-add-some-utility-scripts-to-create-new-workdir.patch Description: Binary data 0006-adjust-.gitignore-for-bootstrap-build.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
On Thu, Nov 18, 2010 at 10:18 PM, Jan Holesovsky ke...@suse.cz wrote: Hi, In case you are interested to try to build without the 'build' repo (the rawbuild/ way), you can try to get the feature/rip-build-repo branch which I hope is going to become the 'official' way of building soon ;-) btw, I got it working on MacOS Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
Hi Sebastian, On 2010-11-19 at 08:41 +0100, Sebastian Spaeth wrote: In case you are interested to try to build without the 'build' repo (the rawbuild/ way), you can try to get the feature/rip-build-repo branch which I hope is going to become the 'official' way of building soon ;-) git clone git://anongit.freedesktop.org/libreoffice/bootstrap libo cd libo/ git checkout -b rip-build-repo origin/rip-build-repo git checkout -b rip-build-repo origin/feature/rip-build-repo ./autogen.sh [flags that you normally use in rawbuild/] ./g clone BTW, this doesn't work right yet ? Or is it some git failure ./g clone = artwork = Initialized empty Git repository in /media/lo/artwork/.git/ fatal: The remote end hung up unexpectedly ./g: line 202: cd: /media/lo/clone/artwork: No such file or directory Sorry for that, fixed now. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo
On Fri, 19 Nov 2010 04:18:46 +0100, Jan Holesovsky wrote: In case you are interested to try to build without the 'build' repo (the rawbuild/ way), you can try to get the feature/rip-build-repo branch which I hope is going to become the 'official' way of building soon ;-) Very cool, I look forward to switching to this very soon, to get one canonical way of building. Personally, I would be very much in favor of doing ./g clone and ./download automatically if they haven't been done, as part of the make. This is the sequence that I intuitively (naively?) expect to work: ./autogen ./make ./make check ./make install We can always have a --disable-downloads switch that one can turn on if he wants a true ofline mode. Sebastian P.S. I don't like to clutter top-level dirs and would be in favor of keeping it as bin/g, but that's a minor issue. pgplR4MviFsbn.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
