[godot] Move spine_godot outside the Godot source tree.

.gitignore

@@ -164,12 +164,8 @@ spine-cocos2dx/example-v4/build-macos
 spine-cocos2dx/example/build-ios
 spine-cocos2dx/example/proj.android/app/.cxx
 spine-cocos2dx/example/build-win
-spine-godot/godot/*
-!spine-godot/godot/modules/
-spine-godot/godot/modules/*
-!spine-godot/godot/modules/spine_godot/
-spine-godot/godot/modules/spine_godot/*.o
-spine-godot/godot/modules/spine_godot/__pycache__
-spine-godot/godot/modules/spine_godot/spine-cpp
-spine-godot/godot/modules/godot-copy
+spine-godot/godot
+spine-godot/spine_godot/*.o
+spine-godot/spine_godot/spine-cpp
+spine-godot/spine_godot/__pycache__
 spine-godot/example/.import

spine-godot/.idea/misc.xml

@@ -12,6 +12,8 @@
       </CompDBProjectSettings>
     </option>
   </component>
-  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$">
+    <contentRoot DIR="$PROJECT_DIR$/.." />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
 </project>

spine-godot/.idea/tools/External Tools.xml

@@ -2,7 +2,7 @@
   <tool name="scons debug" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
     <exec>
       <option name="COMMAND" value="scons" />
-      <option name="PARAMETERS" value="target=debug -j8" />
+      <option name="PARAMETERS" value="target=debug custom_modules=&quot;../spine_godot&quot; -j8" />
       <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
     </exec>
   </tool>

spine-godot/.idea/workspace.xml

@@ -8,7 +8,7 @@
   </component>
   <component name="CMakeSettings">
     <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" ENABLED="true" />
+      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
     </configurations>
   </component>
   <component name="ChangeListManager">
@@ -53,6 +53,17 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="1yu64nUS0zjllOk9AGzuegMkIMx" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -64,6 +75,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="cf.advertisement.text.overridden" value="true" />
     <property name="cf.first.check.clang-format" value="false" />
     <property name="cidr.known.project.marker" value="true" />
     <property name="node.js.detected.package.eslint" value="true" />
@@ -71,9 +83,9 @@
     <property name="settings.editor.selected.configurable" value="CLionExternalConfigurable" />
   </component>
   <component name="RunManager">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
+    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
+        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
     <configuration name="godot debug" type="CLionExternalRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--editor --path $ProjectFileDir$/../example" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="godot" TARGET_NAME="scons debug" CONFIG_NAME="scons debug" RUN_PATH="$PROJECT_DIR$/bin/godot.osx.tools.64">
@@ -81,9 +93,9 @@
         <option name="CLION.EXTERNAL.BUILD" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
+    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
-        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
   </component>
@@ -96,6 +108,7 @@
       <option name="presentableId" value="Default" />
       <updated>1633088939732</updated>
       <workItem from="1633088942825" duration="326000" />
+      <workItem from="1649519095761" duration="518000" />
     </task>
     <servers />
   </component>

spine-godot/setup.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 set -e
-git clean -x -f -d
-cp -r ../spine-cpp/spine-cpp godot/modules/spine_godot
-git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable godot-copy
-rm -rf godot-copy/.git
-cp -r godot-copy/* godot
-rm -rf godot-copy
+#git clean -x -f -d
+git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable
 cp -r .idea godot
+cp custom.py godot
+cp -r ../spine-cpp/spine-cpp spine_godot
 pushd godot
-scons -Q compiledb
-scons target=debug --jobs=$(sysctl -n hw.logicalcpu)
+scons -Q compiledb custom_modules="../spine_godot"
+scons target=debug custom_modules="../spine_godot" --jobs=$(sysctl -n hw.logicalcpu)
 popd

spine-godot/godot/modules/spine_godot/SCsub → spine-godot/spine_godot/SCsub

@@ -2,6 +2,6 @@ Import('env')
 
 env_spine_runtime = env.Clone()
 
-env_spine_runtime.Prepend(CPPPATH=["spine-cpp/include", "modules/spine_godot/spine-cpp/include"])
+env_spine_runtime.Prepend(CPPPATH=["spine-cpp/include", "spine_godot/spine-cpp/include"])
 env_spine_runtime.add_source_files(env.modules_sources, "spine-cpp/src/spine/*.cpp")
 env_spine_runtime.add_source_files(env.modules_sources, "*.cpp")