[gradle] 02/03: Replaced disable_release_notes.diff with a task exclusion parameter

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle.

commit f48426def230234f559a795f351cefa206567e7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 1 19:28:11 2016 +0100

    Replaced disable_release_notes.diff with a task exclusion parameter
---
 debian/changelog                          |  1 +
 debian/patches/disable_release_notes.diff | 70 -------------------------------
 debian/patches/series                     |  1 -
 debian/rules                              |  2 +-
 4 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 340e962..c7e320b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed disable_java9.diff (no longer required)
+  * Replaced disable_release_notes.diff with a task exclusion parameter
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff
deleted file mode 100644
index ef53055..0000000
--- a/debian/patches/disable_release_notes.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: libpegdown-java_1.4.2-1 and libparboiled-java_1.1.6-1 do not
-             work well, so we need disable the release notes compilation.
-Author: Kai-Chung Yan
-Last-Update: 2015-07-02
---- a/subprojects/docs/docs.gradle
-+++ b/subprojects/docs/docs.gradle
-@@ -83,7 +83,7 @@
-     builtBy 'distDocs'
- }
- outputs.docs = files(docsDir) {
--    builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes'
-+    builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml'
- }
- 
- tasks.withType(Docbook2Xhtml) {
-@@ -393,31 +393,6 @@
-     group = 'documentation'
- }
- 
--import org.gradle.plugins.pegdown.PegDown
--
--task editReleaseNotes() {
--    group = "release notes"
--    doLast {
--        Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
--    }
--}
--
--task releaseNotesMarkdown(type: PegDown) {
--    group = "release notes"
--    source "src/docs/release/notes.md"
--    destination "$buildDir/release-notes-raw/release-notes.html"
--}
--
--task releaseNotes(type: Copy) {
--    group = "release notes"
--    ext.fileName = "release-notes.html"
--    into "$docsDir"
--    from releaseNotesMarkdown
--    jsoup.plugins "src/transforms/release-notes.gradle"
--    filter(ReplaceTokens, tokens: [version: project.version.toString(), versionBase: rootProject.versionBase])
--    ext.entryPoint = file("$docsDir/$fileName")
--}
--
- tasks.addRule("view«Doc Task Name» - Opens entry point") { String taskName ->
-     if (taskName.startsWith("view")) {
-         def realTaskName = (taskName - "view")
-@@ -436,21 +411,8 @@
- 
- sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports
- 
--test {
--    dependsOn releaseNotes
--    systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile
--    systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName)
--
--}
--
--java9Test {
--    dependsOn releaseNotes
--    systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile
--    systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName)
--}
--
- task docs {
--    dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml, releaseNotes
-+    dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml
-     description = 'Generates all documentation'
-     group = 'documentation'
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9b92c72..8f43223 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ disable_tests.diff
 jetty.diff
 docs.diff
 disable_sonar.diff
-disable_release_notes.diff
 search_system_jar.diff
 26_disable_commitid.diff
 disable_aws.diff
diff --git a/debian/rules b/debian/rules
index 32606b5..dd03143 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-GRADLE_TASKS := assemble startScripts javadocAll groovydocAll samplesDocs
+GRADLE_TASKS := assemble startScripts javadocAll groovydocAll samplesDocs -x :docs:releaseNotes
 export GRADLE_VERSION = $(shell cat version.txt)
 
 # Only for debug purpose

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git