diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | dmyloadpath.c | 2 | ||||
| -rw-r--r-- | dmyversion.c | 2 | ||||
| -rw-r--r-- | loadpath.c | 87 | ||||
| -rw-r--r-- | version.c | 72 |
6 files changed, 103 insertions, 77 deletions
@@ -1,3 +1,10 @@ +Wed May 15 16:56:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * loadpath.c: split load path staffs from version.c. + + * dmyloadpath.c: miniruby has no builtin load paths, so verconf.h is + not needed. + Wed May 15 03:56:09 2013 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb: adding backwards @@ -33,7 +33,7 @@ MAINOBJ = $(NORMALMAINOBJ) EXTOBJS = DLDOBJS = $(DMYEXT) EXTSOLIBS = -MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT) +MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyloadpath.$(OBJEXT) miniprelude.$(OBJEXT) ENC_MK = enc.mk COMMONOBJS = array.$(OBJEXT) \ @@ -84,6 +84,7 @@ COMMONOBJS = array.$(OBJEXT) \ transcode.$(OBJEXT) \ util.$(OBJEXT) \ variable.$(OBJEXT) \ + version.$(OBJEXT) \ compile.$(OBJEXT) \ debug.$(OBJEXT) \ iseq.$(OBJEXT) \ @@ -99,7 +100,7 @@ COMMONOBJS = array.$(OBJEXT) \ EXPORTOBJS = $(DLNOBJ) \ encoding.$(OBJEXT) \ - version.$(OBJEXT) \ + loadpath.$(OBJEXT) \ $(COMMONOBJS) OBJS = $(EXPORTOBJS) prelude.$(OBJEXT) @@ -765,9 +766,12 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h {$(VPATH)}id.h \ {$(VPATH)}oniguruma.h {$(VPATH)}internal.h {$(VPATH)}constant.h version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \ + $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h +loadpath.$(OBJEXT): {$(VPATH)}loadpath.c $(RUBY_H_INCLUDES) \ $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h \ verconf.h -dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT) +dmyloadpath.$(OBJEXT): {$(VPATH)}dmyloadpath.c {$(VPATH)}loadpath.c $(RUBY_H_INCLUDES) \ + $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ diff --git a/dmyloadpath.c b/dmyloadpath.c new file mode 100644 index 0000000000..eaa607ad95 --- /dev/null +++ b/dmyloadpath.c @@ -0,0 +1,2 @@ +const char ruby_exec_prefix[] = ""; +const char ruby_initial_load_paths[] = ""; diff --git a/dmyversion.c b/dmyversion.c deleted file mode 100644 index 279c6ea95a..0000000000 --- a/dmyversion.c +++ /dev/null @@ -1,2 +0,0 @@ -#define NO_INITIAL_LOAD_PATH 1 -#include "version.c" diff --git a/loadpath.c b/loadpath.c new file mode 100644 index 0000000000..ed52265087 --- /dev/null +++ b/loadpath.c @@ -0,0 +1,87 @@ +/********************************************************************** + + loadpath.c - + + $Author$ + created at: Wed May 15 14:19:50 JST 2013 + + Copyright (C) 2013 Yukihiro Matsumoto + +**********************************************************************/ + +#include "verconf.h" +#include "ruby/ruby.h" +#include "version.h" + +#ifndef RUBY_ARCH +#define RUBY_ARCH RUBY_PLATFORM +#endif +#ifndef RUBY_SITEARCH +#define RUBY_SITEARCH RUBY_ARCH +#endif +#ifdef RUBY_PLATFORM_CPU +#define RUBY_THINARCH RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS +#endif +#ifndef RUBY_LIB_PREFIX +#ifndef RUBY_EXEC_PREFIX +#error RUBY_EXEC_PREFIX must be defined +#endif +#define RUBY_LIB_PREFIX RUBY_EXEC_PREFIX"/lib/ruby" +#endif +#ifndef RUBY_SITE_LIB +#define RUBY_SITE_LIB RUBY_LIB_PREFIX"/site_ruby" +#endif +#ifndef RUBY_VENDOR_LIB +#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" +#endif + +typedef char ruby_lib_version_string[(int)sizeof(RUBY_LIB_VERSION) - 2]; + +#define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION +#define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION +#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION +#ifndef RUBY_ARCH_LIB_FOR +#define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch +#endif +#ifndef RUBY_SITE_ARCH_LIB_FOR +#define RUBY_SITE_ARCH_LIB_FOR(arch) RUBY_SITE_LIB2 "/"arch +#endif +#ifndef RUBY_VENDOR_ARCH_LIB_FOR +#define RUBY_VENDOR_ARCH_LIB_FOR(arch) RUBY_VENDOR_LIB2 "/"arch +#endif + +#if !defined(LOAD_RELATIVE) || !LOAD_RELATIVE +const char ruby_exec_prefix[] = RUBY_EXEC_PREFIX; +#endif + +const char ruby_initial_load_paths[] = +#ifndef NO_INITIAL_LOAD_PATH +#ifdef RUBY_SEARCH_PATH + RUBY_SEARCH_PATH "\0" +#endif +#ifndef NO_RUBY_SITE_LIB + RUBY_SITE_LIB2 "\0" +#ifdef RUBY_THINARCH + RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0" +#endif + RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" + RUBY_SITE_LIB "\0" +#endif + +#ifndef NO_RUBY_VENDOR_LIB + RUBY_VENDOR_LIB2 "\0" +#ifdef RUBY_THINARCH + RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0" +#endif + RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" + RUBY_VENDOR_LIB "\0" +#endif + + RUBY_LIB "\0" +#ifdef RUBY_THINARCH + RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0" +#endif + RUBY_ARCH_LIB_FOR(RUBY_ARCH) "\0" +#endif + ""; + @@ -9,7 +9,6 @@ **********************************************************************/ -#include "verconf.h" #include "ruby/ruby.h" #include "version.h" #include <stdio.h> @@ -17,43 +16,6 @@ #define PRINT(type) puts(ruby_##type) #define MKSTR(type) rb_obj_freeze(rb_usascii_str_new(ruby_##type, sizeof(ruby_##type)-1)) -#ifndef RUBY_ARCH -#define RUBY_ARCH RUBY_PLATFORM -#endif -#ifndef RUBY_SITEARCH -#define RUBY_SITEARCH RUBY_ARCH -#endif -#ifdef RUBY_PLATFORM_CPU -#define RUBY_THINARCH RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS -#endif -#ifndef RUBY_LIB_PREFIX -#ifndef RUBY_EXEC_PREFIX -#error RUBY_EXEC_PREFIX must be defined -#endif -#define RUBY_LIB_PREFIX RUBY_EXEC_PREFIX"/lib/ruby" -#endif -#ifndef RUBY_SITE_LIB -#define RUBY_SITE_LIB RUBY_LIB_PREFIX"/site_ruby" -#endif -#ifndef RUBY_VENDOR_LIB -#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" -#endif - -typedef char ruby_lib_version_string[(int)sizeof(RUBY_LIB_VERSION) - 2]; - -#define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION -#define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION -#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION -#ifndef RUBY_ARCH_LIB_FOR -#define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch -#endif -#ifndef RUBY_SITE_ARCH_LIB_FOR -#define RUBY_SITE_ARCH_LIB_FOR(arch) RUBY_SITE_LIB2 "/"arch -#endif -#ifndef RUBY_VENDOR_ARCH_LIB_FOR -#define RUBY_VENDOR_ARCH_LIB_FOR(arch) RUBY_VENDOR_LIB2 "/"arch -#endif - const int ruby_api_version[] = { RUBY_API_VERSION_MAJOR, RUBY_API_VERSION_MINOR, @@ -67,40 +29,6 @@ const char ruby_description[] = RUBY_DESCRIPTION; const char ruby_copyright[] = RUBY_COPYRIGHT; const char ruby_engine[] = "ruby"; VALUE ruby_engine_name = Qnil; -#if !defined(LOAD_RELATIVE) || !LOAD_RELATIVE -const char ruby_exec_prefix[] = RUBY_EXEC_PREFIX; -#endif - -const char ruby_initial_load_paths[] = -#ifndef NO_INITIAL_LOAD_PATH -#ifdef RUBY_SEARCH_PATH - RUBY_SEARCH_PATH "\0" -#endif -#ifndef NO_RUBY_SITE_LIB - RUBY_SITE_LIB2 "\0" -#ifdef RUBY_THINARCH - RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0" -#endif - RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" - RUBY_SITE_LIB "\0" -#endif - -#ifndef NO_RUBY_VENDOR_LIB - RUBY_VENDOR_LIB2 "\0" -#ifdef RUBY_THINARCH - RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0" -#endif - RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" - RUBY_VENDOR_LIB "\0" -#endif - - RUBY_LIB "\0" -#ifdef RUBY_THINARCH - RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0" -#endif - RUBY_ARCH_LIB_FOR(RUBY_ARCH) "\0" -#endif - ""; /*! Defines platform-depended Ruby-level constants */ void |