From: Tomas Wenström <tomas.wenstrom@gmail.com>
Date: Tue, 14 Jul 2020 07:00:51 +0000 (+0200)
Subject: Don't specify JDK version in name of jdk property
X-Git-Url: http://dolda2000.com/gitweb/?p=kaka%2Fcakelight.git;a=commitdiff_plain;h=24b1277d50108de77be57be213e938777d6803ad

Don't specify JDK version in name of jdk property
---

diff --git a/build.xml b/build.xml
index 67547df..c9dc10e 100644
--- a/build.xml
+++ b/build.xml
@@ -54,9 +54,9 @@
   
   <!-- JDK definitions -->
   
-  <property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
-  <path id="jdk.classpath.1.8">
-    <fileset dir="${jdk.home.1.8}">
+  <property name="jdk.bin" value="${jdk.home}/bin"/>
+  <path id="jdk.classpath">
+    <fileset dir="${jdk.home}">
       <include name="jre/lib/charsets.jar"/>
       <include name="jre/lib/ext/cldrdata.jar"/>
       <include name="jre/lib/ext/dnsns.jar"/>
@@ -77,9 +77,9 @@
     </fileset>
   </path>
   
-  <property name="project.jdk.home" value="${jdk.home.1.8}"/>
-  <property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
-  <property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
+  <property name="project.jdk.home" value="${jdk.home}"/>
+  <property name="project.jdk.bin" value="${jdk.bin}"/>
+  <property name="project.jdk.classpath" value="jdk.classpath"/>
   
   
   <!-- Project Libraries -->
diff --git a/config.properties.template b/config.properties.template
index 532e6a0..317ead1 100644
--- a/config.properties.template
+++ b/config.properties.template
@@ -1,4 +1,4 @@
-jdk.home.1.8=/usr/lib/jvm/java-8-openjdk-amd64
+jdk.home=/usr/lib/jvm/java-8-openjdk-amd64
 
 # Video info can be found with 'v4l2-ctl --get-fmt-video'
 # Supported formats: UYVY, YUYV, YVYU