Adjust generated sources path to match other JavaCPP presets

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+- Adjust generated sources path to match other JavaCPP presets
 - Add experimental build for Linux ppc64le ([pull #5](https://github.com/bytedeco/gcc/pull/5))
 - Add environment for running aarch64, ppc64le, armhf builds ([pull #6](https://github.com/bytedeco/gcc/pull/6))
 - Add build for Linux x86-64 ([pull #1](https://github.com/bytedeco/gcc/pull/1))

build.gradle

@@ -35,7 +35,7 @@ javacppBuildCommand {
 
 javacppBuildParser {
     classOrPackageNames = ["org.bytedeco.gcc.presets.*"]
-    outputDirectory = file("src/main/gen/")
+    outputDirectory = file("src/gen/java/")
 }
 
 javacppBuildCompiler {

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_block.java

@@ -0,0 +1,34 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_block encapsulates a "basic block" of statements within a
+   function (i.e. with one entry point and one exit point).
+
+   Every block within a function must be terminated with a conditional,
+   a branch, or a return.
+
+   The blocks within a function form a directed graph.
+
+   The entrypoint to the function is the first block created within
+   it.
+
+   All of the blocks in a function must be reachable via some path from
+   the first block.
+
+   It's OK to have more than one "return" from a function (i.e. multiple
+   blocks that terminate by returning).  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_block extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_block() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_block(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_case.java

@@ -0,0 +1,22 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_case is for use when building multiway branches via
+   gcc_jit_block_end_with_switch and represents a range of integer
+   values (or an individual integer value) together with an associated
+   destination block.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_case extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_case() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_case(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_context.java

@@ -0,0 +1,40 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+// #endif /* __cplusplus */
+
+/**********************************************************************
+ Data structures.
+ **********************************************************************/
+/* All structs within the API are opaque. */
+
+/* A gcc_jit_context encapsulates the state of a compilation.
+   You can set up options on it, and add types, functions and code, using
+   the API below.
+
+   Invoking gcc_jit_context_compile on it gives you a gcc_jit_result *
+   (or NULL), representing in-memory machine code.
+
+   You can call gcc_jit_context_compile repeatedly on one context, giving
+   multiple independent results.
+
+   Similarly, you can call gcc_jit_context_compile_to_file on a context
+   to compile to disk.
+
+   Eventually you can call gcc_jit_context_release to clean up the
+   context; any in-memory results created from it are still usable, and
+   should be cleaned up via gcc_jit_result_release.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_context extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_context() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_context(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_field.java

@@ -0,0 +1,21 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_field encapsulates a field within a struct; it is used
+   when creating a struct type (using gcc_jit_context_new_struct_type).
+   Fields cannot be shared between structs.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_field extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_field() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_field(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_function.java

@@ -0,0 +1,21 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_function encapsulates a function: either one that you're
+   creating yourself, or a reference to one that you're dynamically
+   linking to within the rest of the process.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_function extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_function() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_function(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_location.java

@@ -0,0 +1,29 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_location encapsulates a source code location, so that
+   you can (optionally) associate locations in your language with
+   statements in the JIT-compiled code, allowing the debugger to
+   single-step through your language.
+
+   Note that to do so, you also need to enable
+     GCC_JIT_BOOL_OPTION_DEBUGINFO
+   on the gcc_jit_context.
+
+   gcc_jit_location instances are optional; you can always pass
+   NULL.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_location extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_location() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_location(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_lvalue.java

@@ -0,0 +1,21 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_lvalue is a storage location within your code (e.g. a
+   variable, a parameter, etc).  It is also a gcc_jit_rvalue; use
+   gcc_jit_lvalue_as_rvalue to cast.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_lvalue extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_lvalue() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_lvalue(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_object.java

@@ -0,0 +1,35 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* An object created within a context.  Such objects are automatically
+   cleaned up when the context is released.
+
+   The class hierarchy looks like this:
+
+     +- gcc_jit_object
+	 +- gcc_jit_location
+	 +- gcc_jit_type
+	    +- gcc_jit_struct
+	 +- gcc_jit_field
+	 +- gcc_jit_function
+	 +- gcc_jit_block
+	 +- gcc_jit_rvalue
+	     +- gcc_jit_lvalue
+		 +- gcc_jit_param
+	 +- gcc_jit_case
+*/
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_object extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_object() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_object(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_param.java

@@ -0,0 +1,21 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_param is a function parameter, used when creating a
+   gcc_jit_function.  It is also a gcc_jit_lvalue (and thus also an
+   rvalue); use gcc_jit_param_as_lvalue to convert.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_param extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_param() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_param(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_result.java

@@ -0,0 +1,19 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_result encapsulates the result of an in-memory compilation.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_result extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_result() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_result(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_rvalue.java

@@ -0,0 +1,19 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_rvalue is an expression within your code, with some type.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_rvalue extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_rvalue() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_rvalue(Pointer p) { super(p); }
+}

src/gen/java/org/bytedeco/gcc/gccjit/gcc_jit_struct.java

@@ -0,0 +1,20 @@
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.gcc.gccjit;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.gcc.global.gccjit.*;
+
+
+/* A gcc_jit_struct encapsulates a struct type, either one that we have
+   the layout for, or an opaque type.  */
+@Opaque @Properties(inherit = org.bytedeco.gcc.presets.gccjit.class)
+public class gcc_jit_struct extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public gcc_jit_struct() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public gcc_jit_struct(Pointer p) { super(p); }
+}