Re: [PATCH] Makefile: POSIX windres

2017-01-09 Thread Johannes Sixt 

Am 09.01.2017 um 09:09 schrieb Johannes Schindelin:

Hi Junio,

On Sun, 8 Jan 2017, Junio C Hamano wrote:


Steven Penny  writes:


When environment variable POSIXLY_CORRECT is set, the "input -o
output" syntax is not supported.

http://cygwin.com/ml/cygwin/2017-01/msg00036.html

Signed-off-by: Steven Penny 
---


Who other than cygwin build uses this target?  Git for Windows?


Yes, Git for Windows uses this target, as did msysGit (and I suspect
Hannes' setup).


The patch works for me, too.

-- Hannes

Re: [PATCH] Makefile: POSIX windres

2017-01-09 Thread Junio C Hamano 
Johannes Schindelin  writes:

>> Who other than cygwin build uses this target?  Git for Windows?
>
> Yes, Git for Windows uses this target, as did msysGit (and I suspect
> Hannes' setup).
> ...
> So: ACK

Thanks.

Re: [PATCH] Makefile: POSIX windres

2017-01-09 Thread Johannes Schindelin 
Hi Junio,

On Sun, 8 Jan 2017, Junio C Hamano wrote:

> Steven Penny  writes:
> 
> > When environment variable POSIXLY_CORRECT is set, the "input -o
> > output" syntax is not supported.
> >
> > http://cygwin.com/ml/cygwin/2017-01/msg00036.html
> >
> > Signed-off-by: Steven Penny 
> > ---
> 
> Who other than cygwin build uses this target?  Git for Windows?

Yes, Git for Windows uses this target, as did msysGit (and I suspect
Hannes' setup).

The resources are built correctly in Git for Windows SDK with this patch,
and I just verified that the windres shipped with the last msysGit (AKA
Git for Windows 1.x' SDK) handles the -i flag correctly, too. That is, at
least windres.exe included in binutils-2.19.1-mingw32-bin.tar.gz (which
was current at the time I updated msysGit on Feb 19 2009) can handle it.

So: ACK

Ciao,
Dscho

P.S.: I applied this patch to Git for Windows' `master`:
https://github.com/git-for-windows/git/commit/744120c602

Re: [PATCH] Makefile: POSIX windres

2017-01-08 Thread Junio C Hamano 
Steven Penny  writes:

> When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax
> is not supported.
>
> http://cygwin.com/ml/cygwin/2017-01/msg00036.html
>
> Signed-off-by: Steven Penny 
> ---

Who other than cygwin build uses this target?  Git for Windows?

Hannes, Dscho, is this change OK with you guys?
 
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index d861bd9..a2a1212 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1816,7 +1816,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
>  git.res: git.rc GIT-VERSION-FILE
>   $(QUIET_RC)$(RC) \
> $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., 
> ,$(GIT_VERSION) \
> -   -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
> +   -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
>  
>  # This makes sure we depend on the NO_PERL setting itself.
>  $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS

[PATCH] Makefile: POSIX windres

2017-01-07 Thread Steven Penny 
When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax
is not supported.

http://cygwin.com/ml/cygwin/2017-01/msg00036.html

Signed-off-by: Steven Penny 
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d861bd9..a2a1212 100644
--- a/Makefile
+++ b/Makefile
@@ -1816,7 +1816,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
 git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \
  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., 
,$(GIT_VERSION) \
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
 
 # This makes sure we depend on the NO_PERL setting itself.
 $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
-- 
2.8.3