Refactor the project structure

.gitignore

@@ -24,4 +24,4 @@ local.properties
 
 # Misc
 .DS_Store
-/common/src/gen/
+/plugin/src/gen/

SConstruct

@@ -9,18 +9,18 @@ opts.Update(env)
 
 # Add common includes
 env.Append(CPPPATH=[
-    "#common/src/main/cpp/include/",
+    "#plugin/src/main/cpp/include/",
     "#thirdparty/openxr/include/",
     ])
 
 sources = []
-sources += Glob("#common/src/main/cpp/*.cpp")
-sources += Glob("#common/src/main/cpp/export/*.cpp")
-sources += Glob("#common/src/main/cpp/extensions/*.cpp")
-sources += Glob("#common/src/main/cpp/classes/*.cpp")
+sources += Glob("#plugin/src/main/cpp/*.cpp")
+sources += Glob("#plugin/src/main/cpp/export/*.cpp")
+sources += Glob("#plugin/src/main/cpp/extensions/*.cpp")
+sources += Glob("#plugin/src/main/cpp/classes/*.cpp")
 
 if env["target"] in ["editor", "template_debug"]:
-  doc_data = env.GodotCPPDocData("#common/src/gen/doc_data.gen.cpp", source=Glob("doc_classes/*.xml"))
+  doc_data = env.GodotCPPDocData("#plugin/src/gen/doc_data.gen.cpp", source=Glob("doc_classes/*.xml"))
   sources.append(doc_data)
 
 binary_path = '#demo/addons/godotopenxrvendors/.bin'

build.gradle

@@ -31,11 +31,7 @@ task clean(type: Delete) {
     dependsOn 'cleanAddon'
     dependsOn 'cleanBuildFromSamples'
 
-    dependsOn ':godotopenxrkhronos:clean'
-    dependsOn ':godotopenxrlynx:clean'
-    dependsOn ':godotopenxrmeta:clean'
-    dependsOn ':godotopenxrpico:clean'
-    dependsOn ':godotopenxrmagicleap:clean'
+    dependsOn ':plugin:clean'
 }
 
 /**
@@ -52,13 +48,7 @@ task cleanAddon(type: Delete) {
 task buildPlugin {
     // Generate the editor gdextension binaries
     dependsOn ':buildSconsArtifacts'
-
-    dependsOn ":godotopenxrkhronos:build"
-    dependsOn ":godotopenxrlynx:build"
-    dependsOn ":godotopenxrmeta:build"
-    dependsOn ":godotopenxrpico:build"
-    dependsOn ":godotopenxrmagicleap:build"
-
+    dependsOn ":plugin:build"
     finalizedBy "copyBuildToSamples"
 }
 
@@ -158,4 +148,4 @@ task cleanBuildFromSamples {
             }
         }
     }
-}
+}

config.gradle

@@ -15,20 +15,20 @@ ext {
     libraries = [
             godotAndroidLib: "org.godotengine:godot:4.3.0.stable",
     ]
-}
 
-// Parse the release version from the gradle project properties (e.g: -Prelease_version=<version>)
-ext.getReleaseVersion = { ->
-    final String defaultVersion = "3.1.0-dev-SNAPSHOT"
+    // Parse the release version from the gradle project properties (e.g: -Prelease_version=<version>)
+    getReleaseVersion = { ->
+        final String defaultVersion = "3.1.0-dev-SNAPSHOT"
 
-    String releaseVersion = project.hasProperty("release_version") ? project.property("release_version") : defaultVersion
-    if (releaseVersion == null || releaseVersion.isEmpty()) {
-        releaseVersion = defaultVersion
-    }
+        String releaseVersion = project.hasProperty("release_version") ? project.property("release_version") : defaultVersion
+        if (releaseVersion == null || releaseVersion.isEmpty()) {
+            releaseVersion = defaultVersion
+        }
 
-    if (!releaseVersion.endsWithIgnoreCase("-stable") && !releaseVersion.endsWithIgnoreCase("-snapshot")) {
-        releaseVersion += "-SNAPSHOT"
-    }
+        if (!releaseVersion.endsWithIgnoreCase("-stable") && !releaseVersion.endsWithIgnoreCase("-snapshot")) {
+            releaseVersion += "-SNAPSHOT"
+        }
 
-    return releaseVersion
+        return releaseVersion
+    }
 }