diff --git a/DEVELOPER.md b/DEVELOPER.md index 0d06e28..486ecf3 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -2,7 +2,7 @@ AppleCommander has switched to using [Gradle](https://gradle.org/) for build and build dependencies. -There is still a bunch of ANT related build information around. They no longer apply and "should" get cleaned up over time. +There is still a bunch of ANT related build information around in `ant-build`. This should get cleaned up over time. ## Structure @@ -29,6 +29,20 @@ BUILD SUCCESSFUL in 554ms 19 actionable tasks: 19 up-to-date ``` +## Testing for Ant Task + +The Apache Ant Task has been added as an independent "application" to the Gradle source structure. It resides in `app/ant-ac`. To test the Ant Task, there is an actual Ant build script available. Run this script from the AppleCommander project directory -- it should figure out paths from that starting position. + +``` +$ ant -f app/ant-ac/src/test/resources/build-testacant.xml +Buildfile: /.../AppleCommander/app/ant-ac/src/test/resources/build-testacant.xml + + + +BUILD SUCCESSFUL +Total time: 0 seconds +``` + ## Building ``` diff --git a/ant-build/build-testacant.xml b/ant-build/build-testacant.xml deleted file mode 100644 index 6b158ab..0000000 --- a/ant-build/build-testacant.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - Testing ant support from version ${acVersion}... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/ant-ac/build.gradle b/app/ant-ac/build.gradle new file mode 100644 index 0000000..c72f2e1 --- /dev/null +++ b/app/ant-ac/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java-library' +} + +sourceCompatibility = 11 +targetCompatibility = 11 + +repositories { + mavenCentral() +} + +dependencies { + implementation project(':app:cli-ac') + implementation project(':lib:ac-api') + compileOnly "org.apache.ant:ant:$antVersion" +} + +jar { + archiveBaseName = 'AppleCommander' + archiveAppendix = 'ant' + + dependsOn configurations.runtimeClasspath + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } +} diff --git a/app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java b/app/ant-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java similarity index 100% rename from app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java rename to app/ant-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java diff --git a/app/ant-ac/src/test/resources/build-testacant.xml b/app/ant-ac/src/test/resources/build-testacant.xml new file mode 100644 index 0000000..803407b --- /dev/null +++ b/app/ant-ac/src/test/resources/build-testacant.xml @@ -0,0 +1,98 @@ + + + + + + + + + + Testing ant support... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ant-build/manifest.mf b/app/ant-ac/src/test/resources/manifest.mf similarity index 100% rename from ant-build/manifest.mf rename to app/ant-ac/src/test/resources/manifest.mf diff --git a/settings.gradle b/settings.gradle index 8284769..e34a849 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ include ':lib:ac-api' include ':lib:ac-swt-common' include ':app:cli-ac' include ':app:cli-acx' +include ':app:ant-ac' include ':app:gui-swing' include ':app:gui-swt-macosx-aarch64' include ':app:gui-swt-macosx-x86_64'