tweak(api): simplify version get from imgui-java.properties file (#204)
Instead of generating `properties` file we make it always. To provide version value we replace specific token. Also, small tweaks in code which gets the version
This commit is contained in:
1 parent
3f2532a478
commit
49fffaf02d
3 files changed
+12
-20
No files matched your search
@@ -1,3 +1,4 @@
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
import tool.generator.GenerateLibs
|
||||
|
||||
plugins {
|
||||
@@ -35,18 +36,10 @@ jar {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register('makePropertyResource') {
|
||||
def directory = file "${buildDir}/resources/main/imgui/"
|
||||
directory.mkdirs()
|
||||
def propertyFile = file "${directory}/imgui-java.properties"
|
||||
def props = new Properties()
|
||||
if (propertyFile.exists()) {
|
||||
propertyFile.withReader { props.load(it) }
|
||||
}
|
||||
props.setProperty("version", project.version)
|
||||
propertyFile.withWriter { props.store(it, "imgui-java") }
|
||||
}
|
||||
|
||||
processResources {
|
||||
dependsOn makePropertyResource
|
||||
filesMatching('**/imgui-java.properties') {
|
||||
filter(ReplaceTokens, tokens: [
|
||||
'version': project.version
|
||||
])
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Optional;
|
||||
import java.util.Properties;
|
||||
|
||||
public class ImGui {
|
||||
@@ -122,10 +123,7 @@ public class ImGui {
|
||||
return null;
|
||||
}
|
||||
|
||||
String version = getVersionString();
|
||||
if (version == null) {
|
||||
version = "unknown";
|
||||
}
|
||||
final String version = getVersionString().orElse("undefined");
|
||||
final Path tmpDir = Paths.get(System.getProperty("java.io.tmpdir")).resolve(LIB_TMP_DIR_PREFIX).resolve(version);
|
||||
if (!Files.exists(tmpDir)) {
|
||||
Files.createDirectories(tmpDir);
|
||||
@@ -146,17 +144,17 @@ public class ImGui {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getVersionString() {
|
||||
private static Optional<String> getVersionString() {
|
||||
final Properties properties = new Properties();
|
||||
try (InputStream is = ImGui.class.getResourceAsStream("/imgui/imgui-java.properties")) {
|
||||
if (is != null) {
|
||||
properties.load(is);
|
||||
return properties.get("version").toString();
|
||||
return Optional.of(properties.get("imgui.java.version").toString());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new UncheckedIOException(e);
|
||||
}
|
||||
return null;
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
imgui.java.version=@version@
|
||||
Reference in new issue
Block a user