ruby-changes:18810
From: nobu <ko1@a...>
Date: Fri, 11 Feb 2011 12:03:36 +0900 (JST)
Subject: [ruby-changes:18810] Ruby:r30835 (trunk): * configure.in (rubygems): add --disable-rubygems option.
nobu 2011-02-11 12:03:26 +0900 (Fri, 11 Feb 2011) New Revision: 30835 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30835 Log: * configure.in (rubygems): add --disable-rubygems option. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/configure.in trunk/ruby.c trunk/test/ruby/envutil.rb trunk/win32/Makefile.sub trunk/win32/configure.bat Index: configure.in =================================================================== --- configure.in (revision 30834) +++ configure.in (revision 30835) @@ -2836,6 +2836,17 @@ fi AC_SUBST(MANTYPE) +AC_ARG_ENABLE(rubygems, + AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]), + [enable_rubygems="$enableval"], [enable_rubygems=yes]) +if test x"$enable_rubygems" = xno; then + AC_DEFINE(DISABLE_RUBYGEMS, 1) + USE_RUBYGEMS=NO +else + USE_RUBYGEMS=YES +fi +AC_SUBST(USE_RUBYGEMS) + arch_hdrdir="${EXTOUT}/include/${arch}/ruby" AS_MKDIR_P("${arch_hdrdir}") config_h="${arch_hdrdir}/config.h" Index: ChangeLog =================================================================== --- ChangeLog (revision 30834) +++ ChangeLog (revision 30835) @@ -1,3 +1,7 @@ +Fri Feb 11 12:03:24 2011 Nobuyoshi Nakada <nobu@r...> + + * configure.in (rubygems): add --disable-rubygems option. + Fri Feb 11 11:39:03 2011 Nobuyoshi Nakada <nobu@r...> * template/fake.rb.in (CROSS_COMPILING): get rid of NameError. Index: common.mk =================================================================== --- common.mk (revision 30834) +++ common.mk (revision 30835) @@ -104,7 +104,10 @@ GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) -PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb +PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) +GEM_PRELUDE = $(srcdir)/gem_prelude.rb +YES_GEM_PRELUDE = $(GEM_PRELUDE) +NO_GEM_PRELUDE = PRELUDES = prelude.c miniprelude.c GOLFPRELUDES = golf_prelude.c Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 30834) +++ win32/Makefile.sub (revision 30835) @@ -276,6 +276,12 @@ !ifndef RUBY RUBY = ruby !endif +!if "$(USE_RUBYGEMS)" == "NO" +DEFAULT_PRELUDES = $(NO_GEM_PRELUDE) +!else +DEFAULT_PRELUDES = $(YES_GEM_PRELUDE) +!endif + MAKEDIRS = $(MINIRUBY) -run -e mkdir -- -p !if !defined(STACK) Index: win32/configure.bat =================================================================== --- win32/configure.bat (revision 30834) +++ win32/configure.bat (revision 30835) @@ -26,6 +26,8 @@ if "%1" == "--disable-win95" goto :disable-win95 if "%1" == "--enable-debug-env" goto :enable-debug-env if "%1" == "--disable-debug-env" goto :disable-debug-env +if "%1" == "--enable-rubygems" goto :enable-rubygems +if "%1" == "--disable-rubygems" goto :disable-rubygems if "%1" == "--extout" goto :extout if "%1" == "--path" goto :path if "%1" == "--with-baseruby" goto :baseruby @@ -123,6 +125,16 @@ echo>>confargs.tmp %1 \ shift goto :loop +:enable-rubygems + echo>> ~tmp~.mak "USE_RUBYGEMS=YES" \ + echo>>confargs.tmp %1 \ + shift +goto :loop +:disable-rubygems + echo>> ~tmp~.mak "USE_RUBYGEMS=NO" \ + echo>>confargs.tmp %1 \ + shift +goto :loop :ntver echo>> ~tmp~.mak "NTVER=%~2" \ echo>>confargs.tmp %1=%2 \ Index: Makefile.in =================================================================== --- Makefile.in (revision 30834) +++ Makefile.in (revision 30835) @@ -89,6 +89,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ +DEFAULT_PRELUDES = $(@USE_RUBYGEMS@_GEM_PRELUDE) + #### End of system configuration section. #### MAJOR= @MAJOR@ Index: ruby.c =================================================================== --- ruby.c (revision 30834) +++ ruby.c (revision 30835) @@ -111,6 +111,9 @@ opt->src.enc.index = src_encoding_index; opt->ext.enc.index = -1; opt->intern.enc.index = -1; +#if defined DISABLE_RUBYGEMS && DISABLE_RUBYGEMS + opt->disable |= DISABLE_BIT(gems); +#endif return opt; } Index: test/ruby/envutil.rb =================================================================== --- test/ruby/envutil.rb (revision 30834) +++ test/ruby/envutil.rb (revision 30835) @@ -197,6 +197,6 @@ CONFIG['bindir'] = dir CONFIG['ruby_install_name'] = name CONFIG['RUBY_INSTALL_NAME'] = name - Gem::ConfigMap[:bindir] = dir if defined?(Gem) + Gem::ConfigMap[:bindir] = dir if defined?(Gem::ConfigMap) end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/