From afaa62a7bbca458960286eb276f423262a1495f7 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 30 Jan 2005 18:44:08 +0000 Subject: [PATCH] windows registry work --- processing/app/PdeBase.java | 32 ++++++++++++++++++++------------ processing/build/macosx/make.sh | 2 +- processing/build/macosx/run.sh | 11 +---------- processing/build/windows/dist.sh | 3 +++ processing/build/windows/make.sh | 4 +++- processing/build/windows/run.sh | 2 +- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index 8b2d49e17..f410a2844 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -35,6 +35,7 @@ import javax.swing.text.*; import javax.swing.undo.*; import com.apple.mrj.*; +import com.ice.jni.registry.*; /** @@ -185,8 +186,8 @@ public class PdeBase { } catch (FileNotFoundException e) { //e.printStackTrace(); //System.exit(1); - showError("Problem getting Library folder", - "Error getting the Processing library folder.", e); + showError("Problem getting data folder", + "Error getting the Processing data folder.", e); } } else if (platform == WINDOWS) { @@ -200,16 +201,23 @@ public class PdeBase { // Value Type: REG_SZ // Value Data: path - /* - RegistryKey topKey = Registry.getTopLevelKey("HKCU"); - String localKeyPath = - "\\Software\\Microsoft\\Windows\\CurrentVersion" + - "\\Explorer\\Shell Folders"; - RegistryKey localKey = topKey.openSubkey(topKey, localKeyPath); - String appDataPath = localKey.getStringValue("AppData"); - return new File(appDataPath, "Processing"); - */ - return null; + try { + //RegistryKey topKey = Registry.getTopLevelKey("HKCU"); + RegistryKey topKey = Registry.HKEY_CURRENT_USER; + + String localKeyPath = + "Software\\Microsoft\\Windows\\CurrentVersion" + + "\\Explorer\\Shell Folders"; + RegistryKey localKey = topKey.openSubKey(localKeyPath); + String appDataPath = localKey.getStringValue("AppData"); + System.out.println("app data path is " + appDataPath); + System.exit(0); + return new File(appDataPath, "Processing"); + } catch (Exception e) { + showError("Problem getting data folder", + "Error getting the Processing data folder.", e); + } + //return null; } else { // otherwise make a .processing directory int the user's home dir diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh index c43add80e..52ce2f546 100755 --- a/processing/build/macosx/make.sh +++ b/processing/build/macosx/make.sh @@ -98,7 +98,7 @@ fi echo Building the PDE... -../build/macosx/work/jikes +D -classpath ../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:$CLASSPATH -d ../build/macosx/work/classes *.java jeditsyntax/*.java preprocessor/*.java tools/*.java +../build/macosx/work/jikes +D -classpath ../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/registry.jar:$CLASSPATH -d ../build/macosx/work/classes *.java jeditsyntax/*.java preprocessor/*.java tools/*.java cd ../build/macosx/work/classes rm -f ../lib/pde.jar diff --git a/processing/build/macosx/run.sh b/processing/build/macosx/run.sh index 30f6caaae..3b8d872eb 100755 --- a/processing/build/macosx/run.sh +++ b/processing/build/macosx/run.sh @@ -1,16 +1,7 @@ #!/bin/sh -# -Dcom.apple.hwaccel=false -#cd work && java -Dcom.apple.awt.antialiasing=off PdeBase - -# old rxtx -#CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:../comm.jar - -# rxtx 2.1.6 -#CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar - # is qt java already included tho? -CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar +CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/registry.jar export CLASSPATH diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh index 1d8777573..eb01f63af 100755 --- a/processing/build/windows/dist.sh +++ b/processing/build/windows/dist.sh @@ -65,6 +65,9 @@ cp work/lib/core.jar processing/lib/ cp dist/jikes.exe processing/ chmod +x processing/jikes.exe +cp dist/ICE_JNIRegistry.dll processing/ +chmod +x processing/ICE_JNIRegistry.dll + # get platform-specific goodies from the dist dir cp launcher/processing.exe processing/ cp dist/run.bat processing/ diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh index f83ac2091..873150096 100755 --- a/processing/build/windows/make.sh +++ b/processing/build/windows/make.sh @@ -54,6 +54,8 @@ else cp dist/jikes.exe work/ #chmod +x work/jikes.exe + cp dist/ICE_JNIRegistry.dll work/ + # chmod +x the crew find work -name "*.dll" -exec chmod +x {} ';' find work -name "*.exe" -exec chmod +x {} ';' @@ -118,7 +120,7 @@ fi cd app -CLASSPATH="..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\\mrj.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar" +CLASSPATH="..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\\mrj.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\lib\\registry.jar;..\\build\\windows\\work\\java\\lib\\rt.jar" ../build/windows/work/jikes +D -classpath $CLASSPATH -d ..\\build\\windows\\work/classes *.java jeditsyntax/*.java preprocessor/*.java tools/*.java #/cygdrive/c/jdk-1.4.2_05/bin/javac.exe -classpath $CLASSPATH -d ..\\build\\windows\\work/classes *.java jeditsyntax/*.java preprocessor/*.java diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh index 08a980463..0988c1016 100644 --- a/processing/build/windows/run.sh +++ b/processing/build/windows/run.sh @@ -30,7 +30,7 @@ fi # includes jaws.jar #CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\" -CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;${QT_JAVA_PATH}\" +CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\registry.jar\;${QT_JAVA_PATH}\" export CLASSPATH #cd work && ./java/bin/java -Xint PdeBase