From f5aca8a49ee91812b62617065719e79613bb57f8 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 Dec 2010 09:28:42 +0000 Subject: [PATCH] * cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc. * cygwin/GNUmakefile.in (scriptbin): set executable bit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- cygwin/GNUmakefile.in | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7248cd4111..14a597f32a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Fri Dec 10 18:27:49 2010 Nobuyoshi Nakada +Fri Dec 10 18:28:40 2010 Nobuyoshi Nakada + + * cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc. + + * cygwin/GNUmakefile.in (scriptbin): set executable bit. * tool/rbinstall.rb (install_recursive): always skip default ignored files. if block is given, call it instead of calling install. diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 1eb8880ba9..19d1727dd7 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -12,7 +12,8 @@ else DLLWRAP += -mno-cygwin VPATH := $(VPATH):$(srcdir)/win32 STUBPROGRAM = rubystub$(EXEEXT) - SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(notdir $(wildcard $(srcdir)/bin/*))) + IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# + SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))) endif ifneq ($(ENABLE_SHARED),yes) @@ -42,6 +43,7 @@ scriptbin: $(SCRIPTPROGRAMS) %$(EXEEXT): bin/% $(STUBPROGRAM) $(ECHO) generating $@ $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@ + $(Q) chmod +x $@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@