Skip to content

Commit 2f116df

Browse files
committed
use Platform.getJavaHome()
1 parent cadc961 commit 2f116df

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

resources/build.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ sketchbook.location=${user.home}/Documents/Processing
2929
# package, in case you put Processing inside your Applications folder.
3030

3131
#classpath.local.location=${user.home}/Documents/workspace/libs
32-
classpath.local.location=/Applications/Processing.app/Contents/Java
32+
classpath.local.location=/Applications/Processing.app/Contents/app
3333

3434

3535
# Add all jar files that are required for compiling your project to the local
3636
# and project classpath. Use a comma as delimiter. These jar files must be
3737
# inside your classpath.local.location folder.
3838
# For creating a Tool, both pde.jar and core.jar are required.
3939

40-
classpath.local.include=core.jar,pde.jar
40+
classpath.local.include=app-4.4.4-bd4c56958b669662c7a237246a3acb6c.jar
4141

4242

4343
# Add Processing's libraries folder to the classpath.
@@ -134,12 +134,12 @@ source.repository=https://github.com/hkiel/JavaDoc.git
134134
# This is used to compare different versions of the same Tool, and check if an
135135
# update is available.
136136

137-
tool.version=7
137+
tool.version=8
138138

139139

140140
# The version as the user will see it.
141141

142-
tool.prettyVersion=1.0.6
142+
tool.prettyVersion=1.0.7
143143

144144

145145
# The min and max revision of Processing compatible with your Tool.
@@ -157,12 +157,12 @@ compatible.maxRevision=0
157157
# against. This information is only used in the generated webpage.
158158

159159
tested.platform=osx,windows
160-
tested.processingVersion=4.2
160+
tested.processingVersion=4.4.4
161161

162162

163163
# Additional information for the generated webpage.
164164

165-
tool.copyright=(c) 2024
165+
tool.copyright=(c) 2025
166166
tool.dependencies=?
167167
tool.keywords=javadoc
168168

src/javadoc/tool/JavaDoc.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
import java.util.stream.Stream;
4949

5050

51-
// when creating a tool, the name of the main class which implements Tool must
52-
// be the same as the value defined for project.name in your build.properties
53-
5451
public class JavaDoc implements Tool {
5552
Base base;
5653

@@ -59,7 +56,6 @@ public String getMenuTitle() {
5956
return "generate JavaDoc";
6057
}
6158

62-
6359
public void init(Base base) {
6460
// Store a reference to the Processing application itself
6561
this.base = base;
@@ -193,7 +189,7 @@ public void run() {
193189
myWriter.close();
194190

195191
List<String> command = new ArrayList<>();
196-
command.add(System.getProperty("java.home") + (isWindows?"\\bin\\javadoc":"/bin/javadoc"));
192+
command.add(Platform.getJavaHome() + (isWindows?"\\bin\\javadoc":"/bin/javadoc"));
197193
command.add(src.getAbsolutePath());
198194
for (String j : javaFiles) {
199195
command.add(j);

0 commit comments

Comments
 (0)