eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-05-03 17:35:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fighting with Windows a bit more

Browse Source
This commit is contained in:
benfry
2012-07-22 21:48:57 +00:00
parent 48dd731c48
commit b81ab08b84
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/processing/app/windows/Platform.java
View File

@@ -41,9 +41,6 @@ import processing.app.windows.Registry.REGISTRY_ROOT_KEY;
import processing.core.PApplet;
// HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion -> 1.6 (String)
// HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion\1.6\JavaHome -> c:\jdk-1.6.0_05
public class Platform extends processing.app.Platform {
static final String openCommand =
@@ -60,25 +57,57 @@ public class Platform extends processing.app.Platform {
checkPath();
//findJDK();
// EventQueue.invokeLater(new Runnable() {
// public void run() {
// findJDK();
// }
// });
/*
new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(2000);
} catch (InterruptedException ie) { }
findJDK();
}
}).start();
*/
}
// HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion -> 1.6 (String)
// HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion\1.6\JavaHome -> c:\jdk-1.6.0_05
/*
static public void findJDK() {
try {
String jcpo = System.getProperty("java.home");
String jv = System.getProperty("java.version");
System.out.println("home and version = " + jcpo + " and " + jv);
// the last parameter will be anything appearing on the right-hand
// side of regedit.
final String JDK_KEY = "SOFTWARE\\JavaSoft\\Java Development Kit";
String currentVersion =
Registry.getStringValue(REGISTRY_ROOT_KEY.LOCAL_MACHINE,
"SOFTWARE\\JavaSoft\\Java Development Kit", "CurrentVersion");
//"SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion", "");
JDK_KEY,
"CurrentVersion");
System.out.println("current version is " + currentVersion);
if (currentVersion != null) {
String javaHome =
Registry.getStringValue(REGISTRY_ROOT_KEY.LOCAL_MACHINE,
JDK_KEY + "\\" + currentVersion,
"JavaHome");
System.out.println("home is where the " + javaHome + " is");
if (javaHome != null) {
String jcp = System.getProperty("java.class.path");
String toolsJar = javaHome + "\\lib\\tools.jar";
System.setProperty("java.class.path",
jcp + File.pathSeparator + toolsJar);
System.out.println("set jcp to " +
System.getProperty("java.class.path"));
}
}
} catch (UnsupportedEncodingException uee) {
uee.printStackTrace();
}
}
*/
/**

2
build/build.xml
View File

@@ -685,7 +685,7 @@ http://www.gnu.org/software/tar/manual/html_section/transform.html
description="Create .zip files of windows version">
<property name="jre.file"
value="jre-tools-6u33-windows32.tgz" />
value="jre-tools-6u33-windows32.zip" />
<get src="http://processing.googlecode.com/files/${jre.file}"
dest="windows/jre.zip"

1
build/windows/launcher/config.xml
View File

@@ -22,6 +22,7 @@
<cp>lib/antlr.jar</cp>
<cp>lib/ant.jar</cp>
<cp>lib/ant-launcher.jar</cp>
<cp>%EXEDIR%/java/lib/tools.jar</cp>
</classPath>
<jre>
<path>java</path>