Skip to content

Commit

Permalink
Don't even try to build or deploy if already done
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://scm.fusionforge.org/srv/svn/fusionforge/trunk@10945 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6
  • Loading branch information
cbayle committed Oct 11, 2010
1 parent ca59e62 commit dadf471
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions Makefile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ cowbuildtest:

cowbuilddeb: # ***** This is the one to cowbuild debian packages ***** #
@for dist in $(DEBIANLIST); do \
echo "$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP='$(DEBIANOP)' HOOK='$(DEBHOOK)'" ; \
$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" HOOK='$(DEBHOOK)' ; \
echo "$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP='$(DEBIANOP)' HOOK='$(DEBHOOK)' LOCALREPO=$(LOCALREPODEB)" ; \
$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" HOOK='$(DEBHOOK)' LOCALREPO=$(LOCALREPODEB) ; \
done

cowbuildubu: # ***** This is the one to cowbuild ubuntu packages ***** #
Expand All @@ -287,7 +287,9 @@ cowbuilddist: cowbuilderenv $(BUILDFILES) $(BUILDRESULT)/$(CHANGEFILE)
pbuilddist: pbuilderenv $(BUILDFILES) $(BUILDRESULT)/$(PCHANGEFILE)

$(BUILDRESULT)/$(CHANGEFILE): $(BUILDFILES)/$(DSCFILE)
$(COWBUILDERCMD)
@if [ -f $(LOCALREPO)/pool/main/$(PKGLETTER)/$(PKGNAME)/$(DSCFILE) ]; \
then echo "$@ already installed" ; \
else $(COWBUILDERCMD); fi

$(BUILDRESULT)/$(PCHANGEFILE): $(BUILDFILES)/$(PDSCFILE)
$(PBUILDERCMD)
Expand Down Expand Up @@ -379,8 +381,12 @@ localrepo: $(LOCALREPO) $(LOCALREPO)/conf $(LOCALREPO)/conf/distributions
reprepro: $(LOCALREPO)/pool/main/$(PKGLETTER)/$(PKGNAME)/$(DSCFILE) # Install in repository

$(LOCALREPO)/pool/main/$(PKGLETTER)/$(PKGNAME)/$(DSCFILE): $(BUILDRESULT)/$(CHANGEFILE)
@echo "Installing $(BUILDRESULT)/$(CHANGEFILE) in $@"
cd $(BUILDRESULT); reprepro $(ASKPASS) -Vb $(LOCALREPO) include $(DISTRIB) $(CHANGEFILE)
@if [ ! -f $@ ] ; then \
echo "Installing $(BUILDRESULT)/$(CHANGEFILE) in $@"; \
cd $(BUILDRESULT); reprepro $(ASKPASS) -Vb $(LOCALREPO) include $(DISTRIB) $(CHANGEFILE); \
else \
echo "$@ already installed" ; \
fi

$(LOCALREPO)/conf/distributions:
for xdist in $(DISTRIBLIST) ; do \
Expand Down

0 comments on commit dadf471

Please sign in to comment.