Update the 'HelloGDExtension' plugin sample's directory structure

11 files changed, 55 insertions, 60 deletions

diff --git a/plugins/hello_gdextension/SConstruct b/plugins/hello_gdextension/SConstruct
index c704717..71e141e 100644
--- a/plugins/hello_gdextension/SConstruct
+++ b/plugins/hello_gdextension/SConstruct
@@ -18,12 +18,12 @@ sources = Glob("src/main/cpp/*.cpp")
 
 if env["platform"] == "macos":
     library = env.SharedLibrary(
-        "src/main/assets/addons/hello_gdextension_plugin/.bin/libhello_gdextension.{}.{}.framework/libhello_gdextension.{}.{}".format(env["platform"], env["target"], env["platform"], env["target"]),
+        "demo/addons/hello_gdextension_plugin/bin/libhello_gdextension.{}.{}.framework/libhello_gdextension.{}.{}".format(env["platform"], env["target"], env["platform"], env["target"]),
         source=sources,
     )
 else:
     library = env.SharedLibrary(
-        "src/main/assets/addons/hello_gdextension_plugin/.bin/libhello_gdextension{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
+        "demo/addons/hello_gdextension_plugin/bin/libhello_gdextension{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
         source=sources,
     )
 
diff --git a/plugins/hello_gdextension/build.gradle b/plugins/hello_gdextension/build.gradle
index 11896d5..da288b2 100644
--- a/plugins/hello_gdextension/build.gradle
+++ b/plugins/hello_gdextension/build.gradle
@@ -44,39 +44,37 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlinVersion"
 }
 
-tasks.register('copyDebugAARToAddons', Copy) {
+tasks.register('copyDebugAARToDemoAddons', Copy) {
     from 'build/outputs/aar'
     include 'HelloGDExtension.debug.aar'
-    into 'src/main/assets/addons/hello_gdextension_plugin/.bin/debug'
+    into 'demo/addons/hello_gdextension_plugin/bin/debug'
 }
 
-tasks.register('copyReleaseAARToAddons', Copy) {
+tasks.register('copyReleaseAARToDemoAddons', Copy) {
     from 'build/outputs/aar'
     include 'HelloGDExtension.release.aar'
-    into 'src/main/assets/addons/hello_gdextension_plugin/.bin/release'
+    into 'demo/addons/hello_gdextension_plugin/bin/release'
 }
 
 tasks.register('copyDebugSharedLibs', Copy) {
     dependsOn(":plugins:hello_gdextension:externalNativeBuildDebug")
 
-    from 'build/intermediates/cmake/debug/obj/arm64-v8a'
-    include 'libhello_gdextension.so'
-    into 'src/main/assets/addons/hello_gdextension_plugin/.bin/debug'
+    from 'build/intermediates/cmake/debug/obj'
+    into 'demo/addons/hello_gdextension_plugin/bin/debug'
 }
 
 tasks.register('copyReleaseSharedLibs', Copy) {
     dependsOn(":plugins:hello_gdextension:externalNativeBuildRelease")
 
-    from 'build/intermediates/cmake/release/obj/arm64-v8a'
-    include 'libhello_gdextension.so'
-    into 'src/main/assets/addons/hello_gdextension_plugin/.bin/release'
+    from 'build/intermediates/cmake/release/obj'
+    into 'demo/addons/hello_gdextension_plugin/bin/release'
 }
 
 tasks.register('copyAddonsToDemo', Copy) {
-    dependsOn(copyDebugAARToAddons)
-    dependsOn(copyReleaseAARToAddons)
-    dependsOn(copyDebugSharedLibs)
-    dependsOn(copyReleaseSharedLibs)
+    finalizedBy(copyDebugAARToDemoAddons)
+    finalizedBy(copyReleaseAARToDemoAddons)
+    finalizedBy(copyDebugSharedLibs)
+    finalizedBy(copyReleaseSharedLibs)
 
     doFirst {
         delete('demo/addons/hello_gdextension_plugin')
@@ -86,8 +84,8 @@ tasks.register('copyAddonsToDemo', Copy) {
 
 }
 
-assemble.finalizedBy(copyDebugAARToAddons)
-assemble.finalizedBy(copyReleaseAARToAddons)
+assemble.finalizedBy(copyAddonsToDemo)
+assemble.finalizedBy(copyDebugAARToDemoAddons)
+assemble.finalizedBy(copyReleaseAARToDemoAddons)
 assemble.finalizedBy(copyDebugSharedLibs)
 assemble.finalizedBy(copyReleaseSharedLibs)
-assemble.finalizedBy(copyAddonsToDemo)
diff --git a/plugins/hello_gdextension/demo/main.gd b/plugins/hello_gdextension/demo/main.gd
index c457271..a63d37b 100644
--- a/plugins/hello_gdextension/demo/main.gd
+++ b/plugins/hello_gdextension/demo/main.gd
@@ -1,5 +1,5 @@
 extends Node2D
 
-func _ready():	
+func _ready():
 	var hello_gdextension_plugin = preload("res://addons/hello_gdextension_plugin/interface/hello_gdextension_plugin.gd").new()
 	hello_gdextension_plugin.add_gdexample_node(get_path())
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gdignore b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gdignore
deleted file mode 100644
index 8b13789..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gdignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gitignore b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gitignore
deleted file mode 100644
index 375ed0d..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.bin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!.gdignore
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/.gdignore b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/.gdignore
deleted file mode 100644
index 8b13789..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/.gdignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_export_plugin.gd b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_export_plugin.gd
deleted file mode 100644
index 5131aa2..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_export_plugin.gd
+++ /dev/null
@@ -1,16 +0,0 @@
-@tool
-extends EditorExportPlugin
-
-func _supports_platform(platform):
-	if platform is EditorExportPlatformAndroid:
-		return true
-	return false
-
-func _get_android_libraries(platform, debug):
-	if debug:
-		return PackedStringArray(["hello_gdextension_plugin/.bin/debug/HelloGDExtension.debug.aar"])
-	else:
-		return PackedStringArray(["hello_gdextension_plugin/.bin/release/HelloGDExtension.release.aar"])
-
-func _get_name():
-	return "Hello GDExtension plugin"
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_plugin.gd b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_plugin.gd
deleted file mode 100644
index f74419c..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/.export/hello_gdextension_editor_plugin.gd
+++ /dev/null
@@ -1,15 +0,0 @@
-@tool
-extends EditorPlugin
-
-# A class member to hold the export plugin during its lifecycle
-var export_plugin : EditorExportPlugin
-
-func _enter_tree():
-	# Initialization of the plugin goes here.
-	export_plugin = preload("hello_gdextension_editor_export_plugin.gd").new()
-	add_export_plugin(export_plugin)
-
-func _exit_tree():
-	# Clean up of the plugin goes here.
-	remove_export_plugin(export_plugin)
-	export_plugin = null
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension
index 7172dc0..56faff9 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension
+++ b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension
@@ -6,6 +6,6 @@ android_aar_plugin = true
 
 [libraries]
 
-macos = "res://addons/hello_gdextension_plugin/.bin/libhello_gdextension.macos.template_debug.framework"
-android.debug.arm64 = "res://addons/hello_gdextension_plugin/.bin/debug/libhello_gdextension.so"
-android.release.arm64 = "res://addons/hello_gdextension_plugin/.bin/release/libhello_gdextension.so"
+macos = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.macos.template_debug.framework"
+android.debug.arm64 = "res://addons/hello_gdextension_plugin/bin/debug/arm64-v8a/libhello_gdextension.so"
+android.release.arm64 = "res://addons/hello_gdextension_plugin/bin/release/arm64-v8a/libhello_gdextension.so"
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd
new file mode 100644
index 0000000..7829c24
--- /dev/null
+++ b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd
@@ -0,0 +1,33 @@
+@tool
+extends EditorPlugin
+
+# A class member to hold the export plugin during its lifecycle
+var export_plugin : AndroidExportPlugin
+
+func _enter_tree():
+	# Initialization of the plugin goes here.
+	export_plugin = AndroidExportPlugin.new()
+	add_export_plugin(export_plugin)
+
+
+func _exit_tree():
+	# Clean up of the plugin goes here.
+	remove_export_plugin(export_plugin)
+	export_plugin = null
+
+
+class AndroidExportPlugin extends EditorExportPlugin:
+
+	func _supports_platform(platform):
+		if platform is EditorExportPlatformAndroid:
+			return true
+		return false
+
+	func _get_android_libraries(platform, debug):
+		if debug:
+			return PackedStringArray(["hello_gdextension_plugin/bin/debug/HelloGDExtension.debug.aar"])
+		else:
+			return PackedStringArray(["hello_gdextension_plugin/bin/release/HelloGDExtension.release.aar"])
+
+	func _get_name():
+		return "Hello GDExtension plugin"
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg
index 5c60f2b..c9f51e0 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg
+++ b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg
@@ -4,4 +4,4 @@ name="Hello GDExtension plugin"
 description="Showcases how to package an Android GDExtension plugin"
 author="Fredia Huya-Kouadio"
 version=""
-script=".export/hello_gdextension_editor_plugin.gd"
+script="hello_gdextension_export_plugin.gd"