From a7b3af024a3329499d0db15018278accad14d07b Mon Sep 17 00:00:00 2001 From: Andreas Zahnen Date: Sat, 12 Oct 2024 21:20:30 +0200 Subject: [PATCH] refactor java --- {xtracfg => libxtracfg/java}/build.gradle | 4 +- {xtracfg => libxtracfg/java}/dev.gradle | 0 .../java}/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {xtracfg => libxtracfg/java}/gradlew | 0 {xtracfg => libxtracfg/java}/gradlew.bat | 0 .../xtraplatform/cli/dev/XtraCfgApiDev.java | 0 .../ii/xtraplatform/cli/dev/XtraCfgDev.java | 0 .../de/ii/xtraplatform/cli/AutoHandler.java | 0 .../de/ii/xtraplatform/cli/AutoTypes.java | 0 .../java/de/ii/xtraplatform/cli/Call.java | 0 .../de/ii/xtraplatform/cli/CfgHandler.java | 0 .../de/ii/xtraplatform/cli/CfgValidation.java | 0 .../main/java/de/ii/xtraplatform/cli/Cli.java | 0 .../ii/xtraplatform/cli/CommandHandler.java | 0 .../ii/xtraplatform/cli/EntitiesHandler.java | 0 .../de/ii/xtraplatform/cli/LayoutHandler.java | 0 .../de/ii/xtraplatform/cli/MapDiffer.java | 0 .../java/de/ii/xtraplatform/cli/Messages.java | 0 .../de/ii/xtraplatform/cli/Migration.java | 0 .../de/ii/xtraplatform/cli/NativeFeature.java | 0 .../java/de/ii/xtraplatform/cli/Progress.java | 0 .../java/de/ii/xtraplatform/cli/Result.java | 0 .../java/de/ii/xtraplatform/cli/Upgrade.java | 0 .../de/ii/xtraplatform/cli/Validation.java | 0 .../java/de/ii/xtraplatform/cli/XtraCfg.java | 0 .../java/de/ii/xtraplatform/cli/cmd/Auto.java | 0 .../de/ii/xtraplatform/cli/cmd/Check.java | 0 .../de/ii/xtraplatform/cli/cmd/Common.java | 0 .../de/ii/xtraplatform/cli/cmd/Connect.java | 0 .../de/ii/xtraplatform/cli/cmd/Context.java | 0 .../de/ii/xtraplatform/cli/cmd/FileType.java | 0 .../java/de/ii/xtraplatform/cli/cmd/Info.java | 0 .../de/ii/xtraplatform/cli/cmd/Schemas.java | 0 .../de/ii/xtraplatform/cli/cmd/Store.java | 0 .../de/ii/xtraplatform/cli/cmd/Upgrade.java | 0 .../META-INF/native-image/jni-config.json | 0 .../META-INF/native-image/proxy-config.json | 0 .../META-INF/native-image/reflect-config.json | 0 .../native-image/resource-config.json | 0 .../native-image/serialization-config.json | 0 .../java}/src/main/webapp/index.html | 0 xtracfg/include/client.h | 12 --- xtracfg/include/de_ii_xtraplatform_cli_Cli.h | 21 ---- xtracfg/include/libxtracfg.h | 91 ------------------ 45 files changed, 2 insertions(+), 126 deletions(-) rename {xtracfg => libxtracfg/java}/build.gradle (97%) rename {xtracfg => libxtracfg/java}/dev.gradle (100%) rename {xtracfg => libxtracfg/java}/gradle/wrapper/gradle-wrapper.jar (100%) rename {xtracfg => libxtracfg/java}/gradle/wrapper/gradle-wrapper.properties (100%) rename {xtracfg => libxtracfg/java}/gradlew (100%) rename {xtracfg => libxtracfg/java}/gradlew.bat (100%) rename {xtracfg => libxtracfg/java}/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgApiDev.java (100%) rename {xtracfg => libxtracfg/java}/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/AutoHandler.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/AutoTypes.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Call.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/CfgHandler.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/CfgValidation.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Cli.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/CommandHandler.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/LayoutHandler.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/MapDiffer.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Messages.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Migration.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/NativeFeature.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Progress.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Result.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Upgrade.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/Validation.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/XtraCfg.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Auto.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Check.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Common.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Connect.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Context.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Info.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Schemas.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Store.java (100%) rename {xtracfg => libxtracfg/java}/src/main/java/de/ii/xtraplatform/cli/cmd/Upgrade.java (100%) rename {xtracfg => libxtracfg/java}/src/main/resources/META-INF/native-image/jni-config.json (100%) rename {xtracfg => libxtracfg/java}/src/main/resources/META-INF/native-image/proxy-config.json (100%) rename {xtracfg => libxtracfg/java}/src/main/resources/META-INF/native-image/reflect-config.json (100%) rename {xtracfg => libxtracfg/java}/src/main/resources/META-INF/native-image/resource-config.json (100%) rename {xtracfg => libxtracfg/java}/src/main/resources/META-INF/native-image/serialization-config.json (100%) rename {xtracfg => libxtracfg/java}/src/main/webapp/index.html (100%) delete mode 100644 xtracfg/include/client.h delete mode 100644 xtracfg/include/de_ii_xtraplatform_cli_Cli.h delete mode 100644 xtracfg/include/libxtracfg.h diff --git a/xtracfg/build.gradle b/libxtracfg/java/build.gradle similarity index 97% rename from xtracfg/build.gradle rename to libxtracfg/java/build.gradle index 8adc7cb..18f493d 100644 --- a/xtracfg/build.gradle +++ b/libxtracfg/java/build.gradle @@ -55,7 +55,7 @@ graalvmNative { if (project.hasProperty('LIB')) { imageName = "libxtracfgjni" sharedLibrary = true - buildArgs("--native-compiler-path=${project.projectDir}/../libxtracfg/c/native-image/static-compiler-${targetos}.sh") + buildArgs("--native-compiler-path=${project.projectDir}/../c/native-image/static-compiler-${targetos}.sh") buildArgs('-march=native') buildArgs('-O2') //TODO -O3 image is 50% larger than -O2, test -Os with JDK 23 //buildArgs('--pgo') see https://www.graalvm.org/latest/reference-manual/native-image/optimizations-and-performance/PGO/ @@ -101,7 +101,7 @@ graalvmNative { tasks.register('nativeSync', Sync) { from "${project.buildDir}/native/nativeCompile" - into '../libxtracfg/c/build' + into '../c/build' } tasks.register('os') { diff --git a/xtracfg/dev.gradle b/libxtracfg/java/dev.gradle similarity index 100% rename from xtracfg/dev.gradle rename to libxtracfg/java/dev.gradle diff --git a/xtracfg/gradle/wrapper/gradle-wrapper.jar b/libxtracfg/java/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from xtracfg/gradle/wrapper/gradle-wrapper.jar rename to libxtracfg/java/gradle/wrapper/gradle-wrapper.jar diff --git a/xtracfg/gradle/wrapper/gradle-wrapper.properties b/libxtracfg/java/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from xtracfg/gradle/wrapper/gradle-wrapper.properties rename to libxtracfg/java/gradle/wrapper/gradle-wrapper.properties diff --git a/xtracfg/gradlew b/libxtracfg/java/gradlew similarity index 100% rename from xtracfg/gradlew rename to libxtracfg/java/gradlew diff --git a/xtracfg/gradlew.bat b/libxtracfg/java/gradlew.bat similarity index 100% rename from xtracfg/gradlew.bat rename to libxtracfg/java/gradlew.bat diff --git a/xtracfg/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgApiDev.java b/libxtracfg/java/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgApiDev.java similarity index 100% rename from xtracfg/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgApiDev.java rename to libxtracfg/java/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgApiDev.java diff --git a/xtracfg/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java b/libxtracfg/java/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java similarity index 100% rename from xtracfg/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java rename to libxtracfg/java/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/AutoHandler.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/AutoHandler.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/AutoHandler.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/AutoHandler.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/AutoTypes.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/AutoTypes.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/AutoTypes.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/AutoTypes.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Call.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Call.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Call.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Call.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/CfgHandler.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CfgHandler.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/CfgHandler.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CfgHandler.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/CfgValidation.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CfgValidation.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/CfgValidation.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CfgValidation.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Cli.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Cli.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Cli.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Cli.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/CommandHandler.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CommandHandler.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/CommandHandler.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/CommandHandler.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/LayoutHandler.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/LayoutHandler.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/LayoutHandler.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/LayoutHandler.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/MapDiffer.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/MapDiffer.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/MapDiffer.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/MapDiffer.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Messages.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Messages.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Messages.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Messages.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Migration.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Migration.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Migration.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Migration.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/NativeFeature.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/NativeFeature.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/NativeFeature.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/NativeFeature.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Progress.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Progress.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Progress.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Progress.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Result.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Result.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Result.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Result.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Upgrade.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Upgrade.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Upgrade.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Upgrade.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/Validation.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Validation.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/Validation.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/Validation.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/XtraCfg.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/XtraCfg.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/XtraCfg.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/XtraCfg.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Auto.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Auto.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Auto.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Auto.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Check.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Check.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Check.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Check.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Common.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Common.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Common.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Common.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Connect.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Connect.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Connect.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Connect.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Context.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Context.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Context.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Context.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Info.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Info.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Info.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Info.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Schemas.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Schemas.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Schemas.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Schemas.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Store.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Store.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Store.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Store.java diff --git a/xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Upgrade.java b/libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Upgrade.java similarity index 100% rename from xtracfg/src/main/java/de/ii/xtraplatform/cli/cmd/Upgrade.java rename to libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/Upgrade.java diff --git a/xtracfg/src/main/resources/META-INF/native-image/jni-config.json b/libxtracfg/java/src/main/resources/META-INF/native-image/jni-config.json similarity index 100% rename from xtracfg/src/main/resources/META-INF/native-image/jni-config.json rename to libxtracfg/java/src/main/resources/META-INF/native-image/jni-config.json diff --git a/xtracfg/src/main/resources/META-INF/native-image/proxy-config.json b/libxtracfg/java/src/main/resources/META-INF/native-image/proxy-config.json similarity index 100% rename from xtracfg/src/main/resources/META-INF/native-image/proxy-config.json rename to libxtracfg/java/src/main/resources/META-INF/native-image/proxy-config.json diff --git a/xtracfg/src/main/resources/META-INF/native-image/reflect-config.json b/libxtracfg/java/src/main/resources/META-INF/native-image/reflect-config.json similarity index 100% rename from xtracfg/src/main/resources/META-INF/native-image/reflect-config.json rename to libxtracfg/java/src/main/resources/META-INF/native-image/reflect-config.json diff --git a/xtracfg/src/main/resources/META-INF/native-image/resource-config.json b/libxtracfg/java/src/main/resources/META-INF/native-image/resource-config.json similarity index 100% rename from xtracfg/src/main/resources/META-INF/native-image/resource-config.json rename to libxtracfg/java/src/main/resources/META-INF/native-image/resource-config.json diff --git a/xtracfg/src/main/resources/META-INF/native-image/serialization-config.json b/libxtracfg/java/src/main/resources/META-INF/native-image/serialization-config.json similarity index 100% rename from xtracfg/src/main/resources/META-INF/native-image/serialization-config.json rename to libxtracfg/java/src/main/resources/META-INF/native-image/serialization-config.json diff --git a/xtracfg/src/main/webapp/index.html b/libxtracfg/java/src/main/webapp/index.html similarity index 100% rename from xtracfg/src/main/webapp/index.html rename to libxtracfg/java/src/main/webapp/index.html diff --git a/xtracfg/include/client.h b/xtracfg/include/client.h deleted file mode 100644 index 0a57711..0000000 --- a/xtracfg/include/client.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FUSION_H -#define FUSION_H - -typedef const char* (*handle_command_func) (const char* command); - -typedef void (*progress_func) (const char* msg); - -const char* handle_command_2(handle_command_func handle_command_cb, const char* command, progress_func progress_cb); - -void progress(char* msg); - -#endif diff --git a/xtracfg/include/de_ii_xtraplatform_cli_Cli.h b/xtracfg/include/de_ii_xtraplatform_cli_Cli.h deleted file mode 100644 index b367856..0000000 --- a/xtracfg/include/de_ii_xtraplatform_cli_Cli.h +++ /dev/null @@ -1,21 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class de_ii_xtraplatform_cli_Cli */ - -#ifndef _Included_de_ii_xtraplatform_cli_Cli -#define _Included_de_ii_xtraplatform_cli_Cli -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: de_ii_xtraplatform_cli_Cli - * Method: execute - * Signature: (Lde/ii/xtraplatform/cli/CommandHandler;)V - */ -JNIEXPORT void JNICALL Java_de_ii_xtraplatform_cli_Cli_execute - (JNIEnv *, jclass, jobject, jobject); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/xtracfg/include/libxtracfg.h b/xtracfg/include/libxtracfg.h deleted file mode 100644 index 565a3f1..0000000 --- a/xtracfg/include/libxtracfg.h +++ /dev/null @@ -1,91 +0,0 @@ -/* Code generated by cmd/cgo; DO NOT EDIT. */ - -/* package github.com/interactive-instruments/xtraplatform-cli/xtracfg */ - - -#line 1 "cgo-builtin-export-prolog" - -#include - -#ifndef GO_CGO_EXPORT_PROLOGUE_H -#define GO_CGO_EXPORT_PROLOGUE_H - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef struct { const char *p; ptrdiff_t n; } _GoString_; -#endif - -#endif - -/* Start of preamble from import "C" comments. */ - - -#line 3 "main.go" - -//pass on command line with CGO_CFLAGS -//#cgo CFLAGS: -I"$JAVA_HOME/include" -I"$JAVA_HOME/include/linux" - - -#include "client.h" - -#line 1 "cgo-generated-wrapper" - - -/* End of preamble from import "C" comments. */ - - -/* Start of boilerplate cgo prologue. */ -#line 1 "cgo-gcc-export-header-prolog" - -#ifndef GO_CGO_PROLOGUE_H -#define GO_CGO_PROLOGUE_H - -typedef signed char GoInt8; -typedef unsigned char GoUint8; -typedef short GoInt16; -typedef unsigned short GoUint16; -typedef int GoInt32; -typedef unsigned int GoUint32; -typedef long long GoInt64; -typedef unsigned long long GoUint64; -typedef GoInt64 GoInt; -typedef GoUint64 GoUint; -typedef size_t GoUintptr; -typedef float GoFloat32; -typedef double GoFloat64; -#ifdef _MSC_VER -#include -typedef _Fcomplex GoComplex64; -typedef _Dcomplex GoComplex128; -#else -typedef float _Complex GoComplex64; -typedef double _Complex GoComplex128; -#endif - -/* - static assertion to make sure the file is being used on architecture - at least with matching size of GoInt. -*/ -typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef _GoString_ GoString; -#endif -typedef void *GoMap; -typedef void *GoChan; -typedef struct { void *t; void *v; } GoInterface; -typedef struct { void *data; GoInt len; GoInt cap; } GoSlice; - -#endif - -/* End of boilerplate cgo prologue. */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void cmd_execute(handle_command_func handle_command); -extern void progress(char* msg); - -#ifdef __cplusplus -} -#endif