From b66ea5fcadf5ffeecfe9a6ba7e82ec6590be275a Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Mon, 1 Sep 2003 01:44:52 +0000
Subject: [PATCH] fixing last minute bug in the launcher

---
 build/windows/launcher/Makefile       |   1 +
 build/windows/launcher/launcher.cpp   |  17 ++++++++++-------
 build/windows/launcher/processing.exe | Bin 111773 -> 111773 bytes
 build/windows/make.sh                 |   1 -
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build/windows/launcher/Makefile b/build/windows/launcher/Makefile
index 41b67a25d..38540deca 100644
--- a/build/windows/launcher/Makefile
+++ b/build/windows/launcher/Makefile
@@ -3,6 +3,7 @@ OBJS = launcher.o launcher-rc.o
 
 processing.exe: $(OBJS)
 	$(LINK.cc) $(CXXFLAGS) -o $@ $(OBJS)
+	cp processing.exe ../work/
 
 $(OBJS): Makefile
 
diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp
index 02560d3dd..d7b19b2da 100644
--- a/build/windows/launcher/launcher.cpp
+++ b/build/windows/launcher/launcher.cpp
@@ -41,12 +41,12 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
   char *cp = (char *)malloc(8 * strlen(loaddir) + 200);
 
 
-  // if this code looks shitty, that's because it is.
-  // people put the durndest things in their CLASSPATH and
-  // QTJAVA environment variables. who knows where and
-  // when the quotes will show up. this is a guess at 
-  // dealing with the things, without spending a whole
-  // day to make it overly robust. [fry]
+  // if this code looks shitty, that's because it is. people are 
+  // likely to have the durndest things in their CLASSPATH and QTJAVA 
+  // environment variables. mostly because installers often mangle 
+  // them without the user knowing. so who knows where and when the
+  // quotes will show up. this is a guess at dealing with the things, 
+  // without spending a whole day to make it overly robust. [fry]
 
 
   // test to see if running with a java runtime nearby or not
@@ -57,7 +57,10 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
   FILE *fp = fopen(testpath, "rb");
   int local_jre_installed = (fp != NULL);
   //char *rt_jar = (fp == NULL) ? "" : "java\\lib\\rt.jar;";
-  fclose(fp); // argh! this was probably causing trouble
+  if (fp != NULL) fclose(fp); // argh! this was probably causing trouble
+
+  //MessageBox(NULL, local_jre_installed ? 
+  //         "local jre installed" : "couldn't find jre", "p5", MB_OK);
 
 
   //const char *envClasspath = getenv("CLASSPATH");
diff --git a/build/windows/launcher/processing.exe b/build/windows/launcher/processing.exe
index 9d0696cc36cf1e47fbeec64721e4fc616e753e74..773089711d6cbcab9c476f18e4232d5d6cf7cc68 100755
GIT binary patch
delta 481
zcmbRHl5Orwwh0|fMoT7k`7xCQZ@g8`8Pj>l@IdP&{;5Es({)A(N2iF&3w0+3hT|+M
z42%p6FRCHzZ$b_XoyTANb!1>@J;2|Z%EZ8Mj2*5h45~pGsOa#E8&E|bCNJmm3n>Kh
zx?Sf0%>$d^qQdgxA5eMo8;;fkrRE@OfZ#Y#cmYs1kmfiGp?N^!FD8SP3iPIaF+30*
z7aw~_fT6cUZL&Z2B6;us|Nl4tV6Jy<{=rluf@Bbbhy%k*(a8cl;-Y{5{r`_7^8h6C
za<UDN3geN<i9C6X4<=vW@n_85tib!^5VO&epvmkPRKc|V1y^Yx-yY-$24FyNvM?~r
z0EPz$fYkM05XF$+fh4~li~J2F`S)1le;~=rUz7#A!~P<sJrcmchq)vFq9{n+=JtzX
Fj{)KjjVu5F

delta 454
zcmbRHl5Orwwh0|fs~1e{@?(0UzwuT%XPDuo)&u-g4|TGrbcW7&q3guJaGXVjfsujX
zMI(g$O~`?v^Y{y9AP=arHJgcn;TStyQ4CarFi_Fq7xx??ioQ)=%jG9m4&-&a&H<VS
zHp4}Q<pql~14Hv0j@AREwv#2f6=Y@twKu;J=uQ1%cpy41KK76RLvI;F?;dpq28PN0
z+>7L0|NsBr{DZmPwfP5AjR?qTKyVyr6oZHZ!%P0j0zBfP-~avpk0kQ|B=dN(4UY=r
zzR8I^d5pIvU*Pd)Ox>)&`{WRFiIMzd_6w?DTK|HpG>~r(GLr%5XHFIdh8aMwg8)cf
z{{>MD`5j2|`?1L1K$3rtMg9kpy!=I3usiH8V%j4C3}=`-@-K>l)NO9RDE1ftyN!MO

diff --git a/build/windows/make.sh b/build/windows/make.sh
index f4c6b38cd..2b55fc2dd 100755
--- a/build/windows/make.sh
+++ b/build/windows/make.sh
@@ -58,7 +58,6 @@ else
   cd work/java/bin/
   chmod -R +x *.exe *.dll
   cd ../../..
-  pwd
   #chmod -R +x work/java/bin/*.exe
   #chmod +x work/java/bin/*.dll
   #chmod +x work/java/bin/client/*.dll