refs/heads/master

diff --git a/README.md b/README.md
index 4f15fa0288ecd200ceb9b7023ec9b5865d6fa7f1..2691539fcd329256067f1e648a32a971269fa840 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,13 @@
 # Easyprogrammer
 
+Find executeable jar file in folder `released`.
+
 ## History
 
-Version |    Date   | Remarks
---------|-----------|-----------------------------
- 2.26   | 25.8.2016 | 1:1 movement from SVN server
+Version |    Date    | Remarks
+--------|------------|-----------------------------
+ 2.29   |  6.11.2020 | JSSC 2.9.2 (for Windows 10)
+ 2.28   |          ? | ?
+ 2.27   |  8.12.2018 | Atmega2560 added
+ 2.26   | 25. 8.2016 | 1:1 movement from SVN server
 

diff --git a/build.xml b/build.xml
index a82abdcf46d7368f967336e31ff23760d481d74e..58600b1d061967aa07586bebcdcbf9bfaa5eb4c3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -74,7 +74,7 @@
 <target name="-post-jar">
   <jar jarfile="dist/easyprogrammer-withJSSC.jar">
     <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-    <zipfileset src="dist/lib/jssc-2.8.0.jar" excludes="META-INF/*" />
+    <zipfileset src="dist/lib/jssc-2.9.2.jar" excludes="META-INF/*" />
     <!--<fileset dir="libs/windows">
       <include name="EasyProgrammer-*.dll" />
     </fileset> -->

diff --git a/jssc-2.8.0.jar b/jssc-2.8.0.jar
deleted file mode 100644 (file)
index d2b5c07..0000000
Binary files a/jssc-2.8.0.jar and /dev/null differ

diff --git a/jssc-2.9.2.jar b/jssc-2.9.2.jar
new file mode 100644 (file)
index 0000000..4679b8a
Binary files /dev/null and b/jssc-2.9.2.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index d7c78e5f809303234fea52af9efab669af83e005..f394a1b0564b8e0d80784785409baccfed4ab2fc 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -154,18 +154,6 @@ is divided into following sections:
                 <istrue value="${not.archive.disabled}"/>
             </or>
         </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-                <not>
-                    <istrue value="${modules.supported.internal}"/>
-                </not>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -1193,13 +1181,27 @@ is divided into following sections:
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+    <target depends="init,compile" name="-check-do-mkdist">
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+                <not>
+                    <available file="${build.classes.dir}/module-info.class"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 99bdd285c70ee41cc6f1c7ae04a95da82e5fd5c8..9dc2ae047017fcf76688d36ceb145efd7b51d9b3 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=e013f057
-nbproject/build-impl.xml.script.CRC32=5b937fdb
-nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
+nbproject/build-impl.xml.script.CRC32=690c25a8
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.95.0.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index b524d81f0893b03c71d4873c54e123774a1495f9..5c3a5d377ffb69482955a73e883b39be0c3a6e03 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -32,10 +32,12 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.jssc-2.8.0.jar=jssc-2.8.0.jar
+file.reference.jssc-2.9.2.jar=/work/sx/easyprogrammer/jssc-2.9.2.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jssc-2.8.0.jar}
+    ${file.reference.jssc-2.8.0.jar}:\
+    ${file.reference.jssc-2.9.2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

diff --git a/released/easyprogrammer.jar b/released/easyprogrammer.jar
index 7d3c3fed6554f50e609af657461a3b11013d5c7e..bdbfa1b929077613b0204b20fb18f41e6631b937 100644 (file)
Binary files a/released/easyprogrammer.jar and b/released/easyprogrammer.jar differ

diff --git a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form
index eb66a80da9cc11b488b7ee07ebcf1e82e9aac6d3..30f984fe6a5f401aaea434882a950dea60aaa7f9 100644 (file)
--- a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form
+++ b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form
@@ -79,7 +79,7 @@
                 <Component class="javax.swing.JLabel" name="jlaCopyright">
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
-                    <Property name="text" type="java.lang.String" value="(C) 2013-2016, Manfred Steiner"/>
+                    <Property name="text" type="java.lang.String" value="(C) 2013-2020, Manfred Steiner"/>
                   </Properties>
                 </Component>
               </SubComponents>

diff --git a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java
index d6358f772c072848b91eeb388f2a2e50b2b71079..615bed80e2e2d70bc28cf13977531e7e54b9fee5 100644 (file)
--- a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java
+++ b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java
@@ -26,8 +26,8 @@ import javax.swing.text.StyledDocument;
  */
 public final class DialogAbout extends javax.swing.JDialog
 {
-  public final static String version = "2.28 (19.12.2018)";
-  public final static String source = "https://www.htl-mechatronik.at/gitweb/public/sx/?p=easyprogrammer.git";
+  public final static String version = "2.29 (6.11.2020)";
+  public final static String source = "https://www.htl-mechatronik.at/gitweb/public/?p=sx/easyprogrammer.git";
     
   private static final Logger LOG = Logger.getLogger(DialogAbout.class.getName());
 
@@ -191,7 +191,7 @@ public final class DialogAbout extends javax.swing.JDialog
         jPanel1.add(jlaName);
 
         jlaCopyright.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jlaCopyright.setText("(C) 2013-2016, Manfred Steiner");
+        jlaCopyright.setText("(C) 2013-2020, Manfred Steiner");
         jPanel1.add(jlaCopyright);
 
         jpanCenterNorth.add(jPanel1);