* include/ruby: moved public headers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fgo · Jun 10, 2007 · 2b59258 · 2b59258
1 parent 1b8a677
commit 2b59258
Show file tree

Hide file tree

Showing 124 changed files with 647 additions and 409 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 10 12:07:41 2007  Nobuyoshi Nakada  <[email protected]>
+
+	* include/ruby: moved public headers.
+
 Sun Jun 10 10:42:04 2007  Tanaka Akira  <[email protected]>
 
 	* lib/securerandom.rb: renamed from lib/secrand.rb.

diff --git a/Makefile.in b/Makefile.in
@@ -4,7 +4,7 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-VPATH = $(srcdir):$(srcdir)/missing
+hdrdir = $(srcdir)/include
 
 CC = @CC@
 YACC = bison
@@ -32,11 +32,13 @@ RDOCTARGET = @RDOCTARGET@
 
 EXTOUT = @EXTOUT@
 RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
 
 empty =
 OUTFLAG = @OUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @ARCH_FLAG@
-XCFLAGS = -I. -I$(srcdir) @XCFLAGS@
+XCFLAGS = -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 

diff --git a/array.c b/array.c
@@ -12,9 +12,9 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "util.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
 
 VALUE rb_cArray;
 

diff --git a/bignum.c b/bignum.c
@@ -10,7 +10,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 #include <math.h>
 #include <float.h>

diff --git a/blockinlining.c b/blockinlining.c
@@ -9,8 +9,8 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "node.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
 #include "yarvcore.h"
 
 VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file,

diff --git a/class.c b/class.c
@@ -10,10 +10,10 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubysig.h"
-#include "node.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/signal.h"
+#include "ruby/node.h"
+#include "ruby/st.h"
 #include <ctype.h>
 
 extern st_table *rb_class_tbl;

diff --git a/common.mk b/common.mk
diff --git a/compar.c b/compar.c
@@ -10,7 +10,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 VALUE rb_mComparable;
 

diff --git a/compile.c b/compile.c
@@ -10,8 +10,8 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "node.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
 
 #include "yarvcore.h"
 #include "compile.h"

diff --git a/configure.in b/configure.in
@@ -216,10 +216,11 @@ AC_MINIX
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
 if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
+  MAKEDIRS='mkdir -p'
 else
-  AC_SUBST(MAKEDIRS, ['install -d'])
+  MAKEDIRS='install -d'
 fi
+AC_SUBST(MAKEDIRS)
 
 dnl check for large file stuff
 AC_SYS_LARGEFILE
@@ -1271,7 +1272,7 @@ fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1607,6 +1608,19 @@ if test "$search_path" != ""; then
     AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
 fi
 
+AC_ARG_WITH(rubyhdrdir,
+	    [  --with-ruby-hdrdir=DIR  core headers in DIR [INCLUDEDIR]],
+	    [rubyhdrdir=$withval],
+	    [rubyhdrdir='${includedir}/ruby-${MAJOR}.${MINOR}'])
+
+AC_ARG_WITH(sitehdrdir,
+	    [  --with-site-hdrdir=DIR  core headers in DIR [INCLUDEDIR]],
+	    [sitehdrdir=$withval],
+	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+
 AC_ARG_WITH(mantype,
 		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
 		[
@@ -1646,11 +1660,14 @@ AC_ARG_WITH(baseruby,
 	])
 AC_SUBST(BASERUBY)
 
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+$MAKEDIRS "${arch_hdrdir}"
+config_h="${arch_hdrdir}/config.h"
+if test -f "${config_h}" && tr -d '\015' < confdefs.h | cmp -s "${config_h}" -; then
   echo "config.h unchanged"
 else
   echo "creating config.h"
-  tr -d '\015' < confdefs.h > config.h
+  tr -d '\015' < confdefs.h > "${config_h}"
 fi
 : > confdefs.h
 

diff --git a/cont.c b/cont.c
@@ -10,7 +10,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "yarvcore.h"
 #include "gc.h"
 #include "eval_intern.h"

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
@@ -61,7 +61,7 @@ $(RUBY_EXP): $(LIBRUBY_A)
 GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 
 ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
+$(OBJS) $(MAINOBJ): win32.h
 
 $(LIBRUBY_SO): $(RUBYDEF)
 

diff --git a/debug.c b/debug.c
@@ -10,7 +10,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "debug.h"
 
 void

diff --git a/debug.h b/debug.h
@@ -13,8 +13,8 @@
 #ifndef _DEBUG_H_INCLUDED_
 #define _DEBUG_H_INCLUDED_
 
-#include <ruby.h>
-#include <node.h>
+#include "ruby/ruby.h"
+#include "ruby/node.h"
 
 #define dpv(h,v) ruby_debug_value(-1, 0, h, v)
 #define dp(v)    ruby_debug_value(-1, 0, "", v)

diff --git a/dir.c b/dir.c
@@ -12,7 +12,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -61,7 +61,7 @@ char *strchr(char*,char);
 
 #include <ctype.h>
 
-#include "util.h"
+#include "ruby/util.h"
 
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat

diff --git a/dln.c b/dln.c
@@ -10,7 +10,7 @@
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include "dln.h"
 
 #ifdef HAVE_STDLIB_H
@@ -182,8 +182,8 @@ static int dln_init_p = 0;
 
 #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
 
-#include "util.h"
-#include "st.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
 
 static st_table *sym_tbl;
 static st_table *undef_tbl;

diff --git a/enum.c b/enum.c
@@ -10,9 +10,9 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "node.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
+#include "ruby/util.h"
 
 VALUE rb_mEnumerable;
 static ID id_each, id_eqq, id_cmp;

diff --git a/enumerator.c b/enumerator.c
@@ -12,7 +12,7 @@
 
 ************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 /*
  * Document-class: Enumerable::Enumerator

diff --git a/error.c b/error.c
@@ -10,8 +10,8 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
 #include "yarvcore.h"
 
 #include <stdio.h>

diff --git a/eval_intern.h b/eval_intern.h
@@ -6,10 +6,10 @@
   (GET_THREAD()->passed_block = \
    GC_GUARDED_PTR_REF((rb_block_t *)GET_THREAD()->cfp->lfp[0]))
 
-#include "ruby.h"
-#include "node.h"
-#include "util.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
+#include "ruby/util.h"
+#include "ruby/signal.h"
 #include "yarvcore.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <setjmp.h>
 
-#include "st.h"
+#include "ruby/st.h"
 #include "dln.h"
 
 #ifdef __APPLE__

diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,7 +22,6 @@
 #include <float.h>
 #include <math.h>
 #include "math.h"
-#include "version.h"
 
 /* #define ENABLE_NUMERIC_STRING */
 

diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $INSTALLFILES = {
-  "digest.h" => "$(RUBYARCHDIR)"
+  "digest.h" => "$(HDRDIR)"
 }
 
 create_makefile("digest")
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
@@ -2,10 +2,9 @@
  * $Id$
  */
 
-#include <ruby.h>
-#include <rubyio.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
 #include <ctype.h>
-#include <version.h> /* for ruby version code */
 #include "dl.h"
 
 VALUE rb_cDLCPtr;
@@ -421,7 +420,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
 	rb_io_t *fptr;
 	FILE *fp;
 	GetOpenFile(val, fptr);
-#if RUBY_VERSION_CODE >= 190
+#if HAVE_RB_IO_STDIO_FILE
 	fp = rb_io_stdio_file(fptr);
 #else
 	fp = fptr->f;

diff --git a/ext/dl/dl.c b/ext/dl/dl.c
@@ -1,6 +1,5 @@
-#include <ruby.h>
-#include <rubyio.h>
-#include <version.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
 #include <ctype.h>
 #include "dl.h"
 

diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
@@ -5,7 +5,7 @@
 end
 
 $INSTALLFILES = [
-  ["dl.h", "$(archdir)$(target_prefix)", ""],
+  ["dl.h", "$(HDRDIR)"],
 ]
 $distcleanfiles << "callback.h"
 
@@ -26,5 +26,7 @@
 end
 
 if( check )
+  have_func("rb_io_stdio_file", "ruby/ruby.h")
+  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
   create_makefile("dl")
 end