From: Manfred Steiner Date: Fri, 6 Nov 2020 10:38:18 +0000 (+0100) Subject: V2.29, JSSC 2.9.2 for Windows 10) X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=refs%2Fheads%2Fwork_atmega2560;p=sx%2Feasyprogrammer.git V2.29, JSSC 2.9.2 for Windows 10) --- diff --git a/README.md b/README.md index 4f15fa0..2691539 100644 --- 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 a82abdc..58600b1 100644 --- a/build.xml +++ b/build.xml @@ -74,7 +74,7 @@ - + diff --git a/jssc-2.8.0.jar b/jssc-2.8.0.jar deleted file mode 100644 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 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 d7c78e5..f394a1b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -154,18 +154,6 @@ is divided into following sections: - - - - - - - - - - - - @@ -1193,13 +1181,27 @@ is divided into following sections: - + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 99bdd28..9dc2ae0 100644 --- 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 b524d81..5c3a5d3 100644 --- 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 7d3c3fe..bdbfa1b 100644 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 eb66a80..30f984f 100644 --- a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form +++ b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.form @@ -79,7 +79,7 @@ - + diff --git a/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java b/src/at/htlkaindorf/sx/EasyProgrammer/gui/DialogAbout.java index d6358f7..615bed8 100644 --- 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);