diff --git a/assembly/assemble-dist.xml b/assembly/assemble-dist.xml new file mode 100644 index 0000000..20f2c17 --- /dev/null +++ b/assembly/assemble-dist.xml @@ -0,0 +1,14 @@ + + distribution-libs + + dir + + false + + + + false + + + \ No newline at end of file diff --git a/assembly/assemble-linux.xml b/assembly/assemble-linux.xml new file mode 100644 index 0000000..94d4cf9 --- /dev/null +++ b/assembly/assemble-linux.xml @@ -0,0 +1,53 @@ + + + + workdir-linux + + jar + + false + + + bin/bin-linux + ${finalName}-workdir-linux/bin + + + ${finalName}-workdir-linux + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/assembly/assemble-linux64.xml b/assembly/assemble-linux64.xml new file mode 100644 index 0000000..d116be7 --- /dev/null +++ b/assembly/assemble-linux64.xml @@ -0,0 +1,53 @@ + + + + workdir-linux64 + + jar + + false + + + bin/bin-linux64 + ${finalName}-workdir-linux64/bin + + + ${finalName}-workdir-linux64 + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/assembly/assemble-mac.xml b/assembly/assemble-mac.xml new file mode 100644 index 0000000..e813f72 --- /dev/null +++ b/assembly/assemble-mac.xml @@ -0,0 +1,53 @@ + + + + workdir-mac + + jar + + false + + + bin/bin-macosx-x86 + ${finalName}-workdir-mac/bin + + + ${finalName}-workdir-mac + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/assembly/assemble-win32.xml b/assembly/assemble-win32.xml new file mode 100644 index 0000000..4680f89 --- /dev/null +++ b/assembly/assemble-win32.xml @@ -0,0 +1,53 @@ + + + + workdir-win32 + + jar + + false + + + bin/bin-win32 + ${finalName}-workdir-win32/bin + + + ${finalName}-workdir-win32 + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/assembly/src.xml b/assembly/src.xml new file mode 100644 index 0000000..c930835 --- /dev/null +++ b/assembly/src.xml @@ -0,0 +1,55 @@ + + + + src + + tar.gz + zip + + + + + README* + LICENSE* + NOTICE* + TODO + pom.xml + + + + src + + **/.*.swp + + + + diff --git a/bin/bin-linuxarmv6hf/COPYING b/bin/bin-linuxarmv6hf/COPYING new file mode 100644 index 0000000..60549be --- /dev/null +++ b/bin/bin-linuxarmv6hf/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/bin/bin-linuxarmv6hf/ld b/bin/bin-linuxarmv6hf/ld new file mode 100644 index 0000000..087bc88 Binary files /dev/null and b/bin/bin-linuxarmv6hf/ld differ diff --git a/bin/bin-linuxarmv6hf/windres b/bin/bin-linuxarmv6hf/windres new file mode 100644 index 0000000..1c3065f Binary files /dev/null and b/bin/bin-linuxarmv6hf/windres differ diff --git a/build-private.xml b/build-private.xml index f84cc84..2136175 100644 --- a/build-private.xml +++ b/build-private.xml @@ -64,6 +64,18 @@ + + + + + + + + + + + + @@ -126,6 +138,13 @@ + + + + + + + @@ -170,7 +189,7 @@ - diff --git a/head/head.o b/head/head.o index c7ef319..53ac94a 100644 Binary files a/head/head.o and b/head/head.o differ diff --git a/head_src/head.c b/head_src/head.c index 4ec50cd..d219f09 100644 --- a/head_src/head.c +++ b/head_src/head.c @@ -321,8 +321,13 @@ int findNextVersionPart(const char* startAt) char* firstSeparatorA = strchr(startAt, '.'); char* firstSeparatorB = strchr(startAt, '_'); + char* firstSeparatorC = strchr(startAt, 'u'); char* firstSeparator; - if (firstSeparatorA == NULL) + if (firstSeparatorC != NULL) + { + firstSeparator = firstSeparatorC; + } + else if (firstSeparatorA == NULL) { firstSeparator = firstSeparatorB; } @@ -490,9 +495,23 @@ BOOL isJavaHomeValid(const char* keyName, const int searchType) BOOL valid = FALSE; HKEY hKey; char path[_MAX_PATH] = {0}; + + char searchKeyName[_MAX_PATH] = {0}; + char searchValueName[_MAX_PATH] = {0}; + if(strstr(keyName, "AdoptOpenJDK") != NULL) + { + strcpy(searchValueName, "Path"); + strcpy(searchKeyName, keyName); + appendPath(searchKeyName, "hotspot\\MSI"); + } + else + { + strcpy(searchValueName, "JavaHome"); + strcpy(searchKeyName, keyName); + } if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - keyName, + searchKeyName, 0, KEY_READ | (searchType & KEY_WOW64_64KEY), &hKey) == ERROR_SUCCESS) @@ -501,7 +520,7 @@ BOOL isJavaHomeValid(const char* keyName, const int searchType) unsigned long bufferlength = _MAX_PATH; unsigned long datatype; - if (RegQueryValueEx(hKey, "JavaHome", NULL, &datatype, buffer, + if (RegQueryValueEx(hKey, searchValueName, NULL, &datatype, buffer, &bufferlength) == ERROR_SUCCESS) { int i = 0; @@ -655,6 +674,14 @@ BOOL findJavaHome(char* path, const int jdkPreference) jdkPreference); } + // AdoptOpenJDK + if (search.foundJava == NO_JAVA_FOUND) + { + regSearchJreSdk("SOFTWARE\\AdoptOpenJDK\\JRE", + "SOFTWARE\\AdoptOpenJDK\\JDK", + jdkPreference); + } + if (search.foundJava != NO_JAVA_FOUND) { strcpy(path, search.foundJavaHome); diff --git a/maven-readme.txt b/maven-readme.txt new file mode 100644 index 0000000..c977ad8 --- /dev/null +++ b/maven-readme.txt @@ -0,0 +1,8 @@ +Run once the Ant target switch-to-maven, it will reconfigure the project to use maven. + +*** Creation of Distribution Release *** +Windows: mvn -P dist,win32 clean package + +Linux: mvn -P dist,linux clean package + +MacOsX: mvn -P dist,macosx-x86 clean package diff --git a/maven/assembly/assemble-linuxarmv6hf.xml b/maven/assembly/assemble-linuxarmv6hf.xml new file mode 100644 index 0000000..6f67e13 --- /dev/null +++ b/maven/assembly/assemble-linuxarmv6hf.xml @@ -0,0 +1,53 @@ + + + + workdir-linuxarmv6hf + + jar + + false + + + bin/bin-linuxarmv6hf + ${finalName}-workdir-linuxarmv6hf/bin + + + ${finalName}-workdir-linuxarmv6hf + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/maven/pom.xml b/maven/pom.xml index bca0543..7fe33a5 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -237,6 +237,7 @@ assembly/assemble-linux.xml assembly/assemble-linux64.xml + assembly/assemble-linuxarmv6hf.xml assembly/assemble-win32.xml assembly/assemble-mac.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7c0daa1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,527 @@ + + 4.0.0 + + org.bidib.net.sf.launch4j + launch4j + 3.13 + + Launch4j + Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience. + http://sourceforge.net/projects/launch4j/ + + + + BSD 3-Clause License + http://opensource.org/licenses/BSD-3-Clause + Launch4j is licensed under the BSD 3-Clause License. + + + MIT License + http://www.opensource.org/licenses/mit-license.php + Launch4j code (head) which is attached to the wrapped jars is licensed under the MIT License. + + + + + + Grzegorz Kowal + http://sourceforge.net/u/grzegok/profile/ + + + + + scm:git:http://git.code.sf.net/p/launch4j/git + scm:git:http://git.code.sf.net/p/launch4j/git + http://sourceforge.net/p/launch4j/git/ci/master/tree/ + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + Nexus Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + UTF-8 + 3.13.0.0 + 3.13 + + + + + commons-beanutils + commons-beanutils + + + commons-collections + commons-collections + + + 1.7.0 + + + commons-logging + commons-logging + 1.2 + + + net.java.abeille + abeille + 3.0 + + + colt + colt + + + + com.springsource.org.apache.batik.ext.awt + + org.apache.batik + + + + com.springsource.org.apache.batik.util + + org.apache.batik + + + dom4j + dom4j + + + dsol-xml + dsol + + + javahelp + javax.help + + + jfreechart + jfree + + + jcommon + jfree + + + mahout-collections + org.apache.mahout + + + optimization + com.github.rwl + + + + + foxtrot + foxtrot + 2.0 + + + com.jgoodies + jgoodies-common + 1.7.0 + + + com.jgoodies + forms + 1.2.1 + + + com.jgoodies + looks + 2.2.2 + + + com.thoughtworks.xstream + xstream + 1.4.8 + + + org.apache.ant + ant + 1.8.2 + + + + + + src + + + src + + **/*.java + + + + + + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + com.github.taxone.plugins + classpath-maven-plugin + 1.0.0 + + + set-classpath-property + prepare-package + + setClassPath + + + lib/ + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + default-jar + package + + jar + + + + + net.sf.launch4j.Main + + + . ${taxone.classpath.propertyName} + + + + + + core-jar + package + + jar + + + ${project.build.finalName} + + net/sf/launch4j/form/ + net/sf/launch4j/formimpl + + core + + + + + + maven-assembly-plugin + 2.4.1 + + + assemble-workdir + package + + attached + + + + assembly/assemble-linux.xml + assembly/assemble-linux64.xml + assembly/assemble-win32.xml + assembly/assemble-mac.xml + + + + + assemble-distrib + package + + single + + + lib + ${basedir} + false + + assembly/assemble-dist.xml + + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + package + + copy-resources + + + ${basedir} + + + target + + ${project.build.finalName}.jar + + + + + + + + + maven-clean-plugin + 2.6 + + + + ${basedir} + + ${project.build.finalName}.jar + + + + + + + + + + + full-release + + + + org.apache.maven.plugins + maven-source-plugin + 2.3 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + attach-javadocs + + jar + + + + + + none + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + + sign + + + + + + + + + + + + + + macosx-x86 + + bin-macosx-x86 + + + + + linux + + bin-linux + + + + + win32 + + bin-win32 + + + + + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + 1.6 + + + launch4j + package + + launch4j + + + gui + true + ${project.build.finalName}.jar + launch4j.exe + launch4j + . + false + + + 1.6.0 + + + ${versionNumber} + ${version} + ${versionNumber} + ${version} + Cross-platform Java application wrapper + Copyright (C) 2004, 2017 Grzegorz Kowal + launch4j + http://launch4j.sourceforge.net/ + GUI launcher + launch4j.exe + + + + + + + + + + + dist + + + + + maven-clean-plugin + 2.6 + + + + ${basedir}/bin + + * + + + COPYING + + + + ${basedir} + + launch4j.exe + + + + ${basedir} + + lib/ + + + + + + + + maven-resources-plugin + 2.6 + + + copy-binutils + prepare-package + + copy-resources + + + ${basedir}/bin + + + ${basedir}/bin/${bin.dir} + + + + + + + + + maven-antrun-plugin + 1.7 + + + package + + + + + + + + + run + + + + + + + + + + + + \ No newline at end of file diff --git a/src/launch4j.properties b/src/launch4j.properties index 478c5d0..75e2671 100644 --- a/src/launch4j.properties +++ b/src/launch4j.properties @@ -1,2 +1,2 @@ -versionNumber=3.13.0.0 -version=3.13 +versionNumber=3.14.0.0 +version=3.14-SNAPSHOT diff --git a/src/net/sf/launch4j/config/Config.java b/src/net/sf/launch4j/config/Config.java index a9671c2..da9dd1d 100644 --- a/src/net/sf/launch4j/config/Config.java +++ b/src/net/sf/launch4j/config/Config.java @@ -145,7 +145,7 @@ public void checkInvariants() { Validator.checkOptStrings(variables, Validator.MAX_ARGS, Validator.MAX_ARGS, - "[^=%\t]+=[^=\t]+", + "[^=%\t]+=[^\t]+", "variables", Messages.getString("Config.variables"), Messages.getString("Config.variables.err")); diff --git a/src/net/sf/launch4j/config/Jre.java b/src/net/sf/launch4j/config/Jre.java index cd91661..2de3333 100644 --- a/src/net/sf/launch4j/config/Jre.java +++ b/src/net/sf/launch4j/config/Jre.java @@ -54,7 +54,7 @@ public class Jre implements IValidatable { public static final String ARGS = "jvmArgs"; // __________________________________________________________________________________ - public static final String VERSION_PATTERN = "(1\\.\\d\\.\\d(_\\d{1,3})?)|[1-9][0-9]{0,2}(\\.\\d{1,3}){0,2}"; + public static final String VERSION_PATTERN = "(1\\.\\d\\.\\d((_|\\.)\\d{1,3})?)|[1-9][0-9]{0,2}(\\.\\d{1,3}){0,2}"; public static final String JDK_PREFERENCE_JRE_ONLY = "jreOnly"; public static final String JDK_PREFERENCE_PREFER_JRE = "preferJre";