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 ;-) > > git clone git://anongit.freedesktop.org/libreoffice/bootstrap libo > cd libo/ > git checkout -b rip-build-repo origin/rip-build-repo > > ./autogen.sh [flags that you normally use in rawbuild/] > ./g clone > ./download > make > make dev-install > > [./g is there in toplevel, but can be in bin/, I am not sure what is > more convenient for you?] > > How does it look like? The repos are again in a clone/ subdir, but this > time, they are linked to the bootstrap toplevel (libo/ in the example > above), so you 'feel' like having everything at hand. 'g' works both on > bootstrap and the repos in clone/, so you don't need to do "git > something && g something" any more, one "g something" is enough. > > It is not ready for integration yet, TODOs: > > - ./autogen.sh should work without params for most uses (ie. default to > the same values as ./autogen.sh in the build repo does) > - this means tweaking the default values according to the > distro-config/LibreOffice*.conf.in > > - ./g clone should be called in ./download, when necessary
Kendy, I did the following change to make it work for me 1/ the change on ooo.lst are due to the fact that only bootstrap got branched... and some changed occured on master that required new tarball) 2/ the others change is because bootstrap was trying to run fetch_tarball.sh, but that is what you renamed download (and I added the clone while I was at it :-) ) Ok to push ? diff --git a/bootstrap.1 b/bootstrap.1 index 156f562..68ed695 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -80,5 +80,7 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl" # fetch or update external tarballs if [ "$DO_FETCH_TARBALLS" = "yes" ]; then - $SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst + ( + cd $SRC_ROOT && ./download + ) fi diff --git a/download b/download index e2f0340..d3c93ab 100755 --- a/download +++ b/download @@ -26,6 +26,10 @@ # #************************************************************************* +if [ ! -d clone ] ; then + ./g clone +fi + if [ -z "$TARFILE_LOCATION" ]; then . ./*.Set.sh fi diff --git a/ooo.lst b/ooo.lst index 59b247f..802a85a 100644 --- a/ooo.lst +++ b/ooo.lst @@ -77,11 +77,9 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz -http://download.go-oo.org/SRC680 -799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz -db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz -http://download.go-oo.org/libwpd -64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz +5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 +86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2 +9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 http://download.go-oo.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll http://www.numbertext.org/linux diff --git a/set_soenv.in b/set_soenv.in index a83c29b..a7dc52c 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -2154,7 +2154,6 @@ if ( $Warning ne "" ) print "*********************************************************". "******************* $newline"; -print "\nTo download the build dependencies, issue:\n./g clone\n./download\n\n"; print "To build, issue:\nmake\n\n"; print "For the developer installation, issue:\nmake dev-install\n\n"; > > Let me know if you actually prefer to have it integrated ~now, it should > not interfere with the build/ repo in general, and would allow/pressure > others to help me fix the above mentioned TODOs :-) > > Regards, > Kendy > > _______________________________________________ > 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