mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* Makefile.in, common.mk (clean-ext, clean-enc): clean up cleaning
targets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									3a4231cdf4
								
							
						
					
					
						commit
						1d408c933a
					
				
					 5 changed files with 28 additions and 8 deletions
				
			
		|  | @ -1,3 +1,8 @@ | |||
| Tue Jun 15 02:31:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org> | ||||
| 
 | ||||
| 	* Makefile.in, common.mk (clean-ext, clean-enc): clean up cleaning | ||||
| 	  targets. | ||||
| 
 | ||||
| Mon Jun 14 22:36:09 2010  Tanaka Akira  <akr@fsij.org> | ||||
| 
 | ||||
| 	* test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS | ||||
|  |  | |||
							
								
								
									
										10
									
								
								Makefile.in
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								Makefile.in
									
										
									
									
									
								
							|  | @ -257,7 +257,7 @@ distclean-rdoc: | |||
| 	@$(RMALL) $(RDOCOUT:/=\) | ||||
| 
 | ||||
| clean-ext distclean-ext realclean-ext:: | ||||
| 	@cd ext; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 | ||||
| 	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 | ||||
| 	test "$$#" = 0 && set .; \
 | ||||
| 	set dummy `for dir; do \
 | ||||
| 	    find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
 | ||||
|  | @ -275,6 +275,14 @@ clean-ext distclean-ext realclean-ext:: | |||
| distclean-ext realclean-ext:: | ||||
| 	@-rmdir ext 2> /dev/null || true | ||||
| 
 | ||||
| clean-extout: | ||||
| 	@-$(RMDIRS) $(EXTOUT) 2> /dev/null || true | ||||
| 
 | ||||
| clean-enc distclean-enc realclean-enc: | ||||
| 	@test -f "$(ENC_MK)" || exit 0; \
 | ||||
| 	echo $(@:-enc=ing) encodings; \
 | ||||
| 	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F) | ||||
| 
 | ||||
| ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) | ||||
| 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c | ||||
| 
 | ||||
|  |  | |||
|  | @ -380,7 +380,6 @@ clean-golf: PHONY | |||
| 	@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS) | ||||
| clean-rdoc: PHONY | ||||
| clean-extout: PHONY | ||||
| 	@-$(RMDIRS) $(EXTOUT)/$(arch) | ||||
| 
 | ||||
| distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout | ||||
| distclean-local:: clean-local | ||||
|  | @ -392,7 +391,6 @@ distclean-golf: clean-golf | |||
| 	@$(RM) $(GOLFPRELUDES) | ||||
| distclean-rdoc: PHONY | ||||
| distclean-extout: clean-extout | ||||
| 	@-$(RMDIRS) $(EXTOUT) | ||||
| 
 | ||||
| realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout | ||||
| realclean-local:: distclean-local | ||||
|  | @ -401,9 +399,7 @@ realclean-ext:: | |||
| realclean-golf: distclean-golf | ||||
| realclean-extout: distclean-extout | ||||
| 
 | ||||
| clean-enc distclean-enc realclean-enc: | ||||
| 	@echo $(@:-enc=ing) encodings | ||||
| 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=) | ||||
| clean-enc distclean-enc realclean-enc: PHONY | ||||
| 
 | ||||
| check: test test-all | ||||
| check-ruby: test test-ruby | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| #define RUBY_VERSION "1.9.3" | ||||
| #define RUBY_RELEASE_DATE "2010-06-14" | ||||
| #define RUBY_RELEASE_DATE "2010-06-15" | ||||
| #define RUBY_PATCHLEVEL -1 | ||||
| #define RUBY_BRANCH_NAME "trunk" | ||||
| 
 | ||||
|  | @ -8,7 +8,7 @@ | |||
| #define RUBY_VERSION_TEENY 1 | ||||
| #define RUBY_RELEASE_YEAR 2010 | ||||
| #define RUBY_RELEASE_MONTH 6 | ||||
| #define RUBY_RELEASE_DAY 14 | ||||
| #define RUBY_RELEASE_DAY 15 | ||||
| 
 | ||||
| #include "ruby/version.h" | ||||
| 
 | ||||
|  |  | |||
|  | @ -845,6 +845,17 @@ clean-ext distclean-ext realclean-ext:: | |||
| distclean-ext realclean-ext:: | ||||
| 		@-rmdir ext | ||||
| 
 | ||||
| clean-extout: | ||||
| !if exist($(EXTOUT)/.) | ||||
| 	@-$(RMDIRS) $(EXTOUT) | ||||
| !endif | ||||
| 
 | ||||
| clean-enc distclean-enc realclean-enc: | ||||
| !if exist($(ENC_MK)) | ||||
| 	@echo $(@:-enc=ing) encodings | ||||
| 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F) | ||||
| !endif | ||||
| 
 | ||||
| $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb | ||||
| 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \ | ||||
| 			-ruby_name=$(RUBY_INSTALL_NAME) \ | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 nobu
						nobu