Skip to content

Commit

Permalink
* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
Browse files Browse the repository at this point in the history
* cygwin/GNUmakefile.in (scriptbin): set executable bit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Dec 10, 2010
1 parent 31a974d commit f5aca8a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Fri Dec 10 18:27:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
Fri Dec 10 18:28:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>

* 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.
Expand Down
4 changes: 3 additions & 1 deletion cygwin/GNUmakefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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@
Expand Down

0 comments on commit f5aca8a

Please sign in to comment.