diff options
| author | Jan Nieuwenhuizen <jnieuwenhuizen@novell.com> | 2008-07-23 14:51:54 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <jnieuwenhuizen@novell.com> | 2008-07-23 14:51:54 +0000 |
| commit | 41ad59545bf66562b5819292104ca7f4bf803000 (patch) | |
| tree | 8fc8a0569627b114ce398222b56478f3a5aaca80 /Makefile.shared | |
| parent | 74eca997a104894a2ba8ba73f8169a413d22a1cf (diff) | |
Add --with-git support through bin/gob for working with a simple local repository.
* Makefile.shared:
* configure.in: Add --with-git support through bin/gob for working
with a simple local repository.
* bin/gob: Fix support for --with-git. Do not ignore localize.sdf
files. Support using any [Section] as --distro parameter.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.shared b/Makefile.shared index bf3a02fbc..249e1fdef 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -11,6 +11,7 @@ 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 if test -d $(OOBUILDDIR)/applied_patches ; then \ FLAGS="--distro=$(DISTRO)"; \ if test -d $(OOBUILDDIR)/binfilter ; then \ @@ -37,6 +38,7 @@ $(OOBUILDDIR)/unpack : 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 rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \ $(STAMP_DIR)/artwork.install touch $@ @@ -90,13 +92,14 @@ $(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 FLAGS="--distro=$(DISTRO)"; \ if test -d $(OOBUILDDIR)/binfilter ; then \ FLAGS="$$FLAGS --distro=Binfilter"; \ fi ; \ - if test -d $(OOBUILDDIR)/zlib; then \ - FLAGS="$$FLAGS --distro=System"; \ - fi ; \ + if test -d $(OOBUILDDIR)/zlib; then \ + FLAGS="$$FLAGS --distro=System"; \ + fi ; \ if test -d $(OOBUILDDIR)/sdk_oo ; then \ FLAGS="$$FLAGS --distro=Sdk"; \ fi ; \ @@ -113,7 +116,9 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ FLAGS="$$FLAGS --pieces --distro=Piece"; \ fi ; \ 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 $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) + -test -n "$(OOO_GIT)" && cd $(OOBUILDDIR) && git-commit -am 'Font munging.' $(TOOLSDIR)/bin/fix-deps $(OOBUILDDIR) rm -f $(STAMP_DIR)/build touch $@ |