You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/09/13 06:17:22 UTC
[1/2] groovy git commit: minor refactor for build
Repository: groovy
Updated Branches:
refs/heads/master 378e94d23 -> 26fc4e0f2
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a9a8d524
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a9a8d524
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a9a8d524
Branch: refs/heads/master
Commit: a9a8d524e159a1a06a78940f0ee884073175454d
Parents: 378e94d
Author: paulk <pa...@asert.com.au>
Authored: Wed Sep 13 00:38:18 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Wed Sep 13 16:17:04 2017 +1000
----------------------------------------------------------------------
build.gradle | 7 -------
subprojects/parser-antlr4/build.gradle | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a9a8d524/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 504ab57..1de344a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -321,13 +321,6 @@ sourceSets {
}
apply from: 'subprojects/parser-antlr4/build.gradle'
-sourceSets {
- main {
- antlr {
- srcDirs = ['src/antlr']
- }
- }
-}
// make sure examples can be compiled, even if we don't run them
// todo: reorganize examples so that we can run them too
http://git-wip-us.apache.org/repos/asf/groovy/blob/a9a8d524/subprojects/parser-antlr4/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/build.gradle b/subprojects/parser-antlr4/build.gradle
index fc7239a..e70db77 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -18,6 +18,13 @@
*/
apply plugin: 'antlr'
+sourceSets {
+ main {
+ antlr {
+ srcDirs = ['src/antlr']
+ }
+ }
+}
def srcBase = "subprojects/parser-antlr4/src"
def srcMain = "$srcBase/main"
[2/2] groovy git commit: minor refactor for build
Posted by pa...@apache.org.
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/26fc4e0f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/26fc4e0f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/26fc4e0f
Branch: refs/heads/master
Commit: 26fc4e0f2b3ac6bb26660899f6d2e8b1daee39ce
Parents: a9a8d52
Author: paulk <pa...@asert.com.au>
Authored: Wed Sep 13 12:49:25 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Wed Sep 13 16:17:05 2017 +1000
----------------------------------------------------------------------
build.gradle | 5 +----
gradle/assemble.gradle | 10 ++++-----
gradle/docs.gradle | 2 +-
.../META-INF/groovy-release-info.properties | 23 --------------------
.../org.codehaus.groovy.source.Extensions | 22 -------------------
....codehaus.groovy.transform.ASTTransformation | 20 -----------------
.../META-INF/groovy-release-info.properties | 23 ++++++++++++++++++++
.../org.codehaus.groovy.source.Extensions | 22 +++++++++++++++++++
....codehaus.groovy.transform.ASTTransformation | 20 +++++++++++++++++
9 files changed, 71 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1de344a..1bf8f47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,10 +287,7 @@ sourceSets {
}
}
resources {
- srcDirs = ['src/main', 'src/resources']
- include 'META-INF/services/*',
- 'META-INF/groovy-release-info.properties',
- 'groovy/grape/*.xml'
+ srcDirs = ['src/resources']
}
}
test {
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 3fdfd31..b6581c4 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -141,14 +141,12 @@ jar {
include('antlr2-license.txt')
}
from("$projectDir/notices/NOTICE-JARJAR")
- from('src/main/META-INF/groovy-release-info.properties') {
+ from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' : filename == 'NOTICE-JARJAR' ? 'NOTICE' : filename }
}
-
- exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
-
+ exclude '**/package-info.class'
}
allprojects {
@@ -276,12 +274,12 @@ subprojects { sp ->
} else {
from "${rootProject.projectDir}/notices/NOTICE-BASE"
}
- from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties") {
+ from("${rootProject.projectDir}/src/resources/META-INF/groovy-release-info.properties") {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE' : filename == 'NOTICE-BASE' ? 'NOTICE' : filename }
}
- exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
+ exclude '**/package-info.class'
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 905d06a..f9992ba 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -114,7 +114,7 @@ groovydocAll groovydocSpec
task docProjectVersionInfo(type: Copy) {
destinationDir = file("${project(':groovy-docgenerator').buildDir}/classes/main")
into('META-INF') {
- from('src/main/META-INF/groovy-release-info.properties') {
+ from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/main/META-INF/groovy-release-info.properties
----------------------------------------------------------------------
diff --git a/src/main/META-INF/groovy-release-info.properties b/src/main/META-INF/groovy-release-info.properties
deleted file mode 100644
index 7eae8ae..0000000
--- a/src/main/META-INF/groovy-release-info.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-#
-
-ImplementationVersion=#ImplementationVersion#
-BundleVersion=#BundleVersion#
-BuildDate=#BuildDate#
-BuildTime=#BuildTime#
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
----------------------------------------------------------------------
diff --git a/src/main/META-INF/services/org.codehaus.groovy.source.Extensions b/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
deleted file mode 100644
index 2e9df17..0000000
--- a/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# Format: one extension on each line without the leading "*."
-# Listed below are default groovy source file extensions.
-
-# NOTE: This implementation of supporting multiple file extensions is experimental and
-# the exact implementation details may vary when modularization gets introduced in
-# groovy 2.0. However, in terms of the behavior, this support will remain intact.
-groovy
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
----------------------------------------------------------------------
diff --git a/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
deleted file mode 100644
index 63a37f4..0000000
--- a/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# global transformation to handle @Grab annotation
-groovy.grape.GrabAnnotationTransformation
-
-#global transformation for AST Builder
-org.codehaus.groovy.ast.builder.AstBuilderTransformation
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/resources/META-INF/groovy-release-info.properties
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/groovy-release-info.properties b/src/resources/META-INF/groovy-release-info.properties
new file mode 100644
index 0000000..d33358c
--- /dev/null
+++ b/src/resources/META-INF/groovy-release-info.properties
@@ -0,0 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+ImplementationVersion=#ImplementationVersion#
+BundleVersion=#BundleVersion#
+BuildDate=#BuildDate#
+BuildTime=#BuildTime#
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions b/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
new file mode 100644
index 0000000..c17fe8b
--- /dev/null
+++ b/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+# Format: one extension on each line without the leading "*."
+# Listed below are default groovy source file extensions.
+
+# NOTE: This implementation of supporting multiple file extensions is experimental and
+# the exact implementation details may vary when modularization gets introduced in
+# groovy 2.0. However, in terms of the behavior, this support will remain intact.
+groovy
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
new file mode 100644
index 0000000..734b814
--- /dev/null
+++ b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+# global transformation to handle @Grab annotation
+groovy.grape.GrabAnnotationTransformation
+
+#global transformation for AST Builder
+org.codehaus.groovy.ast.builder.AstBuilderTransformation