changeset 10818:7460c802051f

8193910: Version number in cssref.html and introduction_to_fxml.html is wrong Reviewed-by: prr
author kcr
date Wed, 24 Jan 2018 17:45:39 -0800
parents f09aa59ddcca
children e93e46dabb83
files build.gradle modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
diffstat 3 files changed, 29 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Tue Jan 23 10:42:17 2018 -0800
+++ b/build.gradle	Wed Jan 24 17:45:39 2018 -0800
@@ -3784,7 +3784,16 @@
     doLast {
         projectsToDocument.each { p ->
             copy {
-                from "$p.projectDir/src/main/docs"
+                from("$p.projectDir/src/main/docs") {
+                    include "**/*.html"
+                    filter { line->
+                        line = line.replace("@FXVERSION@", RELEASE_VERSION)
+                    }
+                }
+                from("$p.projectDir/src/main/docs") {
+                    exclude "**/*.html"
+                }
+
                 into "$buildDir/javadoc"
             }
         }
@@ -4175,10 +4184,20 @@
         // Copy .html and other files needed for doc bundles
         def copyDocFiles = project.task("copyDocFiles$t.capital", type: Copy, dependsOn: copySourceFilesTask) {
             if (copySources) {
-                from "${project.projectDir}/src/main/java"
-                from "${project.projectDir}/src/main/docs"
+                from("${project.projectDir}/src/main/docs") {
+                    include "**/*.html"
+                    filter { line->
+                        line = line.replace("@FXVERSION@", RELEASE_VERSION)
+                    }
+                }
+                from("${project.projectDir}/src/main/docs") {
+                    exclude "**/*.html"
+                }
+                from("${project.projectDir}/src/main/java") {
+                    exclude "**/*.java"
+                }
+
                 into "${modulesSrcDir}/${moduleName}"
-                exclude "**/*.java"
             }
         }
 
--- a/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Tue Jan 23 10:42:17 2018 -0800
+++ b/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Wed Jan 24 17:45:39 2018 -0800
@@ -31,14 +31,14 @@
 <head>
 <link href="fxml.css" type="text/css" rel="stylesheet"/>    
 <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-<title>Introduction to FXML | JavaFX 10</title>
-<meta name="description" content="The document introduces FXML, an XML-based declarative markup language for defining user interfaces in JavaFX 10 applications."/>
-<meta name="keywords" content="JavaFX 10, FXML, JavaFX GUI development, web development, Java application development, GUI applications, rich internet applications, RIA, expressive content"/>
+<title>Introduction to FXML | JavaFX @FXVERSION@</title>
+<meta name="description" content="The document introduces FXML, an XML-based declarative markup language for defining user interfaces in JavaFX @FXVERSION@ applications."/>
+<meta name="keywords" content="JavaFX, FXML, JavaFX GUI development, web development, Java application development, GUI applications, rich internet applications, RIA, expressive content"/>
 </head>
 <body>
 
 <div class="fx-code-header">
-<div class="version"><br/>Release: JavaFX 10</div>
+<div class="version"><br/>Release: JavaFX @FXVERSION@</div>
 </div>
 
 <h1>Introduction to FXML</h1>
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Tue Jan 23 10:42:17 2018 -0800
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Wed Jan 24 17:45:39 2018 -0800
@@ -30,7 +30,7 @@
 <html lang="en">
   <head>
     <meta name="description" content="This document describes the JavaFX
-              Cascading Style Sheets (CSS) for JavaFX 10 and explains the
+              Cascading Style Sheets (CSS) for JavaFX @FXVERSION@ and explains the
               styles, values, properties and associated grammar.">
     <meta name="keywords" content="JavaFX, JavaFX CSS, JavaFX CSS reference,
               JavaFX CSS guide, JavaFX styling, CSS styles, CSS, cascading style sheets,
@@ -241,7 +241,7 @@
   <body>
     <div class="fx-code-header">
       <div class="version"><br>
-        Release: JavaFX 10</div>
+        Release: JavaFX @FXVERSION@</div>
     </div>
     <h1>JavaFX CSS Reference Guide</h1>
     <h2>Contents</h2>