v16

pquiring · Jul 7, 2017 · fce7921 · fce7921
1 parent b9950a3
commit fce7921
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 16 deletions.
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="home" value="."/>
-  <property name="version" value="15.7.0"/>
+  <property name="version" value="16.0.0"/>
   <property name="noelf" value="true"/>
 
   <property name="debian.depends" value="openjdk-8-jre, libjsch-java, libjzlib-java, libjcifs-java, libv4l-0, desktop-file-utils"/>

diff --git a/projects/jfcontrols/build.xml b/projects/jfcontrols/build.xml
@@ -7,7 +7,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.0.1"/>
+  <property name="version" value="0.1"/>
 
   <import file="../../base.xml"/>
 
@@ -58,18 +58,22 @@
     <copy file="${app}.desktop" todir="/usr/share/applications"/>
     <copy file="${app}.png" todir="/usr/share/icons/hicolor/48x48/apps"/>
     <copy file="${app}.html" todir="/usr/share/jhelp"/>
+    <!-- systemd in /lib for debian and fedora(linked) -->
+    <mkdir dir="/lib/systemd/system/"/>
+    <copy file="jfcontrols.service" todir="/lib/systemd/system"/>
   </target>
 
   <target name="release-bin" description="create release zip file">
-    <zip destfile="${app}-${version}.zip">
+    <zip destfile="${app}-${version}-bin.zip">
       <fileset dir=".">
         <include name="*.jar"/>
         <include name="*.txt"/>
+        <include name="*.dll"/>
         <include name="run.bat"/>
       </fileset>
       <fileset dir="../.." includes="license.txt"/>
     </zip>
-    <move file="${app}-${version}.zip" todir="${home}/release"/>
+    <move file="${app}-${version}-bin.zip" todir="${home}/release"/>
   </target>
 
   <target name="release-src" depends="" description="create release zip file">
@@ -78,8 +82,9 @@
         <include name="jf/license.txt"/>
         <include name="jf/base.*"/>
         <include name="jf/stubs/*"/>
-        <include name="jf/projects/${app}/src/*.java"/>
-        <include name="jf/projects/${app}/src/*.form"/>
+        <include name="jf/projects/${app}/src/**/*.java"/>
+        <include name="jf/projects/${app}/src/**/*.form"/>
+        <include name="jf/projects/${app}/src/**/*.png"/>
         <include name="jf/projects/${app}/*.txt"/>
         <include name="jf/projects/${app}/*.xml"/>
         <include name="jf/projects/${app}/*.png"/>
@@ -88,6 +93,7 @@
         <include name="jf/projects/${app}/run.bat"/>
         <include name="jf/projects/${app}/nbproject/*.xml"/>
         <include name="jf/jars/javaforce.jar"/>
+        <include name="jf/jars/derby.jar"/>
       </fileset>
     </zip>
     <move file="${app}-src-${version}.zip" todir="${home}/release"/>

diff --git a/projects/jfcontrols/readme.txt b/projects/jfcontrols/readme.txt
@@ -1,4 +1,14 @@
-jfControls is a work in progress.
+jfControls
+==========
 
-Not usable yet.
+jfControls is a Controls Automation System.
 
+It's like a software PLC with ladder logic and panels.
+
+Can communicate with other remote PLCs such as Siemens, Allen Bradley, Modbus and National Instruments.
+
+Requires Java 8 JRE and JDK (both MUST be installed) (Recommend 64bit version).
+
+WebSite : jfcontrols.sourceforge.net
+
+Git : github.com/pquiring/javaforce (under projects/jfcontrols)
diff --git a/projects/jfcontrols/src/jfcontrols/app/Main.java b/projects/jfcontrols/src/jfcontrols/app/Main.java
@@ -16,7 +16,7 @@
 
 public class Main implements WebUIHandler {
 
-  public static String version = "0.1B";
+  public static String version = "0.1";
   public static ClassLoader loader;
   public static boolean debug = false;
   public static String msgs = "";

diff --git a/projects/jfcontrols/src/jfcontrols/sql/SQLService.java b/projects/jfcontrols/src/jfcontrols/sql/SQLService.java
@@ -17,7 +17,7 @@
 public class SQLService {
   public static String derbyURI;
   public static String databaseName = "database";
-  public static String dbVersion = "0.0.1";
+  public static String dbVersion = "0.1";
   public static boolean running;
 
   public static SQL getSQL() {

diff --git a/projects/jfcontrols/whatsnew.txt b/projects/jfcontrols/whatsnew.txt
@@ -0,0 +1,5 @@
+ChangeLog
+=========
+
+Jul 7,2017 : version 0.1 released!
+  - init version released to the public
diff --git a/projects/jfcontrols/wix32.xml b/projects/jfcontrols/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{8BE8B973-97BC-46D6-AC28-FA13C140FB0A}" Version="0.0.1" Language="1033" Name="jfControls" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{8BE8B973-97BC-46D6-AC28-FA13C140FB0A}" Version="0.1" Language="1033" Name="jfControls" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfcontrols/wix64.xml b/projects/jfcontrols/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{41214FC5-3560-41FF-BC62-AA90ABC45F3D}" Version="0.0.1" Language="1033" Name="jfControls" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{41214FC5-3560-41FF-BC62-AA90ABC45F3D}" Version="0.1" Language="1033" Name="jfControls" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 JavaForce SDK
 =============
 
-Version 15.7.0
+Version 16.0.0
 
 What is it?
 ===========
@@ -135,4 +135,4 @@ Web : pquiring.github.io/javaforce
 
 Git : github.com/pquiring/javaforce
 
-Released : July 4, 2017
+Released : July 7, 2017
diff --git a/src/javaforce/JF.java b/src/javaforce/JF.java
@@ -23,7 +23,7 @@
 public class JF {
 
   public static String getVersion() {
-    return "15.7.0";
+    return "16.0.0";
   }
 
   public static void sleep(int milli) {

diff --git a/src/javaforce/linux/Linux.java b/src/javaforce/linux/Linux.java
@@ -20,7 +20,7 @@ public class Linux {
 
   /** Returns jfLinux ISO version. */
   public static String getVersion() {
-    return "15";
+    return "16";
   }
 
   public static enum DistroTypes {

diff --git a/whatsnew.txt b/whatsnew.txt
@@ -1,5 +1,9 @@
 What's new...
 
+Jul 7/2017 : JF 16.0.0 released
+  - new : jfControls
+    - a software PLC with ladder logic and panels
+
 Jul 4/2017 : JF 15.7.0 released
   - jPhoneLite/1.12
     - fixed help button