From 6f02ded20ed4265efd4532614bb35d9bdd0e5a90 Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Tue, 2 Apr 2024 05:27:53 +0000 Subject: [PATCH] Move emulator-base native code into its own non-Gradle directory. --- .idea/modules/squirreljme.iml | 8 ++++---- build.gradle | 12 ++++++------ .../src/main => emulator-base-native}/CMakeLists.txt | 0 .../src/main => emulator-base-native}/c/mle_debug.c | 0 .../src/main => emulator-base-native}/c/mle_form.c | 0 .../src/main => emulator-base-native}/c/mle_jar.c | 0 .../src/main => emulator-base-native}/c/mle_math.c | 0 .../src/main => emulator-base-native}/c/mle_midi.c | 0 .../src/main => emulator-base-native}/c/mle_nativearchive.c | 0 .../src/main => emulator-base-native}/c/mle_object.c | 0 .../src/main => emulator-base-native}/c/mle_pencil.c | 0 .../src/main => emulator-base-native}/c/mle_reflection.c | 0 .../src/main => emulator-base-native}/c/mle_runtime.c | 0 .../src/main => emulator-base-native}/c/mle_task.c | 0 .../src/main => emulator-base-native}/c/mle_terminal.c | 0 .../src/main => emulator-base-native}/c/mle_thread.c | 0 .../src/main => emulator-base-native}/c/mle_type.c | 0 .../src/main => emulator-base-native}/c/nativebinding.c | 0 .../src/main => emulator-base-native}/c/utils.c | 0 .../headers/cc_squirreljme_emulator_NativeBinding.h | 0 .../headers/cc_squirreljme_jvm_Assembly.h | 0 .../headers/cc_squirreljme_jvm_mle_UIFormShelf.h | 0 .../main => emulator-base-native}/headers/jni/LICENSE.JNI | 0 .../src/main => emulator-base-native}/headers/jni/jni.h | 0 .../main => emulator-base-native}/headers/jni/jni_linux.h | 0 .../src/main => emulator-base-native}/headers/jni/jni_mac.h | 0 .../src/main => emulator-base-native}/headers/jni/jni_win.h | 0 .../src/main => emulator-base-native}/headers/squirreljme.h | 0 emulators/emulator-base/build.gradle | 3 ++- 29 files changed, 12 insertions(+), 11 deletions(-) rename emulators/{emulator-base/src/main => emulator-base-native}/CMakeLists.txt (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_debug.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_form.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_jar.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_math.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_midi.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_nativearchive.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_object.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_pencil.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_reflection.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_runtime.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_task.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_terminal.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_thread.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/mle_type.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/nativebinding.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/c/utils.c (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/cc_squirreljme_emulator_NativeBinding.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/cc_squirreljme_jvm_Assembly.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/cc_squirreljme_jvm_mle_UIFormShelf.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/jni/LICENSE.JNI (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/jni/jni.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/jni/jni_linux.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/jni/jni_mac.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/jni/jni_win.h (100%) rename emulators/{emulator-base/src/main => emulator-base-native}/headers/squirreljme.h (100%) diff --git a/.idea/modules/squirreljme.iml b/.idea/modules/squirreljme.iml index 7ed444d924..923fb53ced 100644 --- a/.idea/modules/squirreljme.iml +++ b/.idea/modules/squirreljme.iml @@ -265,10 +265,6 @@ - - - - @@ -297,6 +293,10 @@ + + + + diff --git a/build.gradle b/build.gradle index bb4335be8b..82f1abe023 100644 --- a/build.gradle +++ b/build.gradle @@ -39,16 +39,16 @@ idea excludeDirs += file("manifest") excludeDirs += file("manifest.uuid") + // Emulator Base Native Code + excludeDirs += file("emulators/emulator-base-native/cmake-build-debug") + excludeDirs += file("emulators/emulator-base-native/cmake-build-release") + excludeDirs += file("emulators/emulator-base-native/cmake-build-relwithdebinfo") + // NanoCoat files excludeDirs += file("nanocoat/build") excludeDirs += file("nanocoat/cmake-build-debug") excludeDirs += file("nanocoat/cmake-build-release") - - // RatufaCoat files - excludeDirs += file("ratufacoat/build") - excludeDirs += file("ratufacoat/cmake-build-debug") - excludeDirs += file("ratufacoat/cmake-build-release") - excludeDirs += file("ratufacoat/.sample") + excludeDirs += file("nanocoat/cmake-build-relwithdebinfo") // IntelliJ's own dependency matrix output (in "out") project.allprojects.each() { Project subProj -> diff --git a/emulators/emulator-base/src/main/CMakeLists.txt b/emulators/emulator-base-native/CMakeLists.txt similarity index 100% rename from emulators/emulator-base/src/main/CMakeLists.txt rename to emulators/emulator-base-native/CMakeLists.txt diff --git a/emulators/emulator-base/src/main/c/mle_debug.c b/emulators/emulator-base-native/c/mle_debug.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_debug.c rename to emulators/emulator-base-native/c/mle_debug.c diff --git a/emulators/emulator-base/src/main/c/mle_form.c b/emulators/emulator-base-native/c/mle_form.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_form.c rename to emulators/emulator-base-native/c/mle_form.c diff --git a/emulators/emulator-base/src/main/c/mle_jar.c b/emulators/emulator-base-native/c/mle_jar.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_jar.c rename to emulators/emulator-base-native/c/mle_jar.c diff --git a/emulators/emulator-base/src/main/c/mle_math.c b/emulators/emulator-base-native/c/mle_math.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_math.c rename to emulators/emulator-base-native/c/mle_math.c diff --git a/emulators/emulator-base/src/main/c/mle_midi.c b/emulators/emulator-base-native/c/mle_midi.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_midi.c rename to emulators/emulator-base-native/c/mle_midi.c diff --git a/emulators/emulator-base/src/main/c/mle_nativearchive.c b/emulators/emulator-base-native/c/mle_nativearchive.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_nativearchive.c rename to emulators/emulator-base-native/c/mle_nativearchive.c diff --git a/emulators/emulator-base/src/main/c/mle_object.c b/emulators/emulator-base-native/c/mle_object.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_object.c rename to emulators/emulator-base-native/c/mle_object.c diff --git a/emulators/emulator-base/src/main/c/mle_pencil.c b/emulators/emulator-base-native/c/mle_pencil.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_pencil.c rename to emulators/emulator-base-native/c/mle_pencil.c diff --git a/emulators/emulator-base/src/main/c/mle_reflection.c b/emulators/emulator-base-native/c/mle_reflection.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_reflection.c rename to emulators/emulator-base-native/c/mle_reflection.c diff --git a/emulators/emulator-base/src/main/c/mle_runtime.c b/emulators/emulator-base-native/c/mle_runtime.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_runtime.c rename to emulators/emulator-base-native/c/mle_runtime.c diff --git a/emulators/emulator-base/src/main/c/mle_task.c b/emulators/emulator-base-native/c/mle_task.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_task.c rename to emulators/emulator-base-native/c/mle_task.c diff --git a/emulators/emulator-base/src/main/c/mle_terminal.c b/emulators/emulator-base-native/c/mle_terminal.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_terminal.c rename to emulators/emulator-base-native/c/mle_terminal.c diff --git a/emulators/emulator-base/src/main/c/mle_thread.c b/emulators/emulator-base-native/c/mle_thread.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_thread.c rename to emulators/emulator-base-native/c/mle_thread.c diff --git a/emulators/emulator-base/src/main/c/mle_type.c b/emulators/emulator-base-native/c/mle_type.c similarity index 100% rename from emulators/emulator-base/src/main/c/mle_type.c rename to emulators/emulator-base-native/c/mle_type.c diff --git a/emulators/emulator-base/src/main/c/nativebinding.c b/emulators/emulator-base-native/c/nativebinding.c similarity index 100% rename from emulators/emulator-base/src/main/c/nativebinding.c rename to emulators/emulator-base-native/c/nativebinding.c diff --git a/emulators/emulator-base/src/main/c/utils.c b/emulators/emulator-base-native/c/utils.c similarity index 100% rename from emulators/emulator-base/src/main/c/utils.c rename to emulators/emulator-base-native/c/utils.c diff --git a/emulators/emulator-base/src/main/headers/cc_squirreljme_emulator_NativeBinding.h b/emulators/emulator-base-native/headers/cc_squirreljme_emulator_NativeBinding.h similarity index 100% rename from emulators/emulator-base/src/main/headers/cc_squirreljme_emulator_NativeBinding.h rename to emulators/emulator-base-native/headers/cc_squirreljme_emulator_NativeBinding.h diff --git a/emulators/emulator-base/src/main/headers/cc_squirreljme_jvm_Assembly.h b/emulators/emulator-base-native/headers/cc_squirreljme_jvm_Assembly.h similarity index 100% rename from emulators/emulator-base/src/main/headers/cc_squirreljme_jvm_Assembly.h rename to emulators/emulator-base-native/headers/cc_squirreljme_jvm_Assembly.h diff --git a/emulators/emulator-base/src/main/headers/cc_squirreljme_jvm_mle_UIFormShelf.h b/emulators/emulator-base-native/headers/cc_squirreljme_jvm_mle_UIFormShelf.h similarity index 100% rename from emulators/emulator-base/src/main/headers/cc_squirreljme_jvm_mle_UIFormShelf.h rename to emulators/emulator-base-native/headers/cc_squirreljme_jvm_mle_UIFormShelf.h diff --git a/emulators/emulator-base/src/main/headers/jni/LICENSE.JNI b/emulators/emulator-base-native/headers/jni/LICENSE.JNI similarity index 100% rename from emulators/emulator-base/src/main/headers/jni/LICENSE.JNI rename to emulators/emulator-base-native/headers/jni/LICENSE.JNI diff --git a/emulators/emulator-base/src/main/headers/jni/jni.h b/emulators/emulator-base-native/headers/jni/jni.h similarity index 100% rename from emulators/emulator-base/src/main/headers/jni/jni.h rename to emulators/emulator-base-native/headers/jni/jni.h diff --git a/emulators/emulator-base/src/main/headers/jni/jni_linux.h b/emulators/emulator-base-native/headers/jni/jni_linux.h similarity index 100% rename from emulators/emulator-base/src/main/headers/jni/jni_linux.h rename to emulators/emulator-base-native/headers/jni/jni_linux.h diff --git a/emulators/emulator-base/src/main/headers/jni/jni_mac.h b/emulators/emulator-base-native/headers/jni/jni_mac.h similarity index 100% rename from emulators/emulator-base/src/main/headers/jni/jni_mac.h rename to emulators/emulator-base-native/headers/jni/jni_mac.h diff --git a/emulators/emulator-base/src/main/headers/jni/jni_win.h b/emulators/emulator-base-native/headers/jni/jni_win.h similarity index 100% rename from emulators/emulator-base/src/main/headers/jni/jni_win.h rename to emulators/emulator-base-native/headers/jni/jni_win.h diff --git a/emulators/emulator-base/src/main/headers/squirreljme.h b/emulators/emulator-base-native/headers/squirreljme.h similarity index 100% rename from emulators/emulator-base/src/main/headers/squirreljme.h rename to emulators/emulator-base-native/headers/squirreljme.h diff --git a/emulators/emulator-base/build.gradle b/emulators/emulator-base/build.gradle index 62d1db02ca..fbbc9df899 100644 --- a/emulators/emulator-base/build.gradle +++ b/emulators/emulator-base/build.gradle @@ -35,7 +35,8 @@ dependencies Provider libNativeEmulatorBase = tasks.register( "libNativeEmulatorBase", CMakeBuildTask.class, - project.getProjectDir().toPath().resolve("src").resolve("main"), + project.getProjectDir().toPath().getParent() + .resolve("emulator-base-native"), System.mapLibraryName("emulator-base"), ["libEmulatorBase"]) -- 2.11.4.GIT