Skip to content

Commit

Permalink
Bug fix and clean up version bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
kwhat committed Mar 23, 2018
1 parent f4b679f commit e75a35a
Show file tree
Hide file tree
Showing 25 changed files with 94 additions and 73 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.idea/
bin/
dist/
jar/
javadoc/
JNITasks.iml
15 changes: 15 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## ChangeLog

**JNITasks 0.3.0 (Mar 23, 2018)**
* Added ChangeLog.md
* Fixed a reflection problem with a private inner class.
* Small clanup in the ConfigureTask.
* Updated copyright.
* Tested JDK 1.5 - 1.8

**JNativeHook 0.2.0 (Jan 4, 2015)**
* Added optional support for `ant.build.native.toolchain` and `ant.build.native.host`.
* Updated documentation.

**JNativeHook 0.1.0 (Sep 3, 2014)**
* Initial Release.
2 changes: 1 addition & 1 deletion build.num
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Build number properties for Ant.

ant.build.major=0
ant.build.minor=1
ant.build.minor=3
32 changes: 16 additions & 16 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
JNITasks: Ant tasks for JNI projects.
Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
https://github.com/kwhat/jnitasks/
JNITasks is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
JNITasks 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 Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
JNITasks: Ant tasks for JNI projects.
Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
https://github.com/kwhat/jnitasks/
JNITasks is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
JNITasks 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 Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<project name="JNITasks" default="all" basedir=".">
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/CcTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/LdTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
26 changes: 13 additions & 13 deletions src/org/jnitasks/antlib.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0"?>

<!--
JNITasks: Ant tasks for JNI projects.
Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
https://github.com/kwhat/jnitasks/
JNITasks: Ant tasks for JNI projects.
Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
https://github.com/kwhat/jnitasks/
JNITasks is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
JNITasks is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
JNITasks 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.
JNITasks 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 Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<antlib>
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/autotools/AutoreconfTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
48 changes: 24 additions & 24 deletions src/org/jnitasks/autotools/ConfigureTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -261,7 +261,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = cache.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -277,7 +277,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = cache.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -290,7 +290,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = prefix.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -302,7 +302,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = exec_prefix.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -315,7 +315,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = bin.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -327,7 +327,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = sbin.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -339,7 +339,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TOD<envO Make sure the drive letter is lower case.
String tmpPath = libexec.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -351,7 +351,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = sysconf.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -363,7 +363,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = sharedstate.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -375,7 +375,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = localstate.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -387,7 +387,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = lib.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -399,7 +399,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = include.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -411,7 +411,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = oldinclude.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -423,7 +423,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = dataroot.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -435,7 +435,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = info.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -447,7 +447,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = locale.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -459,7 +459,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = man.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -471,7 +471,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = doc.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -483,7 +483,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = html.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -495,7 +495,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = dvi.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -507,7 +507,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = pdf.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand All @@ -519,7 +519,7 @@ public void execute() {
// TODO Change to getCanonicalPath() when ready to deal with the io exception.
// TODO Make sure the drive letter is lower case.
String tmpPath = ps.getAbsolutePath().replace('\\', '/');
if (tmpPath.indexOf(" ") >= 0) {
if (tmpPath.contains(" ")) {
tmpPath = '"' + tmpPath + '"';
}

Expand Down Expand Up @@ -622,7 +622,7 @@ else if (feature instanceof Without) {
shell.execute();
}

private static class ToggleFeature extends AbstractFeature {
protected static class ToggleFeature extends AbstractFeature {
private String flag;

public void addText(String flag) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/autotools/MakeTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/pkgconfig/PkgConfigTask.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/CompilerAdapter.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/LinkerAdapter.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/ToolchainFactory.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/adapters/ClangCompiler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/adapters/ClangLinker.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/org/jnitasks/toolchains/adapters/ClangxxCompiler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* JNITasks: Ant tasks for JNI projects.
* Copyright (C) 2013-2014 Alexander Barker. All Rights Received.
* Copyright (C) 2013-2018 Alexander Barker. All Rights Received.
* https://github.com/kwhat/jnitasks/
*
* JNITasks is free software: you can redistribute it and/or modify
Expand Down
Loading

0 comments on commit e75a35a

Please sign in to comment.