From 558157ef851432430e7ca052e541e50f1be837c8 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Sat, 3 Aug 2019 17:45:59 +0200 Subject: [PATCH] Restructure files and migrate to Gradle-based build --- .appveyor.yml | 28 ---------- .gitignore | 7 ++- CMakeLists.txt | 42 --------------- appInfo.cmake | 8 --- build.gradle.kts | 24 +++++++++ extras/AdobeAfterEffects/CMakeLists.txt | 11 ---- extras/EsotericSoftwareSpine/.gitignore | 8 --- extras/EsotericSoftwareSpine/CMakeLists.txt | 18 ------- extras/EsotericSoftwareSpine/build.gradle.kts | 50 ------------------ .../EsotericSoftwareSpine/settings.gradle.kts | 1 - extras/MagixVegas/CMakeLists.txt | 14 ----- .../wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 .../EsotericSoftwareSpine/gradlew => gradlew | 0 .../gradlew.bat => gradlew.bat | 0 package-osx.sh | 6 --- package-win.bat | 5 -- .../README.adoc | 0 .../Rhubarb Lip Sync.jsx | 0 rhubarb-for-after-effects/build.gradle.kts | 12 +++++ .../README.adoc | 0 rhubarb-for-spine/build.gradle.kts | 50 ++++++++++++++++++ .../src/main/kotlin/AnimationFileModel.kt | 0 .../src/main/kotlin/AudioFileModel.kt | 0 .../src/main/kotlin/EndUserException.kt | 0 .../src/main/kotlin/ErrorProperty.kt | 0 .../src/main/kotlin/MainApp.kt | 0 .../src/main/kotlin/MainModel.kt | 0 .../src/main/kotlin/MainView.kt | 0 .../src/main/kotlin/MouthCue.kt | 0 .../src/main/kotlin/MouthNaming.kt | 0 .../src/main/kotlin/MouthShape.kt | 0 .../src/main/kotlin/RhubarbTask.kt | 0 .../src/main/kotlin/SpineJson.kt | 0 .../src/main/kotlin/classLocation.kt | 0 .../src/main/kotlin/main.kt | 0 .../src/main/kotlin/tools.kt | 0 .../src/main/resources/icon-16.png | Bin .../src/main/resources/icon-256.png | Bin .../src/main/resources/icon-32.png | Bin .../src/main/resources/icon-48.png | Bin .../src/test/data/jsonFiles/audio/.gitkeep | 0 .../src/test/data/jsonFiles/images/.gitkeep | 0 .../data/jsonFiles/matt-3.7-essential.json | 0 .../src/test/data/jsonFiles/matt-3.7.json | 0 .../data/jsonFiles/matt-3.8-essential.json | 0 .../src/test/data/jsonFiles/matt-3.8.json | 0 .../src/test/kotlin/SpineJsonTest.kt | 0 .../test/resources/junit-platform.properties | 0 .../.gitignore | 0 .../Debug Rhubarb.cs | 0 .../Debug Rhubarb.cs.config | 0 .../Import Rhubarb.cs | 0 .../Import Rhubarb.cs.config | 0 .../README.adoc | 0 rhubarb-for-vegas/build.gradle.kts | 18 +++++++ settings.gradle.kts | 5 ++ 57 files changed, 114 insertions(+), 193 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 CMakeLists.txt delete mode 100644 appInfo.cmake create mode 100644 build.gradle.kts delete mode 100644 extras/AdobeAfterEffects/CMakeLists.txt delete mode 100644 extras/EsotericSoftwareSpine/.gitignore delete mode 100644 extras/EsotericSoftwareSpine/CMakeLists.txt delete mode 100644 extras/EsotericSoftwareSpine/build.gradle.kts delete mode 100644 extras/EsotericSoftwareSpine/settings.gradle.kts delete mode 100644 extras/MagixVegas/CMakeLists.txt rename {extras/EsotericSoftwareSpine/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {extras/EsotericSoftwareSpine/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename extras/EsotericSoftwareSpine/gradlew => gradlew (100%) rename extras/EsotericSoftwareSpine/gradlew.bat => gradlew.bat (100%) delete mode 100755 package-osx.sh delete mode 100644 package-win.bat rename {extras/AdobeAfterEffects => rhubarb-for-after-effects}/README.adoc (100%) rename {extras/AdobeAfterEffects => rhubarb-for-after-effects}/Rhubarb Lip Sync.jsx (100%) create mode 100644 rhubarb-for-after-effects/build.gradle.kts rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/README.adoc (100%) create mode 100644 rhubarb-for-spine/build.gradle.kts rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/AnimationFileModel.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/AudioFileModel.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/EndUserException.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/ErrorProperty.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MainApp.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MainModel.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MainView.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MouthCue.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MouthNaming.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/MouthShape.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/RhubarbTask.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/SpineJson.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/classLocation.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/main.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/kotlin/tools.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/resources/icon-16.png (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/resources/icon-256.png (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/resources/icon-32.png (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/main/resources/icon-48.png (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/audio/.gitkeep (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/images/.gitkeep (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/matt-3.7-essential.json (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/matt-3.7.json (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/matt-3.8-essential.json (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/data/jsonFiles/matt-3.8.json (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/kotlin/SpineJsonTest.kt (100%) rename {extras/EsotericSoftwareSpine => rhubarb-for-spine}/src/test/resources/junit-platform.properties (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/.gitignore (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/Debug Rhubarb.cs (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/Debug Rhubarb.cs.config (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/Import Rhubarb.cs (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/Import Rhubarb.cs.config (100%) rename {extras/MagixVegas => rhubarb-for-vegas}/README.adoc (100%) create mode 100644 rhubarb-for-vegas/build.gradle.kts create mode 100644 settings.gradle.kts diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 1f09e67..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,28 +0,0 @@ -image: Visual Studio 2015 -environment: - BOOST_ROOT: C:\Libraries\boost_1_66_0 - # If the Gradle Daemon is used, AppVeyor waits forever for it to terminate - GRADLE_OPTS: -Dorg.gradle.daemon=false -init: - # Print Remote Desktop information for debugging porposes - - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -build_script: - - mkdir build - - cd build - - cmake .. -G "Visual Studio 14 2015" - - cmake --build . --config Release --target package - - cd %APPVEYOR_BUILD_FOLDER% -test_script: - - build\rhubarb\Release\runTests.exe -artifacts: - - path: build\rhubarb-lip-sync-*.zip -deploy: - provider: GitHub - release: $(APPVEYOR_REPO_TAG_NAME) - description: '' - auth_token: - secure: Gk7y8Cb9ImDBthgL56W1QMWDEp4oIcbUeKgXnkiBsy7G+V6H59MPXv0ZC7Zht8+3 - artifact: /.*\.zip/ - draft: true - on: - appveyor_repo_tag: true diff --git a/.gitignore b/.gitignore index 3b6a86f..059587a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -.vs/ +.idea/ +.gradle/ +.vscode/ build/ -*.user \ No newline at end of file +out/ +*.user diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index d319a7e..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -include(appInfo.cmake) - -# Build and install main executable -add_subdirectory(rhubarb) - -# Build and install extras -add_subdirectory("extras/AdobeAfterEffects") -add_subdirectory("extras/MagixVegas") -add_subdirectory("extras/EsotericSoftwareSpine") - -# Install misc. files -install( - FILES README.adoc LICENSE.md CHANGELOG.md - DESTINATION . -) - -# Configure CPack -function(get_short_system_name variable) - if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(${variable} "OSX" PARENT_SCOPE) - elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - set(${variable} "Win32" PARENT_SCOPE) - else() - set(${variable} "${CMAKE_SYSTEM_NAME}" PARENT_SCOPE) - endif() -endfunction() - -set(CPACK_PACKAGE_NAME ${appName}) -string(REPLACE " " "-" CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") -get_short_system_name(CPACK_SYSTEM_NAME) -set(CPACK_PACKAGE_VERSION_MAJOR ${appVersionMajor}) -set(CPACK_PACKAGE_VERSION_MINOR ${appVersionMinor}) -set(CPACK_PACKAGE_VERSION_PATCH ${appVersionPatch}) -set(CPACK_PACKAGE_VERSION ${appVersion}) -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") -string(TOLOWER "${CPACK_PACKAGE_FILE_NAME}" CPACK_PACKAGE_FILE_NAME) -set(CPACK_GENERATOR ZIP) - -# Run CPack -include(CPack) diff --git a/appInfo.cmake b/appInfo.cmake deleted file mode 100644 index 8dadc0b..0000000 --- a/appInfo.cmake +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -set(appName "Rhubarb Lip Sync") -set(appVersionMajor 1) -set(appVersionMinor 10) -set(appVersionPatch 0) -set(appVersionSuffix "") -set(appVersion "${appVersionMajor}.${appVersionMinor}.${appVersionPatch}${appVersionSuffix}") diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..8d21efa --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + // Sets up standard lifecycle tasks like `build` and `assemble`. + // Also required for the Zip task to compute its archive file name. + base +} + +group = "com.rhubarb_lip_sync" +version = "2.0.0-pre-alpha" + +tasks { + val zip by creating(Zip::class) { + subprojects.forEach { dependsOn("${it.name}:assemble") } + + for (subproject in subprojects) { + from(File(subproject.buildDir, "distributions")) { + into(if (subproject.name == "rhubarb") "" else subproject.name) + } + } + } + + assemble { + dependsOn(zip) + } +} diff --git a/extras/AdobeAfterEffects/CMakeLists.txt b/extras/AdobeAfterEffects/CMakeLists.txt deleted file mode 100644 index 0e8283e..0000000 --- a/extras/AdobeAfterEffects/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -set(afterEffectsFiles - "Rhubarb Lip Sync.jsx" - "README.adoc" -) - -install( - FILES ${afterEffectsFiles} - DESTINATION "extras/AdobeAfterEffects" -) diff --git a/extras/EsotericSoftwareSpine/.gitignore b/extras/EsotericSoftwareSpine/.gitignore deleted file mode 100644 index 2f451d7..0000000 --- a/extras/EsotericSoftwareSpine/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Directory is generated when importing Gradle project -/.idea/ - -*.iml -/.gradle/ -/build/ -/out/ -/tmp/ diff --git a/extras/EsotericSoftwareSpine/CMakeLists.txt b/extras/EsotericSoftwareSpine/CMakeLists.txt deleted file mode 100644 index 2c32021..0000000 --- a/extras/EsotericSoftwareSpine/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -add_custom_target( - rhubarbForSpine ALL - "./gradlew" "build" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Building Rhubarb for Spine through Gradle." -) - -install( - DIRECTORY "build/libs/" - DESTINATION "extras/EsotericSoftwareSpine" -) - -install( - FILES README.adoc - DESTINATION "extras/EsotericSoftwareSpine" -) diff --git a/extras/EsotericSoftwareSpine/build.gradle.kts b/extras/EsotericSoftwareSpine/build.gradle.kts deleted file mode 100644 index 64dda69..0000000 --- a/extras/EsotericSoftwareSpine/build.gradle.kts +++ /dev/null @@ -1,50 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import java.io.File - -plugins { - kotlin("jvm") version "1.3.41" -} - -fun getVersion(): String { - // Dynamically read version from CMake file - val file = File(rootDir.parentFile.parentFile, "appInfo.cmake") - val text = file.readText() - val major = Regex("""appVersionMajor\s+(\d+)""").find(text)!!.groupValues[1] - val minor = Regex("""appVersionMinor\s+(\d+)""").find(text)!!.groupValues[1] - val patch = Regex("""appVersionPatch\s+(\d+)""").find(text)!!.groupValues[1] - val suffix = Regex("""appVersionSuffix\s+"(.*?)"""").find(text)!!.groupValues[1] - return "$major.$minor.$patch$suffix" -} - -group = "com.rhubarb_lip_sync" -version = getVersion() - -repositories { - mavenCentral() - jcenter() -} - -dependencies { - implementation(kotlin("stdlib-jdk8")) - implementation("com.beust:klaxon:5.0.1") - implementation("org.apache.commons:commons-lang3:3.9") - implementation("no.tornado:tornadofx:1.7.19") - testImplementation("org.junit.jupiter:junit-jupiter:5.5.0") - testCompile("org.assertj:assertj-core:3.11.1") -} - -tasks.withType { - kotlinOptions.jvmTarget = "1.8" -} - -tasks.test { - useJUnitPlatform() -} - -tasks.withType { - manifest { - attributes("Main-Class" to "com.rhubarb_lip_sync.rhubarb_for_spine.MainKt") - } - - from(configurations.compileClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) -} diff --git a/extras/EsotericSoftwareSpine/settings.gradle.kts b/extras/EsotericSoftwareSpine/settings.gradle.kts deleted file mode 100644 index 6e921c8..0000000 --- a/extras/EsotericSoftwareSpine/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "rhubarb-for-spine" diff --git a/extras/MagixVegas/CMakeLists.txt b/extras/MagixVegas/CMakeLists.txt deleted file mode 100644 index e02a623..0000000 --- a/extras/MagixVegas/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -set(vegasFiles - "Debug Rhubarb.cs" - "Debug Rhubarb.cs.config" - "Import Rhubarb.cs" - "Import Rhubarb.cs.config" - "README.adoc" -) - -install( - FILES ${vegasFiles} - DESTINATION "extras/MagixVegas" -) diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/extras/EsotericSoftwareSpine/gradlew b/gradlew similarity index 100% rename from extras/EsotericSoftwareSpine/gradlew rename to gradlew diff --git a/extras/EsotericSoftwareSpine/gradlew.bat b/gradlew.bat similarity index 100% rename from extras/EsotericSoftwareSpine/gradlew.bat rename to gradlew.bat diff --git a/package-osx.sh b/package-osx.sh deleted file mode 100755 index 11ae535..0000000 --- a/package-osx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -rm -rf build -mkdir build -cd build -cmake .. -G Xcode -cmake --build . --config Release --target package diff --git a/package-win.bat b/package-win.bat deleted file mode 100644 index c7fa94f..0000000 --- a/package-win.bat +++ /dev/null @@ -1,5 +0,0 @@ -rmdir /s /q build -mkdir build -cd build -cmake .. -G "Visual Studio 14 2015" -cmake --build . --config Release --target package diff --git a/extras/AdobeAfterEffects/README.adoc b/rhubarb-for-after-effects/README.adoc similarity index 100% rename from extras/AdobeAfterEffects/README.adoc rename to rhubarb-for-after-effects/README.adoc diff --git a/extras/AdobeAfterEffects/Rhubarb Lip Sync.jsx b/rhubarb-for-after-effects/Rhubarb Lip Sync.jsx similarity index 100% rename from extras/AdobeAfterEffects/Rhubarb Lip Sync.jsx rename to rhubarb-for-after-effects/Rhubarb Lip Sync.jsx diff --git a/rhubarb-for-after-effects/build.gradle.kts b/rhubarb-for-after-effects/build.gradle.kts new file mode 100644 index 0000000..044b3c4 --- /dev/null +++ b/rhubarb-for-after-effects/build.gradle.kts @@ -0,0 +1,12 @@ +tasks { + var distDirectory = File(project.buildDir, "distributions") + + val assemble by creating(Copy::class) { + from(listOf("Rhubarb Lip Sync.jsx", "README.adoc")) + into(distDirectory) + } + + val build by creating { + dependsOn(assemble) + } +} diff --git a/extras/EsotericSoftwareSpine/README.adoc b/rhubarb-for-spine/README.adoc similarity index 100% rename from extras/EsotericSoftwareSpine/README.adoc rename to rhubarb-for-spine/README.adoc diff --git a/rhubarb-for-spine/build.gradle.kts b/rhubarb-for-spine/build.gradle.kts new file mode 100644 index 0000000..4863931 --- /dev/null +++ b/rhubarb-for-spine/build.gradle.kts @@ -0,0 +1,50 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.3.41" +} + +repositories { + mavenCentral() + jcenter() +} + +dependencies { + implementation(kotlin("stdlib-jdk8")) + implementation("com.beust:klaxon:5.0.1") + implementation("org.apache.commons:commons-lang3:3.9") + implementation("no.tornado:tornadofx:1.7.19") + testImplementation("org.junit.jupiter:junit-jupiter:5.5.0") + testCompile("org.assertj:assertj-core:3.11.1") +} + +tasks { + var distDirectory = File(project.buildDir, "distributions") + + withType { + kotlinOptions.jvmTarget = "1.8" + } + + test { + useJUnitPlatform() + } + + val copyDoc by creating(Copy::class) { + from("README.adoc") + into(distDirectory) + } + + assemble { + dependsOn(copyDoc) + } + + jar { + destinationDirectory.set(distDirectory) + + manifest { + attributes("Main-Class" to "com.rhubarb_lip_sync.rhubarb_for_spine.MainKt") + } + + from(configurations.compileClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) + } +} diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/AnimationFileModel.kt b/rhubarb-for-spine/src/main/kotlin/AnimationFileModel.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/AnimationFileModel.kt rename to rhubarb-for-spine/src/main/kotlin/AnimationFileModel.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/AudioFileModel.kt b/rhubarb-for-spine/src/main/kotlin/AudioFileModel.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/AudioFileModel.kt rename to rhubarb-for-spine/src/main/kotlin/AudioFileModel.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/EndUserException.kt b/rhubarb-for-spine/src/main/kotlin/EndUserException.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/EndUserException.kt rename to rhubarb-for-spine/src/main/kotlin/EndUserException.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/ErrorProperty.kt b/rhubarb-for-spine/src/main/kotlin/ErrorProperty.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/ErrorProperty.kt rename to rhubarb-for-spine/src/main/kotlin/ErrorProperty.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainApp.kt b/rhubarb-for-spine/src/main/kotlin/MainApp.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainApp.kt rename to rhubarb-for-spine/src/main/kotlin/MainApp.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainModel.kt b/rhubarb-for-spine/src/main/kotlin/MainModel.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainModel.kt rename to rhubarb-for-spine/src/main/kotlin/MainModel.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainView.kt b/rhubarb-for-spine/src/main/kotlin/MainView.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainView.kt rename to rhubarb-for-spine/src/main/kotlin/MainView.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthCue.kt b/rhubarb-for-spine/src/main/kotlin/MouthCue.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthCue.kt rename to rhubarb-for-spine/src/main/kotlin/MouthCue.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthNaming.kt b/rhubarb-for-spine/src/main/kotlin/MouthNaming.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthNaming.kt rename to rhubarb-for-spine/src/main/kotlin/MouthNaming.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthShape.kt b/rhubarb-for-spine/src/main/kotlin/MouthShape.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthShape.kt rename to rhubarb-for-spine/src/main/kotlin/MouthShape.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/RhubarbTask.kt b/rhubarb-for-spine/src/main/kotlin/RhubarbTask.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/RhubarbTask.kt rename to rhubarb-for-spine/src/main/kotlin/RhubarbTask.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/SpineJson.kt b/rhubarb-for-spine/src/main/kotlin/SpineJson.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/SpineJson.kt rename to rhubarb-for-spine/src/main/kotlin/SpineJson.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/classLocation.kt b/rhubarb-for-spine/src/main/kotlin/classLocation.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/classLocation.kt rename to rhubarb-for-spine/src/main/kotlin/classLocation.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/main.kt b/rhubarb-for-spine/src/main/kotlin/main.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/main.kt rename to rhubarb-for-spine/src/main/kotlin/main.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/tools.kt b/rhubarb-for-spine/src/main/kotlin/tools.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/tools.kt rename to rhubarb-for-spine/src/main/kotlin/tools.kt diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-16.png b/rhubarb-for-spine/src/main/resources/icon-16.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-16.png rename to rhubarb-for-spine/src/main/resources/icon-16.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-256.png b/rhubarb-for-spine/src/main/resources/icon-256.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-256.png rename to rhubarb-for-spine/src/main/resources/icon-256.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-32.png b/rhubarb-for-spine/src/main/resources/icon-32.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-32.png rename to rhubarb-for-spine/src/main/resources/icon-32.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-48.png b/rhubarb-for-spine/src/main/resources/icon-48.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-48.png rename to rhubarb-for-spine/src/main/resources/icon-48.png diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/audio/.gitkeep b/rhubarb-for-spine/src/test/data/jsonFiles/audio/.gitkeep similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/audio/.gitkeep rename to rhubarb-for-spine/src/test/data/jsonFiles/audio/.gitkeep diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/images/.gitkeep b/rhubarb-for-spine/src/test/data/jsonFiles/images/.gitkeep similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/images/.gitkeep rename to rhubarb-for-spine/src/test/data/jsonFiles/images/.gitkeep diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7-essential.json b/rhubarb-for-spine/src/test/data/jsonFiles/matt-3.7-essential.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7-essential.json rename to rhubarb-for-spine/src/test/data/jsonFiles/matt-3.7-essential.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7.json b/rhubarb-for-spine/src/test/data/jsonFiles/matt-3.7.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7.json rename to rhubarb-for-spine/src/test/data/jsonFiles/matt-3.7.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8-essential.json b/rhubarb-for-spine/src/test/data/jsonFiles/matt-3.8-essential.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8-essential.json rename to rhubarb-for-spine/src/test/data/jsonFiles/matt-3.8-essential.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8.json b/rhubarb-for-spine/src/test/data/jsonFiles/matt-3.8.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8.json rename to rhubarb-for-spine/src/test/data/jsonFiles/matt-3.8.json diff --git a/extras/EsotericSoftwareSpine/src/test/kotlin/SpineJsonTest.kt b/rhubarb-for-spine/src/test/kotlin/SpineJsonTest.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/kotlin/SpineJsonTest.kt rename to rhubarb-for-spine/src/test/kotlin/SpineJsonTest.kt diff --git a/extras/EsotericSoftwareSpine/src/test/resources/junit-platform.properties b/rhubarb-for-spine/src/test/resources/junit-platform.properties similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/resources/junit-platform.properties rename to rhubarb-for-spine/src/test/resources/junit-platform.properties diff --git a/extras/MagixVegas/.gitignore b/rhubarb-for-vegas/.gitignore similarity index 100% rename from extras/MagixVegas/.gitignore rename to rhubarb-for-vegas/.gitignore diff --git a/extras/MagixVegas/Debug Rhubarb.cs b/rhubarb-for-vegas/Debug Rhubarb.cs similarity index 100% rename from extras/MagixVegas/Debug Rhubarb.cs rename to rhubarb-for-vegas/Debug Rhubarb.cs diff --git a/extras/MagixVegas/Debug Rhubarb.cs.config b/rhubarb-for-vegas/Debug Rhubarb.cs.config similarity index 100% rename from extras/MagixVegas/Debug Rhubarb.cs.config rename to rhubarb-for-vegas/Debug Rhubarb.cs.config diff --git a/extras/MagixVegas/Import Rhubarb.cs b/rhubarb-for-vegas/Import Rhubarb.cs similarity index 100% rename from extras/MagixVegas/Import Rhubarb.cs rename to rhubarb-for-vegas/Import Rhubarb.cs diff --git a/extras/MagixVegas/Import Rhubarb.cs.config b/rhubarb-for-vegas/Import Rhubarb.cs.config similarity index 100% rename from extras/MagixVegas/Import Rhubarb.cs.config rename to rhubarb-for-vegas/Import Rhubarb.cs.config diff --git a/extras/MagixVegas/README.adoc b/rhubarb-for-vegas/README.adoc similarity index 100% rename from extras/MagixVegas/README.adoc rename to rhubarb-for-vegas/README.adoc diff --git a/rhubarb-for-vegas/build.gradle.kts b/rhubarb-for-vegas/build.gradle.kts new file mode 100644 index 0000000..6656490 --- /dev/null +++ b/rhubarb-for-vegas/build.gradle.kts @@ -0,0 +1,18 @@ +tasks { + var distDirectory = File(project.buildDir, "distributions") + + val assemble by creating(Copy::class) { + from(listOf( + "Debug Rhubarb.cs", + "Debug Rhubarb.cs.config", + "Import Rhubarb.cs", + "Import Rhubarb.cs.config", + "README.adoc" + )) + into(distDirectory) + } + + create("build") { + dependsOn(assemble) + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..fdf105a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,5 @@ +rootProject.name = "rhubarb-lip-sync" + +include("rhubarb-for-after-effects") +include("rhubarb-for-spine") +include("rhubarb-for-vegas")