Merge pull request #7 from Software-Hardware-Codesign/refactor-modules

jme-alloc: refactored to jme native modular style
Electrostat-Lab · Jan 21, 2023 · 577063b · 577063b
2 parents 85ad87a + 1ae15db
commit 577063b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 16 deletions.
diff --git a/native-alloc/build.gradle → jme3-alloc-native/build.gradle b/native-alloc/build.gradle → jme3-alloc-native/build.gradle
@@ -12,8 +12,8 @@ plugins {
 }
 
 final String version = "0.1-A"
-final String buildDirectory="${project.rootDir}/jvm-alloc/build/classes/java/main/"
-final String nativeObjects="${project.rootDir}/native-alloc/build/lib/main/debug/"
+final String buildDirectory="${project.rootDir}/jme3-alloc/build/classes/java/main/"
+final String nativeObjects="${project.rootDir}/jme3-alloc-native/build/lib/main/debug/"
 
 task copyNatives(type: Copy) {
     from "${nativeObjects}"

diff --git a/jme3-alloc-native/src/c/c.cpp b/jme3-alloc-native/src/c/c.cpp
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+	printf("give me a bottle of rum!\n");
+	return 0;
+}
diff --git a/...main/include/com_jme3_alloc_BufferUtils.h → .../src/include/com_jme3_alloc_BufferUtils.h b/...main/include/com_jme3_alloc_BufferUtils.h → .../src/include/com_jme3_alloc_BufferUtils.h
diff --git a/...oc/src/main/include/gradle-jni-template.h → ...-native/src/include/gradle-jni-template.h b/...oc/src/main/include/gradle-jni-template.h → ...-native/src/include/gradle-jni-template.h
diff --git a/jvm-alloc/build.gradle → jme3-alloc/build.gradle b/jvm-alloc/build.gradle → jme3-alloc/build.gradle
@@ -21,7 +21,7 @@ tasks.named('test') {
 tasks.withType(JavaCompile) { // compile-time options [javac <options> <sources>]
     //options.compilerArgs << '-Xlint:deprecation' // to show deprecation warnings
     options.compilerArgs << '-Xlint:unchecked'
-    options.compilerArgs += ["-h", "${project.rootDir}/native-alloc/src/main/include"]
+    options.compilerArgs += ["-h", "${project.rootDir}/jme3-alloc-native/src/include/"]
     options.encoding = 'UTF-8'
     if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_10)) {
         options.release = 8

diff --git a/...main/java/com/jme3/alloc/BufferUtils.java → ...main/java/com/jme3/alloc/BufferUtils.java b/...main/java/com/jme3/alloc/BufferUtils.java → ...main/java/com/jme3/alloc/BufferUtils.java
diff --git a/jvm-alloc/src/test/java/temp/AppTest.java → jme3-alloc/src/test/java/temp/AppTest.java b/jvm-alloc/src/test/java/temp/AppTest.java → jme3-alloc/src/test/java/temp/AppTest.java
diff --git a/native-alloc/src/main/c/hello.cpp b/native-alloc/src/main/c/hello.cpp
diff --git a/settings.gradle b/settings.gradle
@@ -8,5 +8,5 @@
  */
 
 rootProject.name = 'jme-alloc'
-include('jvm-alloc')
-include('native-alloc')
+include('jme3-alloc')
+include('jme3-alloc-native')