Mark Wielaard schrieb:
Hi Matthias,
On Sat, 2009-06-13 at 10:12 -0400, Matthias Klose wrote:
$ gjdoc-4.4 --version
java.lang.NullPointerException
at java.io.InputStreamReader.read(InputStreamReader.java:244)
at java.io.BufferedReader.fill(BufferedReader.java:370)
at java.io.BufferedReader.readLine(BufferedReader.java:469)
at java.util.Properties.load(Properties.java:203)
at java.util.Properties.load(Properties.java:380)
at gnu.classpath.tools.gjdoc.Main.getGjdocVersion(Main.java:1830)
at gnu.classpath.tools.gjdoc.Main.start(Main.java:1131)
at gnu.classpath.tools.gjdoc.Main.main(Main.java:883)
I don't see any version properties file in the tools.jar.
In GNU Classpath this comes from
tools/resource/gnu/classpath/tools/gjdoc/version.properties.in
Which is just one line:
gjdoc.versi...@version@
I don't see this in libgcj.
The following patch
does use the same method to get the version number as every other tool in
classpath. Ok for the trunk and the branch?
2009-06-13 Alexander Sack a...@jwsdot.com
* tools/gnu/classpath/tools/gjdoc/Main.java (start): Use
gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
* tools/classes/gnu/classpath/tools/gjdoc/Main.class: Regenerate.
--- tools/gnu/classpath/tools/gjdoc/Main.java(revision 148452)
+++ tools/gnu/classpath/tools/gjdoc/Main.java(working copy)
@@ -1128,7 +1128,7 @@
//--- Show version and exit if requested by user
if (option_showVersion) {
-System.out.println(gjdoc + getGjdocVersion());
+System.out.println(gjdoc +
gnu.classpath.Configuration.CLASSPATH_VERSION);
System.exit(0);
}
The idea is fine. But then please do also submit a patch to GNU
Classpath that just removes the whole getGjdocVersion() method.
Note that there is another variant called getDocletVersion() in
HtmlDoclet.java that you also want to change in this case.
attached.
I didn't remove the methods yet, so that the patch can be applied to the gcc-4.4
branch as well. This should be done in classpath only, and then imported into
libgcj.
ok for the attached patch on the libgcj branch and trunk?
2009-06-14 Matthias Klose d...@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.
Index: tools/gnu/classpath/tools/gjdoc/Main.java
===
--- tools/gnu/classpath/tools/gjdoc/Main.java (revision 148452)
+++ tools/gnu/classpath/tools/gjdoc/Main.java (working copy)
@@ -1825,16 +1825,7 @@
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;
}
Index: tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
===
--- tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
(revision 148452)
+++ tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
(working copy)
@@ -3736,20 +3736,7 @@
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;
}
