Re: [PATCH 02/13] Use an external program to implement fetching with curl

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 5, 2009, 19:54 UTC
Message-ID: <alpine.DEB.1.00.0908052154000.8306@pacific.mpi-cbg.de>
In-Reply-To: <alpine.LNX.2.00.0908051145250.2147@iabervon.org>

Hi,

On Wed, 5 Aug 2009, Daniel Barkalow wrote:

Show 30 quoted lines

> On Wed, 5 Aug 2009, Johannes Schindelin wrote:
> 
> > On Wed, 5 Aug 2009, Daniel Barkalow wrote:
> > 
> > > diff --git a/Makefile b/Makefile
> > > index 504646a..35117fc 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -981,6 +981,7 @@ else
> > >  		CURL_LIBCURL = -lcurl
> > >  	endif
> > >  	BUILTIN_OBJS += builtin-http-fetch.o
> > > +	PROGRAMS += git-remote-http$X git-remote-https$X git-remote-ftp$X git-http-fetch$X
> > >  	EXTLIBS += $(CURL_LIBCURL)
> > >  	LIB_OBJS += http.o http-walker.o
> > >  	curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
> > > @@ -1491,6 +1492,10 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
> > >  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
> > >  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
> > >  
> > > +git-remote-http$X git-remote-https$X git-remote-ftp$X: remote-curl.o http.o http-walker.o $(GITLIBS)
> > > +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
> > > +		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
> > > +
> > 
> > Ooops, I missed this part.  How about making git-remote-https and 
> > git-remote-ftp hardlinks to git-remote-http?
> 
> Sure. Is "ln ... || ln -s ... || cp ..." the right way to do this 
> cross-platform?

You mean as in

	$(BUILT_INS): git$X
	        $(QUIET_BUILT_IN)$(RM) $@ && \
	        ln git$X $@ 2>/dev/null || \
	        ln -s git$X $@ 2>/dev/null || \
	        cp git$X $@

?  I guess so ;-)

Ciao, Dscho