[gradle-jflex-plugin] 01/01: Imported Upstream version 1.1.0
Markus Koschany
apo at moszumanska.debian.org
Wed Jul 27 12:00:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to annotated tag upstream/1.1.0
in repository gradle-jflex-plugin.
commit b69253837cabb34973d1118f301dc67ea5a2bb4e
Author: Markus Koschany <apo at debian.org>
Date: Tue Jul 19 19:22:08 2016 +0200
Imported Upstream version 1.1.0
---
.gitignore | 15 +-
LICENSE | 14 --
LICENSE.txt | 202 +++++++++++++++++++++
README.md | 57 +++---
build.gradle | 71 ++------
gradle.properties | 4 -
gradle/wrapper/gradle-wrapper.properties | 4 +-
gradlew | 10 +-
gradlew.bat | 2 +-
settings.gradle | 20 +-
.../org/xbib/gradle/plugin/JFlexPlugin.groovy | 18 ++
.../groovy/org/xbib/gradle/task/JFlexTask.groovy | 37 ++++
.../tomlee/gradle/plugins/jflex/JFlexPlugin.java | 91 ----------
.../co/tomlee/gradle/plugins/jflex/JFlexTask.java | 48 -----
.../plugins/jflex/JFlexVirtualSourceDirectory.java | 9 -
.../jflex/JFlexVirtualSourceDirectoryImpl.java | 28 ---
.../META-INF/gradle-plugins/jflex.properties | 2 +-
17 files changed, 320 insertions(+), 312 deletions(-)
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index b66ad7e..068863f
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,15 @@
-/.gradle
-/build
+target
+build
+out
+*~
+.gradle
+*.iml
*.ipr
*.iws
-*.iml
+.idea
+*.class
+user.gradle
+.settings
+*.classpath
+*.project
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index a6f953e..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright 2007-2011 the original author or authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index c3442e5..95cb41c
--- a/README.md
+++ b/README.md
@@ -1,53 +1,44 @@
-# gradle-jflex-plugin
+# gradle-plugin-jflex
-## Status
-
-Beta
-
-## Overview
-
-A Gradle plugin for [JFlex](http://jflex.de), a scanner generator.
+A Gradle plugin for [JFlex](http://jflex.de)
## Usage
-First, install the plugin to your local repository using `gradle install`.
-(I'll get this puppy up on Maven Central sometime soon.)
-
-Then:
-
- apply plugin: 'java'
- apply plugin: 'jflex'
-
buildscript {
repositories {
- mavenLocal()
+ mavenCentral()
+ maven {
+ url "http://xbib.org/repository"
+ }
}
-
dependencies {
- classpath 'co.tomlee.gradle.plugins:gradle-jflex-plugin:0.0.1'
+ classpath 'org.xbib.gradle.plugins:gradle-plugin-jflex:1.1.0'
}
}
- dependencies {
- jflex 'de.jflex:jflex:1.6.0'
- }
-
-Once everything's wired up, Gradle will look for your JFlex specs in
-`src/main/jflex/*.l`.
+ apply plugin: 'jflex'
-## License
+Gradle will look for your JFlex files in `src/main/jflex/**/*.jflex`.
-Apache 2.0
+## Credits
-## Support
+gradle-plugin-jflex is a plugin based on
+[gradle-jflex-plugin](https://github.com/thomaslee/gradle-jflex-plugin)
+which was written by [Tom Lee](http://tomlee.co).
-Please log defects and feature requests using the issue tracker on [github](http://github.com/thomaslee/gradle-jflex-plugin/issues).
+# License
-## About
+Copyright (C) 2015 Jörg Prante
-gradle-jflex-plugin was written by [Tom Lee](http://tomlee.co).
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-Follow me on [Twitter](http://www.twitter.com/tglee) or
-[LinkedIn](http://au.linkedin.com/pub/thomas-lee/2/386/629).
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index 3551838..0350ad5
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,14 @@
-// vim: ft=groovy:sw=2:ts=2:expandtab
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'maven'
-apply plugin: 'nexus'
-apply plugin: 'release'
+group = 'org.xbib.gradle.plugin'
+version = '1.1.0'
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+apply plugin: 'groovy'
+apply plugin: 'maven'
buildscript {
repositories {
- mavenCentral()
jcenter()
}
-
- dependencies {
- classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
- classpath 'co.tomlee.gradle.plugins:gradle-release-plugin:0.0.6'
- }
-}
-
-ext {
- jflexVersion = '1.6.0'
}
repositories {
@@ -30,44 +16,25 @@ repositories {
mavenCentral()
}
+configurations {
+ wagon
+}
+
dependencies {
compile gradleApi()
- compile "de.jflex:jflex:${jflexVersion}"
- testCompile 'junit:junit:4.11'
+ compile "de.jflex:jflex:1.6.1"
+ wagon 'org.apache.maven.wagon:wagon-ssh-external:2.10'
}
-modifyPom {
- project {
- name 'gradle-jflex-plugin'
- description 'A Gradle plugin for the JFlex scanner generator'
- url 'https://github.com/thomaslee/gradle-jflex-plugin'
- inceptionYear '2014'
-
- scm {
- url 'https://github.com/thomaslee/gradle-jflex-plugin'
- connection 'scm:git://github.com/thomaslee/gradle-jflex-plugin.git'
- developerConnection 'scm:git at github.com:thomaslee/gradle-jflex-plugin.git'
- }
-
- licenses {
- license {
- name 'Apache License 2.0'
- url 'http://opensource.org/licenses/Apache-2.0'
- distribution 'repo'
- }
- }
-
- developers {
- developer {
- id 'thomaslee'
- name 'Tom Lee'
- email 'github at tomlee.co'
- }
+uploadArchives {
+ repositories {
+ mavenDeployer {
+ configuration = configurations.wagon
+ repository (
+ id: 'xbib.org',
+ url: uri('scpexe://xbib.org/repository'),
+ authentication: [ userName: xbibUsername, privateKey: xbibPrivateKey]
+ )
}
}
}
-
-nexus {
- sign = true
-}
-
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index f6acbef..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-group = co.tomlee.gradle.plugins
-version = 0.0.2
-
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a6aec3e..c3a0528 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jul 26 22:29:41 PDT 2014
+#Fri Mar 25 21:19:56 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..72d362d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail
:init
- at rem Get command-line arguments, handling Windowz variants
+ at rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/settings.gradle b/settings.gradle
old mode 100644
new mode 100755
index 0c899ce..555bbc7
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,19 +1 @@
-/*
- * This settings file was auto generated by the Gradle buildInit task
- * by 'tom' at '7/26/14 10:29 PM' with Gradle 1.10
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at http://gradle.org/docs/1.10/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'gradle-jflex-plugin'
+rootProject.name = 'gradle-plugin-jflex'
diff --git a/src/main/groovy/org/xbib/gradle/plugin/JFlexPlugin.groovy b/src/main/groovy/org/xbib/gradle/plugin/JFlexPlugin.groovy
new file mode 100755
index 0000000..fae2810
--- /dev/null
+++ b/src/main/groovy/org/xbib/gradle/plugin/JFlexPlugin.groovy
@@ -0,0 +1,18 @@
+package org.xbib.gradle.plugin
+
+import org.xbib.gradle.task.JFlexTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class JFlexPlugin implements Plugin<Project> {
+
+ @Override
+ void apply(Project project) {
+ project.with {
+ apply plugin: 'java'
+ tasks.create(name: 'jflex', type: JFlexTask)
+ tasks.compileJava.dependsOn tasks.jflex
+ sourceSets.main.java.srcDirs += tasks.jflex.generateDir
+ }
+ }
+}
diff --git a/src/main/groovy/org/xbib/gradle/task/JFlexTask.groovy b/src/main/groovy/org/xbib/gradle/task/JFlexTask.groovy
new file mode 100755
index 0000000..2c7f5d7
--- /dev/null
+++ b/src/main/groovy/org/xbib/gradle/task/JFlexTask.groovy
@@ -0,0 +1,37 @@
+package org.xbib.gradle.task;
+
+import jflex.Main
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileVisitDetails
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+
+class JFlexTask extends DefaultTask {
+
+ @InputDirectory
+ @Optional
+ File source = project.file('src/main/jflex')
+
+ @OutputDirectory
+ @Optional
+ File generateDir = project.file("$project.buildDir/generated-src/jflex")
+
+ @TaskAction
+ void generateAndTransformJflex() throws Exception {
+ project.delete(generateDir)
+ project.mkdir(generateDir)
+ generateJflex()
+ }
+
+ private void generateJflex() {
+ project.fileTree(dir:source, include:'**/*.jflex').visit { FileVisitDetails file ->
+ if (file.isDirectory()) {
+ return
+ }
+ Main.generate(['-q', file.file.absolutePath,
+ '-d', project.file("$generateDir/${file.relativePath.parent}").absolutePath + '/'] as String[])
+ }
+ }
+}
diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java
deleted file mode 100644
index 6a443d5..0000000
--- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package co.tomlee.gradle.plugins.jflex;
-
-import org.gradle.api.Action;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.internal.file.FileResolver;
-import org.gradle.api.internal.plugins.DslObject;
-import org.gradle.api.internal.tasks.DefaultSourceSet;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.SourceSet;
-
-import javax.inject.Inject;
-import java.io.File;
-import java.util.concurrent.Callable;
-
-public final class JFlexPlugin implements Plugin<Project> {
- private final FileResolver fileResolver;
-
- @Inject
- public JFlexPlugin(final FileResolver fileResolver) {
- this.fileResolver = fileResolver;
- }
-
- @Override
- public void apply(final Project project) {
- project.getPlugins().apply(JavaPlugin.class);
-
- configureConfigurations(project);
- configureSourceSets(project);
- }
-
- private void configureConfigurations(final Project project) {
- final Configuration jflexConfiguration = project.getConfigurations().create("jflex").setVisible(false);
- }
-
- private void configureSourceSets(final Project project) {
- project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().all(new Action<SourceSet>() {
- @Override
- public void execute(SourceSet sourceSet) {
- //
- // This logic borrowed from the antlr plugin.
- // 1. Add a new 'jflex' virtual directory mapping
- //
- final JFlexVirtualSourceDirectoryImpl jflexSourceSet =
- new JFlexVirtualSourceDirectoryImpl(((DefaultSourceSet) sourceSet).getDisplayName(), fileResolver);
- new DslObject(sourceSet).getConvention().getPlugins().put("jflex", jflexSourceSet);
- final String srcDir = String.format("src/%s/jflex", sourceSet.getName());
- jflexSourceSet.getJflex().srcDir(srcDir);
- sourceSet.getAllSource().source(jflexSourceSet.getJflex());
-
- //
- // 2. Create a JFlexTask for this sourceSet
- //
- final String taskName = sourceSet.getTaskName("generate", "JFlexSource");
- final JFlexTask jflexTask = project.getTasks().create(taskName, JFlexTask.class);
- jflexTask.setDescription(String.format("Processes the %s JFlex files.", sourceSet.getName()));
-
- //
- // 3. Set up convention mapping for default sources (allows user to not have to specify)
- //
- jflexTask.setSource(jflexSourceSet.getJflex());
-
- //
- // 4. Set up convention mapping for handling the 'jflex' dependency configuration
- //
- jflexTask.getConventionMapping().map("jflexClasspath", new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- return project.getConfigurations().getByName("jflex").copy().setTransitive(true);
- }
- });
-
- //
- // 5. Set up the jflex output directory (adding to javac inputs)
- //
- final String outputDirectoryName =
- String.format("%s/generated-src/jflex/%s", project.getBuildDir(), sourceSet.getName());
- final File outputDirectory = new File(outputDirectoryName);
- jflexTask.setOutputDirectory(outputDirectory);
- sourceSet.getJava().srcDir(outputDirectory);
-
- //
- // 6. Register the fact that jflex should run before compiling.
- //
- project.getTasks().getByName(sourceSet.getCompileJavaTaskName()).dependsOn(taskName);
- }
- });
- }
-}
diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java
deleted file mode 100644
index f64d2be..0000000
--- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package co.tomlee.gradle.plugins.jflex;
-
-import groovy.lang.Closure;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.SourceTask;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.process.JavaExecSpec;
-
-import java.io.File;
-
-public class JFlexTask extends SourceTask {
- private FileCollection jflexClasspath;
- private File outputDirectory;
-
- @TaskAction
- public void generate() throws Exception {
- getProject().javaexec(new Closure(this) {
- public void doCall(JavaExecSpec javaExecSpec) {
- javaExecSpec.setMain("JFlex.Main")
- .setClasspath(getProject().getConfigurations().getByName("jflex"))
- .args("-d")
- .args(getOutputDirectory())
- .args("-q")
- .args(getSource().getFiles());
- }
- });
- }
-
- @InputFiles
- public FileCollection getJflexClasspath() {
- return jflexClasspath;
- }
-
- public void setJflexClasspath(final FileCollection jflexClasspath) {
- this.jflexClasspath = jflexClasspath;
- }
-
- @OutputDirectory
- public File getOutputDirectory() {
- return outputDirectory;
- }
-
- public void setOutputDirectory(final File outputDirectory) {
- this.outputDirectory = outputDirectory;
- }
-}
diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectory.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectory.java
deleted file mode 100644
index 2871d4c..0000000
--- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package co.tomlee.gradle.plugins.jflex;
-
-import groovy.lang.Closure;
-import org.gradle.api.file.SourceDirectorySet;
-
-public interface JFlexVirtualSourceDirectory {
- SourceDirectorySet getJflex();
- JFlexVirtualSourceDirectory jflex(Closure closure);
-}
diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java
deleted file mode 100644
index ff82a21..0000000
--- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package co.tomlee.gradle.plugins.jflex;
-
-import groovy.lang.Closure;
-import org.gradle.api.file.SourceDirectorySet;
-import org.gradle.api.internal.file.DefaultSourceDirectorySet;
-import org.gradle.api.internal.file.FileResolver;
-import org.gradle.util.ConfigureUtil;
-
-public class JFlexVirtualSourceDirectoryImpl implements JFlexVirtualSourceDirectory {
- private final SourceDirectorySet jflex;
-
- public JFlexVirtualSourceDirectoryImpl(final String parentDisplayName, FileResolver fileResolver) {
- final String displayName = String.format("%s JFle source", parentDisplayName);
- this.jflex = new DefaultSourceDirectorySet(displayName, fileResolver);
- this.jflex.getFilter().include("**/*.l", "**/*.jflex");
- }
-
- @Override
- public SourceDirectorySet getJflex() {
- return jflex;
- }
-
- @Override
- public JFlexVirtualSourceDirectory jflex(Closure closure) {
- ConfigureUtil.configure(closure, getJflex());
- return this;
- }
-}
diff --git a/src/main/resources/META-INF/gradle-plugins/jflex.properties b/src/main/resources/META-INF/gradle-plugins/jflex.properties
old mode 100644
new mode 100755
index db560fc..bb9112a
--- a/src/main/resources/META-INF/gradle-plugins/jflex.properties
+++ b/src/main/resources/META-INF/gradle-plugins/jflex.properties
@@ -1 +1 @@
-implementation-class=co.tomlee.gradle.plugins.jflex.JFlexPlugin
\ No newline at end of file
+implementation-class=org.xbib.gradle.plugin.JFlexPlugin
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-jflex-plugin.git
More information about the pkg-java-commits
mailing list