Add desktop test

.gitignore

@@ -29,3 +29,4 @@ out/
 *.ini
 **/webapp/**
 **/example-core/src/**
+**/example-desktop/src/**

example/example-base/src/main/java/com/github/xpenatan/jparser/example/NormalClassTest.java → example/example-base/src/main/java/com/github/xpenatan/jparser/example/NormalClass.java

@@ -1,8 +1,8 @@
 package com.github.xpenatan.jparser.example;
 
-public class NormalClassTest {
+public class NormalClass {
     /*[-C++;-NATIVE]
-        #include "NormalClassTest.h"
+        #include "NormalClass.h"
     */
 
 

example/example-base/src/main/java/com/github/xpenatan/jparser/example/ParentClass.java

@@ -0,0 +1,9 @@
+package com.github.xpenatan.jparser.example;
+
+public class ParentClass {
+    /*[-C++;-NATIVE]
+        #include "ParentClass.h"
+    */
+
+
+}

example/example-build/jni/cpp/src/NormalClass.cpp

@@ -0,0 +1,6 @@
+#include "NormalClass.h"
+
+int NormalClass::addIntValue(int a, int b)
+{
+    return a + b;
+}

example/example-build/jni/cpp/src/NormalClass.h

@@ -0,0 +1,10 @@
+#ifndef NORMALCLASS_H
+#define NORMALCLASS_H
+
+class NormalClass
+{
+public:
+    int addIntValue(int a, int b);
+};
+
+#endif  //NORMALCLASS_H

example/example-build/jni/cpp/src/ParentClass.cpp

@@ -0,0 +1,11 @@
+#include "ParentClass.h"
+
+float ParentClass::addFloatValue(float a, float b)
+{
+    return a + b;
+}
+
+bool ParentClass::invertBoolean(bool value)
+{
+    return !value;
+}

example/example-build/jni/cpp/src/ParentClass.h

@@ -0,0 +1,11 @@
+#ifndef PARENTCLASS_H
+#define PARENTCLASS_H
+
+class ParentClass
+{
+public:
+    float addFloatValue(float a, float b);
+    bool invertBoolean(bool value);
+};
+
+#endif  //PARENTCLASS_H

example/example-build/src/main/java/com/github/xpenatan/jparser/example/Main.java

@@ -35,18 +35,16 @@ private static void generateCPP() throws Exception {
         String idlPath = "src\\main\\resources\\idl\\Test.idl";
         String baseJavaDir = new File(".").getAbsolutePath() + "./example-base/src/main/java";
         String genDir = "../example-core/src/main/java";
-        String classPath = CppCodeParser.getClassPath("example-base", "gdx-1", "gdx-jnigen-loader", "jParser-loader");
+        String libsDir = new File("../example-desktop/src/main/resources/").getCanonicalPath();
+        String jniBuildPath = new File("./build/c++/").getCanonicalPath();
 
-        String cppPath = new File("./jni/").getCanonicalPath();
-        String jniBuildPath = cppPath + "/build/c++/";
-        FileCopyHelper.copyDir(cppPath + "/cpp/src/", jniBuildPath + "/src");
+        FileCopyHelper.copyDir( "./jni/cpp/src/", jniBuildPath + "/src");
 
         IDLReader idlReader = IDLReader.readIDL(idlPath);
-
         CppGenerator cppGenerator = new NativeCPPGeneratorV2(jniBuildPath);
         CppCodeParser idlParser = new CppCodeParser(cppGenerator, idlReader, basePackage);
         idlParser.generateClass = true;
         JParser.generate(idlParser, baseJavaDir, genDir);
-//        CPPBuildHelper.build(libName, jniBuildPath);
+        CPPBuildHelper.build(libName, jniBuildPath, libsDir);
     }
 }

example/example-build/src/main/resources/idl/Test.idl

@@ -1,9 +1,10 @@
-interface ParentClassTest {
-    float getFloatValue();
+interface ParentClass {
+    float addFloatValue(float a, float b);
+    boolean invertBoolean(boolean value);
 };
 
-interface NormalClassTest {
-    long getIntValue();
-    boolean getBoolValue(float floatValue);
+interface NormalClass {
+    void NormalClassTest();
+    long addIntValue(long a, long b);
 };
-NormalClassTest implements ParentClassTest;
+NormalClass implements ParentClass;

example/example-desktop/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: "java"
+
+group = project.groupId
+version = "1.0.0"
+
+def module_name = "example-core"
+
+dependencies {
+    testImplementation project(":jParser:loader")
+    testImplementation project(":example:example-core")
+    testImplementation "junit:junit:$project.jUnitVersion"
+}
+
+clean.doFirst {
+    def srcPath = projectDir.toString() + "/src/main/"
+    project.delete(files(srcPath))
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId = module_name
+            from components.java
+        }
+    }
+}
+
+tasks.register("prepareTest", GradleBuild) {
+    tasks = [
+            ":example:example-build:clean",
+            ":example:example-core:clean",
+            ":example:example-build:generateNativeProject",
+            "compileTestJava"
+    ]
+}
+test.dependsOn "prepareTest"

example/example-desktop/src/test/java/com/github/xpenatan/jparser/example/NormalClassTest.java

@@ -0,0 +1,47 @@
+package com.github.xpenatan.jparser.example;
+
+import com.github.xpenatan.jparser.loader.JParserLibraryLoader;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class NormalClassTest {
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        String libDir = "src/main/resources/example-test-natives.jar";
+        new JParserLibraryLoader(libDir).load("example-test");
+    }
+
+    @Test
+    public void test_add_int() {
+        NormalClass normalClass = new NormalClass();
+        int ret = normalClass.addIntValue(10, 10);
+        assertEquals(20, ret);
+    }
+
+    @Test
+    public void test_add_float() {
+        NormalClass normalClass = new NormalClass();
+        float ret = normalClass.addFloatValue(10.3f, 10.3f);
+        assertEquals(20.6, ret, 1.0f);
+    }
+
+    @Test
+    public void test_invert_boolean_should_be_false() {
+        NormalClass normalClass = new NormalClass();
+        boolean ret = normalClass.invertBoolean(true);
+        assertFalse(ret);
+    }
+
+    @Test
+    public void test_invert_boolean_should_be_true() {
+        NormalClass normalClass = new NormalClass();
+        boolean ret = normalClass.invertBoolean(false);
+        assertTrue(ret);
+    }
+
+}
+

jParser/cpp/src/main/java/com/badlogic/gdx/jnigen/CustomAntScriptGenerator.java

@@ -43,10 +43,10 @@ public class CustomAntScriptGenerator {
 	 * @param targets list of {@link BuildTarget} instances */
 	public void generate (BuildConfig config, BuildTarget... targets) {
 		// create all the directories for outputing object files, shared libs and natives jar as well as build scripts.
-		if (!config.libsDir.exists()) {
-			if (!config.libsDir.mkdirs())
-				throw new RuntimeException("Couldn't create directory for shared library files in '" + config.libsDir + "'");
-		}
+//		if (!config.libsDir.exists()) {
+//			if (!config.libsDir.mkdirs())
+//				throw new RuntimeException("Couldn't create directory for shared library files in '" + config.libsDir + "'");
+//		}
 		if (!config.jniDir.exists()) {
 			if (!config.jniDir.mkdirs())
 				throw new RuntimeException("Couldn't create native code directory '" + config.jniDir + "'");

jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/CPPBuildHelper.java

@@ -19,6 +19,10 @@ public static void build(String libName, String buildPath) {
         build(libName, buildPath, null, null, null, false);
     }
 
+    public static void build(String libName, String buildPath, String libsDir) {
+        build(libName, buildPath, libsDir, null, null, null, null, false);
+    }
+
     public static void build(String libName, String buildPath, String [] cppFlags) {
         build(libName, buildPath, cppFlags, null, null, false);
     }
@@ -41,7 +45,15 @@ public static void build(String libName, String buildPath, String libsDir, Strin
         catch(IOException e) {
             throw new RuntimeException(e);
         }
-        String[] headerDir = {"src", sharedSrcPath};
+        String[] headerDir = null;
+        if(sharedSrcPath != null) {
+            String[] headerDirr = {"src", sharedSrcPath};
+            headerDir = headerDirr;
+        }
+        else {
+            String[] headerDirr = {"src"};
+            headerDir = headerDirr;
+        }
         String[] includes = {"**/*.cpp"};
 
         BuildConfig buildConfig = new BuildConfig(libName, "target", libsDir, buildPath);