* tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
(getDocletVersion): Likewise.
* tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
* tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148530
138bc75d-0d04-0410-961f-
82ee72b054a4
+2009-06-16 Matthias Klose <doko@ubuntu.com>
+
+ * tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
+ gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
+ * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+ (getDocletVersion): Likewise.
+ * tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
+ * tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
+ Regenerate.
+
2009-03-16 Matthias Klose <doko@ubuntu.com>
* configure.ac: Detect xulrunner-1.9.
protected String getDocletVersion()
{
if (null == docletVersion) {
- try {
- Properties versionProperties = new Properties();
- InputStream in = getClass().getResourceAsStream("/version.properties");
- if (in == null) {
- in = new FileInputStream("src/resources/version.properties");
- }
- versionProperties.load(in);
- docletVersion = versionProperties.getProperty("gjdoc.version");
- }
- catch (IOException ignore) {
- }
- if (null == docletVersion) {
- docletVersion = "unknown";
- }
+ docletVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
}
return docletVersion;
}
public String getGjdocVersion()
{
if (null == gjdocVersion) {
- try {
- Properties versionProperties = new Properties();
- versionProperties.load(getClass().getResourceAsStream("version.properties"));
- gjdocVersion = versionProperties.getProperty("gjdoc.version");
- }
- catch (IOException ignore) {
- }
- if (null == gjdocVersion) {
- gjdocVersion = "unknown";
- }
+ gjdocVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
}
return gjdocVersion;
}