launcher tweaks for rev 76

2026-06-16 04:26:26 +02:00 · 2005-02-07 14:22:33 +00:00
parent bba06a5515
commit 8f87ab9a65
9 changed files with 15 additions and 12 deletions
@@ -45,7 +45,7 @@ import com.ice.jni.registry.*;
 * files and images, etc) that comes from that.
 */
 public class PdeBase {
-  static final String VERSION = "0075 Alpha";
+  static final String VERSION = "0076 Alpha";

  static String openedAtStartup;

@@ -83,6 +83,8 @@ cp work/lib/core.jar processing/lib/
 #gunzip < dist/jikes.gz > processing/jikes
 cp dist/jikes processing/
 chmod a+x processing/jikes
+
+chmod a+x processing/Processing.app/Contents/MacOS/JavaApplicationStub
 
 #cp dist/lib/pde_macosx.properties processing/lib/

@@ -55,7 +55,7 @@
 		<key>JVMVersion</key>
 		<string>1.3+</string>
 		<key>ClassPath</key>
-			<string>$JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:lib/build</string>
+			<string>$JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:$JAVAROOT/registry.jar:lib/build</string>

 <!-- http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
 		<key>Properties</key>
@@ -71,13 +71,6 @@ chmod +x processing/ICE_JNIRegistry.dll
 # get platform-specific goodies from the dist dir
 cp launcher/processing.exe processing/
 cp dist/run.bat processing/
-#cp dist/lib/pde_windows.properties processing/lib/
-
-# get serial stuff from the bagel dir
-#cp ../../bagel/serial/comm.jar processing/lib/
-#cp ../../bagel/serial/javax.comm.properties processing/lib/
-#cp ../../bagel/serial/win32com.dll processing/
-#chmod +x processing/win32com.dll

 # convert notes.txt to windows LFs
 # the 2> is because the app is a little chatty
@@ -85,6 +78,9 @@ unix2dos processing/readme.txt 2> /dev/null
 unix2dos processing/revisions.txt 2> /dev/null
 unix2dos processing/lib/preferences.txt 2> /dev/null
 unix2dos processing/lib/keywords.txt 2> /dev/null
+rm processing/*.bak
+rm processing/lib/*.bak
+

 # remove boogers
 find processing -name "*~" -exec rm -f {} ';'
@@ -4,7 +4,7 @@ REM --- if you're running out of memory, change the 128m
 REM --- (which means 128 megabytes) to something higher. 

 set SAVEDCP=%CLASSPATH%
-set CLASSPATH=lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;lib\registry.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip

 start javaw -ms128m -mx128m PdeBase

@@ -6,7 +6,7 @@ REM --- (which means 128 megabytes) to something higher.
 set SAVEDCP=%CLASSPATH%
 set SAVEDPATH=%PATH%

-set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\registry.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
 set PATH=java\bin;%PATH%

 start javaw -ms128m -mx128m PdeBase
@@ -146,6 +146,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
          "%s\\lib\\core.jar;"
          "%s\\lib\\mrj.jar;"
          "%s\\lib\\oro.jar;"
+          "%s\\lib\\registry.jar;"
          "%s\\lib\\antlr.jar;"
          
          "%s",  // original CLASSPATH
@@ -163,7 +164,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
          local_jre_installed ? "java\\lib\\rt.jar;" : "", 
          qtjava_path,
          loaddir, loaddir, loaddir, loaddir, 
-          loaddir, loaddir, loaddir, 
+          loaddir, loaddir, loaddir, loaddir, 
          env_classpath);

  //MessageBox(NULL, cp,
@@ -1,4 +1,8 @@
 0076 pde
+X fix launcher issues on windows (didn't include registry.jar)
+X   also fix run.bat and run-expert.bat
+X fix launcher issues on mac os x
+X   fix Info.plist, and chmod +x JavaApplicationStub

 _ get an xml library in there
 _   nanoxml problems with manifest