summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-04 08:09:44 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-04 08:09:44 +0000
commit825ce503c0e52edb944def195be0d3d55e3e71b3 (patch)
treefce260b670515f356a94d399fe97853b65ae1268
parent86f1cff0eb8fa3c4d5925fb8fe5eac31a323bb84 (diff)
* lib/json.rb, lib/json/*: moved to ext/json/lib.
-- M trunk/ChangeLog D trunk/lib/json D trunk/lib/json.rb A trunk/ext/json/lib A trunk/ext/json/lib/json A trunk/ext/json/lib/json.rb A trunk/ext/json/extconf.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/json/extconf.rb3
-rw-r--r--ext/json/lib/json.rb (renamed from lib/json.rb)0
-rw-r--r--ext/json/lib/json/Array.xpm (renamed from lib/json/Array.xpm)0
-rw-r--r--ext/json/lib/json/FalseClass.xpm (renamed from lib/json/FalseClass.xpm)0
-rw-r--r--ext/json/lib/json/Hash.xpm (renamed from lib/json/Hash.xpm)0
-rw-r--r--ext/json/lib/json/Key.xpm (renamed from lib/json/Key.xpm)0
-rw-r--r--ext/json/lib/json/NilClass.xpm (renamed from lib/json/NilClass.xpm)0
-rw-r--r--ext/json/lib/json/Numeric.xpm (renamed from lib/json/Numeric.xpm)0
-rw-r--r--ext/json/lib/json/String.xpm (renamed from lib/json/String.xpm)0
-rw-r--r--ext/json/lib/json/TrueClass.xpm (renamed from lib/json/TrueClass.xpm)0
-rw-r--r--ext/json/lib/json/add/core.rb (renamed from lib/json/add/core.rb)0
-rw-r--r--ext/json/lib/json/add/rails.rb (renamed from lib/json/add/rails.rb)0
-rw-r--r--ext/json/lib/json/common.rb (renamed from lib/json/common.rb)0
-rw-r--r--ext/json/lib/json/editor.rb (renamed from lib/json/editor.rb)0
-rw-r--r--ext/json/lib/json/ext.rb (renamed from lib/json/ext.rb)0
-rw-r--r--ext/json/lib/json/json.xpm (renamed from lib/json/json.xpm)0
-rw-r--r--ext/json/lib/json/pure.rb (renamed from lib/json/pure.rb)0
-rw-r--r--ext/json/lib/json/pure/generator.rb (renamed from lib/json/pure/generator.rb)0
-rw-r--r--ext/json/lib/json/pure/parser.rb (renamed from lib/json/pure/parser.rb)0
-rw-r--r--ext/json/lib/json/version.rb (renamed from lib/json/version.rb)0
21 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f3730e4527..e774963915d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 4 17:07:25 2007 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/json.rb, lib/json/*: moved to ext/json/lib.
+
Tue Dec 4 16:34:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_create): achieve target encoding.
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
new file mode 100644
index 00000000000..850798c643f
--- /dev/null
+++ b/ext/json/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+create_makefile('json')
+
diff --git a/lib/json.rb b/ext/json/lib/json.rb
index 3b0b7115509..3b0b7115509 100644
--- a/lib/json.rb
+++ b/ext/json/lib/json.rb
diff --git a/lib/json/Array.xpm b/ext/json/lib/json/Array.xpm
index 27c48011f9b..27c48011f9b 100644
--- a/lib/json/Array.xpm
+++ b/ext/json/lib/json/Array.xpm
diff --git a/lib/json/FalseClass.xpm b/ext/json/lib/json/FalseClass.xpm
index 25ce60832d2..25ce60832d2 100644
--- a/lib/json/FalseClass.xpm
+++ b/ext/json/lib/json/FalseClass.xpm
diff --git a/lib/json/Hash.xpm b/ext/json/lib/json/Hash.xpm
index cd8f6f7b53c..cd8f6f7b53c 100644
--- a/lib/json/Hash.xpm
+++ b/ext/json/lib/json/Hash.xpm
diff --git a/lib/json/Key.xpm b/ext/json/lib/json/Key.xpm
index 9fd7281388b..9fd7281388b 100644
--- a/lib/json/Key.xpm
+++ b/ext/json/lib/json/Key.xpm
diff --git a/lib/json/NilClass.xpm b/ext/json/lib/json/NilClass.xpm
index 3509f06c99f..3509f06c99f 100644
--- a/lib/json/NilClass.xpm
+++ b/ext/json/lib/json/NilClass.xpm
diff --git a/lib/json/Numeric.xpm b/ext/json/lib/json/Numeric.xpm
index e071e2ee9c6..e071e2ee9c6 100644
--- a/lib/json/Numeric.xpm
+++ b/ext/json/lib/json/Numeric.xpm
diff --git a/lib/json/String.xpm b/ext/json/lib/json/String.xpm
index f79a89cdc13..f79a89cdc13 100644
--- a/lib/json/String.xpm
+++ b/ext/json/lib/json/String.xpm
diff --git a/lib/json/TrueClass.xpm b/ext/json/lib/json/TrueClass.xpm
index 143eef49bb7..143eef49bb7 100644
--- a/lib/json/TrueClass.xpm
+++ b/ext/json/lib/json/TrueClass.xpm
diff --git a/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index 630ed6e4b70..630ed6e4b70 100644
--- a/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
diff --git a/lib/json/add/rails.rb b/ext/json/lib/json/add/rails.rb
index e86ed1aab94..e86ed1aab94 100644
--- a/lib/json/add/rails.rb
+++ b/ext/json/lib/json/add/rails.rb
diff --git a/lib/json/common.rb b/ext/json/lib/json/common.rb
index 7bc5ae06561..7bc5ae06561 100644
--- a/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
diff --git a/lib/json/editor.rb b/ext/json/lib/json/editor.rb
index 9a654006229..9a654006229 100644
--- a/lib/json/editor.rb
+++ b/ext/json/lib/json/editor.rb
diff --git a/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index ff4fa423294..ff4fa423294 100644
--- a/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
diff --git a/lib/json/json.xpm b/ext/json/lib/json/json.xpm
index 2cb626bb05d..2cb626bb05d 100644
--- a/lib/json/json.xpm
+++ b/ext/json/lib/json/json.xpm
diff --git a/lib/json/pure.rb b/ext/json/lib/json/pure.rb
index b86d9055233..b86d9055233 100644
--- a/lib/json/pure.rb
+++ b/ext/json/lib/json/pure.rb
diff --git a/lib/json/pure/generator.rb b/ext/json/lib/json/pure/generator.rb
index 0fe73be41a7..0fe73be41a7 100644
--- a/lib/json/pure/generator.rb
+++ b/ext/json/lib/json/pure/generator.rb
diff --git a/lib/json/pure/parser.rb b/ext/json/lib/json/pure/parser.rb
index e886ba8d2c2..e886ba8d2c2 100644
--- a/lib/json/pure/parser.rb
+++ b/ext/json/lib/json/pure/parser.rb
diff --git a/lib/json/version.rb b/ext/json/lib/json/version.rb
index 3d674ac44fa..3d674ac44fa 100644
--- a/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb