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 2015/09/30 09:12:08 UTC
[2/3] incubator-groovy git commit: Added the notimestamp option to
groovydoc
Added the notimestamp option to groovydoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/e55c7f87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/e55c7f87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/e55c7f87
Branch: refs/heads/GROOVY_2_4_X
Commit: e55c7f876e22def6e1e11e8420cfc908bea31017
Parents: 9ba4f1b
Author: Emmanuel Bourg <eb...@apache.org>
Authored: Mon Sep 28 00:49:16 2015 +0200
Committer: Paul King <pa...@asert.com.au>
Committed: Wed Sep 30 17:11:55 2015 +1000
----------------------------------------------------------------------
.../main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy | 4 ++++
.../org/codehaus/groovy/tools/groovydoc/Main.properties | 2 ++
.../groovydoc/gstringTemplates/classLevel/classDocName.html | 2 +-
.../groovydoc/gstringTemplates/topLevel/deprecated-list.html | 2 +-
.../tools/groovydoc/gstringTemplates/topLevel/help-doc.html | 2 +-
.../tools/groovydoc/gstringTemplates/topLevel/index-all.html | 2 +-
6 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy b/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
index 8566d76..3d6cf6c 100644
--- a/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
+++ b/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
@@ -43,6 +43,7 @@ class Main {
private static Boolean author
private static Boolean noScripts
private static Boolean noMainForScripts
+ private static Boolean noTimestamp
private static Boolean privateScope
private static Boolean packageScope
private static Boolean publicScope
@@ -71,6 +72,7 @@ class Main {
cli.author(messages['cli.option.author.description'])
cli.noscripts(messages['cli.option.noscripts.description'])
cli.nomainforscripts(messages['cli.option.nomainforscripts.description'])
+ cli.notimestamp(messages['cli.option.notimestamp.description'])
cli.overview(args:1, argName: 'file', messages['cli.option.overview.description'])
cli.public(messages['cli.option.public.description'])
cli.protected(messages['cli.option.protected.description'])
@@ -123,6 +125,7 @@ class Main {
author = Boolean.valueOf(options.author) ?: false
noScripts = Boolean.valueOf(options.noscripts) ?: false
noMainForScripts = Boolean.valueOf(options.nomainforscripts) ?: false
+ noTimestamp = Boolean.valueOf(options.notimestamp) ?: false
packageScope = Boolean.valueOf(options.package) ?: false
privateScope = Boolean.valueOf(options.private) ?: false
protectedScope = Boolean.valueOf(options.protected) ?: false
@@ -191,6 +194,7 @@ class Main {
properties.put("author", author.toString())
properties.put("processScripts", (!noScripts).toString())
properties.put("includeMainForScripts", (!noMainForScripts).toString())
+ properties.put("timestamp", (!noTimestamp).toString())
properties.put("overviewFile", overviewFile?.absolutePath ?: "")
def links = new ArrayList<LinkArgument>();
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
index 103c13a..3bc8da2 100644
--- a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
+++ b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
@@ -55,6 +55,8 @@ cli.option.noscripts.description=Don't process Groovy Scripts
cli.option.nomainforscripts.description=Don't include the implicit 'public static void main' method for scripts
+cli.option.notimestamp.description=Don't include hidden timestamp
+
cli.option.public.description=Show only public classes and members
cli.option.protected.description=Show protected/public classes and members (default)
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
index 5a14cbd..84c0a6d 100644
--- a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
+++ b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
@@ -85,7 +85,7 @@
%>
<html>
<head>
- <!-- Generated by groovydoc (${GroovySystem.version}) on ${new Date()} -->
+ <!-- Generated by groovydoc (${GroovySystem.version})<% if (props.timestamp == 'true') { %> on ${new Date()}<% } %> -->
<title>${title}</title>
<meta name="date" content="${new Date().format('yyyy-MM-dd')}">
<meta http-equiv="Content-Type" content="text/html; charset=${props.charset}">
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
index ff2dcea..ccdd24e 100644
--- a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
+++ b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
@@ -81,7 +81,7 @@ def nameFromParams = { n -> n.name() + '(' + n.parameters().collect{ param -> pa
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=${props.charset}">
-<!-- Generated by groovydoc (${GroovySystem.version}) on <% new Date() %> -->
+ <!-- Generated by groovydoc (${GroovySystem.version})<% if (props.timestamp == 'true') { %> on ${new Date()}<% } %> -->
<title>${title}</title>
<meta name="date" content="${new Date().format('yyyy-MM-dd')}">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
index 5f992c4..e48e026 100644
--- a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
+++ b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
@@ -24,7 +24,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=${props.charset}">
- <!-- Generated by groovydoc (${GroovySystem.version}) on <% new Date() %> -->
+ <!-- Generated by groovydoc (${GroovySystem.version})<% if (props.timestamp == 'true') { %> on ${new Date()}<% } %> -->
<title>${title}</title>
<link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
<link href="groovy.ico" type="image/x-icon" rel="icon">
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e55c7f87/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
index 324ebd6..bf136ce 100644
--- a/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
+++ b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
@@ -38,7 +38,7 @@ def nameFromParams = { n -> n.name() + '(' + n.parameters().collect{ param -> pa
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=${props.charset}">
- <!-- Generated by groovydoc (${GroovySystem.version}) on <% new Date() %> -->
+ <!-- Generated by groovydoc (${GroovySystem.version})<% if (props.timestamp == 'true') { %> on ${new Date()}<% } %> -->
<title>${title}</title>
<meta name="date" content="${new Date().format('yyyy-MM-dd')}">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">