diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2009-05-20 16:57:07 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2009-05-20 17:04:25 +0200 |
| commit | 242d125c2c29a67ea66755e001dea5fe106dac0e (patch) | |
| tree | e3c7e46b2d317bf27d010f6875edefb0ab4004ae /Makefile.shared | |
| parent | 14d8bb017b289640db704a06423de5a1906cac00 (diff) | |
Add the possibility to use git to download the up-stream sources.
Renamed the old --with-git ooo-build configure switch to --with-git-managed,
and introduced a new --with-git meaning that git will be used to clone the
up-stream sources in src/clone/* [first time use], or to fetch the latest
tags/branches from there [the rest], considerably reducing the time &
bandwidth needed to get newer milestones.
* Makefile.shared: OOO_GIT -> OOO_GIT_MANAGED.
* bin/piece/unpack-extras: Create a missing directory if needed.
* bin/setup.in: Export OOO_GIT and GITTAG.
* bin/unpack: git checkout/rsync to copy the sources from src/clone to
build/<tag>.
* configure.in: --with-git and --with-git-managed.
* download.in: git clone/fetch to get the latest updates.
* src/.gitignore: Ignore src/clone.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.shared b/Makefile.shared index 40f0079ec..284acb652 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -11,13 +11,13 @@ STAMP_DIR=$(top_builddir)/stamp unpack : $(OOBUILDDIR)/unpack $(top_srcdir)/bin/unpack $(OOBUILDDIR)/unpack : $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true + test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true if test -d $(OOBUILDDIR)/applied_patches ; then \ FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ fi cd $(top_srcdir)/bin ; ./unpack - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true + test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \ $(STAMP_DIR)/artwork.install touch $@ @@ -46,12 +46,12 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ fi $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true + test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true + test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true + test -n "$(OOO_GIT_MANAGED)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true $(TOOLSDIR)/bin/fix-deps $(OOBUILDDIR) rm -f $(STAMP_DIR)/build touch $@ |