Re: [ANNOUNCE] Stacked Git 0.15

From: Karl Wiberg <kha@treskal.com>
Date: Oct 26, 2009, 13:49 UTC
Message-ID: <20091026134915.GA1565@diana.vm.bytemark.co.uk>
In-Reply-To: <b0943d9e0910260332x1ca40f97r351e94f5baeb1c6b@mail.gmail.com>

On 2009-10-26 10:32:07 +0000, Catalin Marinas wrote:

Show 7 quoted lines

> The problem was a bit more complicated than this. Some files are
> generated by the Makefile rather than setup.py so using the latter
> directly fails to build anything.
>
> So it's time for 0.15.1 this week with the fix below (in my
> "proposed" branch). I cc'ed Karl as well in case he has time to have
> a quick look.

I don't have any objections, except ...

Show 34 quoted lines

> diff --git a/Makefile b/Makefile
> index 0fa5c6a..5f88f7d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -4,20 +4,10 @@ PYTHON	?= python
> 
>  TEST_PATCHES ?= ..
> 
> -all: build
> +all:
>  	$(PYTHON) setup.py build
> 
> -build: stgit/commands/cmdlist.py stgit-completion.bash
> -
> -ALL_PY = $(shell find stgit -name '*.py')
> -
> -stgit/commands/cmdlist.py: $(ALL_PY)
> -	$(PYTHON) stg-build --py-cmd-list > $@
> -
> -stgit-completion.bash: $(ALL_PY)
> -	$(PYTHON) stg-build --bash-completion > $@
> -
> -install: build
> +install:
>  	$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) --force
> 
>  doc:
> @@ -29,10 +19,10 @@ install-doc:
>  install-html:
>  	$(MAKE) -C Documentation install-html
> 
> -test: build
> +test:
>  	cd t && $(MAKE) all

... don't we need to run "setup.py build" here in order to not change the behavior?

-- 
Karl Wiberg, kha@treskal.com
    www.treskal.com/kalle