Massive Reorganize

* Plan change: Gemify and install to installed Ruby * no longer builds since dac4675
ParadoxV5 · Jan 22, 2024 · 302512d · 302512d
1 parent 9a52bba
commit 302512d
Show file tree

Hide file tree

Showing 36 changed files with 10 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
-/build/
-
 # JetBrains
 /**/.idea/
 
 # Ruby
-/.bundle/
 /.gem_rbs_collection/
 /Gemfile.lock
 /rbs_collection.lock.yaml
+/lib/*.so
+/tmp/
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "godot"]
-	path = include/godot
+	path = ext/include/godot
 	url = https://github.com/ParadoxV5/godot-headers
diff --git a/Gemfile b/Gemfile
@@ -2,13 +2,13 @@
 source 'https://rubygems.org'
 ruby '~> 3.3', engine: 'ruby', engine_version: '~> 3.3'
 
-gem 'rake', '~> 13.1.0'
-gem 'json', '~> 2.6'
+gem 'rake-compiler', '~> 1.2.0'
+gem 'json', '~> 2.7'
 
 # Development Apps
 group :development do
   group :type_check do
-    gem 'rbs', '~> 3.4.1', require: false
+    gem 'rbs', '~> 3.4.2', require: false
     gem 'steep', '~> 1.6.0', require: false
   end
   group :documentation do

diff --git a/Godot.rb.gdextension → addons/Godot.rb.gdextension b/Godot.rb.gdextension → addons/Godot.rb.gdextension
diff --git a/docs/dev/Building.md → docs/Building.md b/docs/dev/Building.md → docs/Building.md
diff --git a/docs/dev/GDExtension Init Levels.md → docs/GDExtension Init Levels.md b/docs/dev/GDExtension Init Levels.md → docs/GDExtension Init Levels.md
diff --git a/docs/dev/GDExtension Interface functions pool.h b/docs/dev/GDExtension Interface functions pool.h
diff --git a/include/.gdignore → ext/.gdignore b/include/.gdignore → ext/.gdignore
diff --git a/src/cleanup.c → ext/godot_rb/cleanup.c b/src/cleanup.c → ext/godot_rb/cleanup.c
diff --git a/src/cleanup.h → ext/godot_rb/cleanup.h b/src/cleanup.h → ext/godot_rb/cleanup.h
diff --git a/ext/godot_rb/extconf.rb b/ext/godot_rb/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'godot_rb'
diff --git a/src/godot_rb.c → ext/godot_rb/godot_rb.c b/src/godot_rb.c → ext/godot_rb/godot_rb.c
diff --git a/src/ruby/mixins.c → ext/godot_rb/ruby/mixins.c b/src/ruby/mixins.c → ext/godot_rb/ruby/mixins.c
diff --git a/src/ruby/object.c → ext/godot_rb/ruby/object.c b/src/ruby/object.c → ext/godot_rb/ruby/object.c
diff --git a/src/ruby/objects.c → ext/godot_rb/ruby/objects.c b/src/ruby/objects.c → ext/godot_rb/ruby/objects.c
diff --git a/src/ruby/ruby_script.c → ext/godot_rb/ruby/ruby_script.c b/src/ruby/ruby_script.c → ext/godot_rb/ruby/ruby_script.c
diff --git a/src/ruby/ruby_script.h → ext/godot_rb/ruby/ruby_script.h b/src/ruby/ruby_script.h → ext/godot_rb/ruby/ruby_script.h
diff --git a/src/ruby/ruby_script_inst_get_virtual.c → ...ot_rb/ruby/ruby_script_inst_get_virtual.c b/src/ruby/ruby_script_inst_get_virtual.c → ...ot_rb/ruby/ruby_script_inst_get_virtual.c
diff --git a/src/ruby/string.c → ext/godot_rb/ruby/string.c b/src/ruby/string.c → ext/godot_rb/ruby/string.c
diff --git a/src/ruby/string_name.c → ext/godot_rb/ruby/string_name.c b/src/ruby/string_name.c → ext/godot_rb/ruby/string_name.c
diff --git a/src/ruby/variant.c → ext/godot_rb/ruby/variant.c b/src/ruby/variant.c → ext/godot_rb/ruby/variant.c
diff --git a/src/ruby/variants.h → ext/godot_rb/ruby/variants.h b/src/ruby/variants.h → ext/godot_rb/ruby/variants.h
diff --git a/src/setup.c → ext/godot_rb/setup.c b/src/setup.c → ext/godot_rb/setup.c
diff --git a/src/setup.h → ext/godot_rb/setup.h b/src/setup.h → ext/godot_rb/setup.h
diff --git a/src/.gdignore → ext/include/.gdignore b/src/.gdignore → ext/include/.gdignore
diff --git a/ext/include/godot b/ext/include/godot
diff --git a/include/godot_rb.h → ext/include/godot_rb.h b/include/godot_rb.h → ext/include/godot_rb.h
@@ -2,7 +2,7 @@
 #define GODOT_RB_H
 
 #include <ruby.h>
-#include <godot/godot/gdextension_interface.h>
+#include <godot/gdextension_interface.h>
 
 
 // GDExtension (initialized by entry function) //

diff --git a/include/godot b/include/godot
diff --git a/lib/godot/enumerable.rb → lib/godot_rb/enumerable.rb b/lib/godot/enumerable.rb → lib/godot_rb/enumerable.rb
diff --git a/lib/godot/object.rb → lib/godot_rb/object.rb b/lib/godot/object.rb → lib/godot_rb/object.rb
diff --git a/lib/godot/objects.rb → lib/godot_rb/objects.rb b/lib/godot/objects.rb → lib/godot_rb/objects.rb
diff --git a/lib/godot/ruby_language.rb → lib/godot_rb/ruby_language.rb b/lib/godot/ruby_language.rb → lib/godot_rb/ruby_language.rb
diff --git a/lib/godot/ruby_script.rb → lib/godot_rb/ruby_script.rb b/lib/godot/ruby_script.rb → lib/godot_rb/ruby_script.rb
diff --git a/lib/godot/variant.rb → lib/godot_rb/variant.rb b/lib/godot/variant.rb → lib/godot_rb/variant.rb
diff --git a/lib/godot/version.rb → lib/godot_rb/version.rb b/lib/godot/version.rb → lib/godot_rb/version.rb
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt