From f3ebf3520243e71e8952bbbbad2581cd6b389292 Mon Sep 17 00:00:00 2001 From: benfry Date: Mon, 7 Feb 2005 14:22:33 +0000 Subject: [PATCH] launcher tweaks for rev 76 --- processing/app/PdeBase.java | 2 +- processing/build/macosx/dist.sh | 2 ++ .../dist/Processing.app/Contents/Info.plist | 2 +- processing/build/windows/dist.sh | 10 +++------- processing/build/windows/dist/run-expert.bat | 2 +- processing/build/windows/dist/run.bat | 2 +- .../build/windows/launcher/launcher.cpp | 3 ++- .../build/windows/launcher/processing.exe | Bin 123829 -> 123829 bytes processing/todo.txt | 4 ++++ 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index 702155a22..d41f5f828 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -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; diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh index 629fb4764..465aabd65 100755 --- a/processing/build/macosx/dist.sh +++ b/processing/build/macosx/dist.sh @@ -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/ diff --git a/processing/build/macosx/dist/Processing.app/Contents/Info.plist b/processing/build/macosx/dist/Processing.app/Contents/Info.plist index 8c246cf06..9bcd74e6e 100755 --- a/processing/build/macosx/dist/Processing.app/Contents/Info.plist +++ b/processing/build/macosx/dist/Processing.app/Contents/Info.plist @@ -55,7 +55,7 @@ JVMVersion 1.3+ ClassPath - $JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:lib/build + $JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:$JAVAROOT/registry.jar:lib/build Properties diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh index eb01f63af..4805cbf15 100755 --- a/processing/build/windows/dist.sh +++ b/processing/build/windows/dist.sh @@ -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 {} ';' diff --git a/processing/build/windows/dist/run-expert.bat b/processing/build/windows/dist/run-expert.bat index 3ca23597e..c8f31f371 100755 --- a/processing/build/windows/dist/run-expert.bat +++ b/processing/build/windows/dist/run-expert.bat @@ -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 diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat index 7afef3148..3e85fb96c 100755 --- a/processing/build/windows/dist/run.bat +++ b/processing/build/windows/dist/run.bat @@ -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 diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp index 92dfc7bda..6896f55a1 100644 --- a/processing/build/windows/launcher/launcher.cpp +++ b/processing/build/windows/launcher/launcher.cpp @@ -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, diff --git a/processing/build/windows/launcher/processing.exe b/processing/build/windows/launcher/processing.exe index ddaaa46e2cc7f0447f58334da616518cc17a45d1..0b106d3a5c0832c90c9d7ef86efd1973ae81f87f 100755 GIT binary patch delta 2550 zcmZvee{54#6vyu=UDu9otE_;5Z7H)%Ma9lAjK&`ir7#4vDk>1jW?(wCLNkk^nPFI( z_)-@(ALh;oVJaGoza|?{#;?lQx-np5{1W_;iD(K=oj-yoYW<#9*44Q8N8jh3^L^iY z?s@mVZEG}rYc##~W#hm)(_MA1%rSIMtULWK`I}Z#)(A^xrVxRCW9%KR-guM2VAT#9 zC(iF0DMVkqjkKEUjNPm~n>L>gYu#zLlBQ*t#?y0Jq3PO;xfwzPFZkbx zoz)hYuAlaJx)8OA>ml{qM;?A~b^m%HMAYaM1nV%=s(Vw&ZBwVCO!p?$=!|IyvOs}A zYVD?}RHprH%3Jjo;(>najzus~=Qxe(ZO&L0V(l0Lf3*lvV{Gf-EL`lm^?Dc?d8RZT zwz9MePa=O7@)qGzggOratmth7!Z{p3DI9nS0d-$dB-oq%T10ivst@-1&8poQTZqKq z3O-^{JA4NN8#urdAutARv0Ma#k?i0)0}_6xORdtrN}su^$&5a`*Yjjh?q+2zl!1OT z#B0(Z4!P@t5q||6V-z#!Ghq~E?HW9;7dpim`wYw~BUE2-ycP3Uu~2jPV9I)?aSFRZ zx40J`6Nctni5~6zoW;Cd+zs5J2cYLyqQ4nEqFkPc8|v353eBw#c4i01YQLB#(^+kT z#X0j=B(ODk6&vv`Lhg>hMaQbU0~beRuT>EUTr^ZoD~iC@8a|gO&m0y-il}KWL|WAB zx|(lVwdIzvdVU_(QH}if;i5PeW!-a5>#^k1IqfIQjn>ou#N!FGz2~$^8F>hoWcbLY z?Z|M`0WF@fnT~6lNA@aZ`3k0v`>zc~)YcVa(FD(x=)oJm$K#>Jf2sY8TWkDeE(%Ab14w-zti8oCSUe{%o zQ?*u?=^#(jmQ2k!>gwO(@yq8Vj?0s;Xd~@~O}_hMvL($d?+-t!Hkk}}BHLf#w)K4~NzIFpn87oR<7A|n%oD3|N)j%mrKL|l z`ouEPmy8VhdgKqy@by>{bv10Ig*?bQLgVUOMmcU9&6(xH8D^iv3M;TT2QEhv{a=HK z1K;c+&FhHtBqKv}eY}m<-Z;a`QXx!Y>GEae{DKxIBZE@qa%2SEAXguvh4RiQrISx~ zZ>OhZI80NeFH9w}u?6&FlDs2$?Cz#eV&D#qa7XkG$)iZe_pfR6<4l}J|n)4}W)IQJw z5LL@J_fWAc*+;dqvW>iQdMjvIJ4o4&ACN`f7ex!s?5A34kjvZYN%>_P)g}0(+#iKk zRTQpwb%6e4iZHG00Nv3Ey1=xH$=?aO^#JG>rZAK50BC9#=trhzCT|y&7+hJ>wUegE z^Ia&(-i>O$I|#D%fX*Dk56B`PIZV6BBd_Q|U8}lLm(G`P%RE9?;Z}5no}#64!x1XR za*y(@Pg;7Z_-1cbViy=h>0_1UybXN#e_{fU!f(B`f&_a^wL#1 zjr#WB^TF5sxHZW4;YtztbuVUAJC4!BbDHtEU_--Az8 zt$g|zT=`EAZ_I@2lSuT*w~x^!YLpv~!>32K;+9jEtel_Ufd5&1@{i-R0P{R}0yUIL z^#s&5`5})6GdvOBFg@=>Nb-QshwHkUH%Mulho*a@I5a) u^3X|o5iOnl8J*0D47s9Dl}jor6qB z3;a?D8$Zd#2s$HCh#Ch2DFdOdum>>q1|g9Q2-?6TNOa-@>i4wUC}F>UexGyB_nyc7 z-P>(%OZ?uJ_?mV4>8k@XYS+)x%~)G|_DfpYu!hFO7;l<{@C@jKo3$yTs0hzL{q70gG^JppYJJ+t7Y{5^W;(qto=(v;PA0QrllSN5(UTFyK zkAr8bHYYaC{AH{VY9JU&z-yu{_<;6a>>@g(b;Rb9M@xvCKyPW8aStUtg?RO#`;%a= zwm9yQ8L!3*Q4@JyRxiE!%1dho)(at8^fp0Ay@RtkwtF3B^?9`E*skhrK@XfPP#{>V zHOJ+UQ@a_LRe5v6n3B$c9ijwrYwJTck*Vx>TqnS?sgkgi!C@8f#C^0 zWl=No4m&omgA2hi4%vbxII8{0)m1tK+}efsSruOyu*Z(ATnMV2tg3>_Ghl$Q>TmSx zMK!;>n3G~za1aaBW>^iZUBwnRIn@?C0cMpRs!sL?RJYB9Aq_rX)GXN?!bu3HSb!X3 zZ`X67-hmbt^HFis@$Sroo<9ew40)yw72?e-4j1yy-%{O{T%D*58m3UEHrZ%<;#UN4 zEO`nI-@)r>_1v&lO!M4`N#6J&9G)Ax^6V@>(wcmIk@gHek%iKOT8(k~_^>Yzy;s6_ z#g`SrAf`ioTE8)!`m~VoG1D)%LZL{4!+lzALK@tQ5=zOcwIw*{td^X(gDz>l#BRlz zuAp4V{ZO@E4XhlG!Ik?k_t$@gLf+T^QwLrTY;b3akYyVSUsySKqD@w^}B02>s$AVZ@cXpI&qqX>f0g3?h0hM1@x z>P8Vf7%k`=MKC)`uqk6=WL#^;-OUz92{mViC9L!mXY4D^pgkL?Os3V-PMtYkcJ8AL zdAXikBgX1oQAWaUa;2E@<3+-X8#u*Xw91Vk%u?M=8+F1UuYE@uB;->KFzrL8UH;xc z4LT)krb_=FGE6STjfmvP&(B}}#@p`-zNL3&Rpf7bkVY{^x~khtudy+vi&AUtdYSq? z&6`tz`^u{#^A+Pv_78a?yI%#589&{(H6O#{AMp%NpvdpOr;U&0;O__GB2FwVdAEo^ z&-@Y3u+%=}iJ?d3ns$0kKGQ<+R3JO{(K5VtHBz=L_0epZ>!Tcbb%b2|hkchvsJIb6 zAM1W$s&51>Jph_=0Ca)r8>WJTpob5F&N1y^TJi%Z^9RsbrtM6N4uLWbfle{iG36Zw zr5^@$Gi_yZ`a!9F&`G8(O!IyOjr$RFjOin$*-cbKm9nIn-jUA*s5ZjOq;iB@^4=yW zE*zm6`BM|jb4Nkn93i9pIY5Q-Y%_c?b7Xl7(#>oE{lj#GX;mxe*;ddXlb^}m270;; zbe-uSQ|U2K?lI6+CLfdQI4I{h=<;#2XP5VMqP|cGIMky6|b?%fin>ylUjv$V&C{d^Zk^UC!^J zS!9-*duS4@{XMi;cP&X;dTC}#i(dMd>f~pA z$m5p*yi%MaowIBk{#7ZEfA`U1)OqO?dT>hh6x2d~%T~XH9*F?WgHOZ0QR>(dm@>JK|-9#btJxeFjyn U^7Av{R*s%QE7pDgo}otL|1&8FGXMYp diff --git a/processing/todo.txt b/processing/todo.txt index 7054d2d94..0206dc08e 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -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