? 73169-launchers.diff
? 73169.diff
? windows/MakefileProject1
Index: unix/netbeans
===================================================================
RCS file: /cvs/ide/launcher/unix/netbeans,v
retrieving revision 1.28
diff -u -r1.28 netbeans
--- unix/netbeans	6 Dec 2005 02:35:19 -0000	1.28
+++ unix/netbeans	2 Mar 2006 09:30:43 -0000
@@ -54,7 +54,7 @@
 fi
 
 netbeans_clusters=""
-for i in nb5.0 ide6 enterprise2 harness profiler1 mobility7.2 extra ; do
+for i in nb6.0 ide8 enterprise4 harness profiler1 mobility7.2 extra ; do
     if [ -d "$progdir/../$i" ] ; then
         netbeans_clusters="$netbeans_clusters:$progdir/../$i"
     fi
@@ -65,7 +65,7 @@
 fi
 
 launchNbexec() {
-    nbexec="$progdir"/../platform6/lib/nbexec
+    nbexec="$progdir"/../platform7/lib/nbexec
     if [ "${founduserdir}" = "yes" ]; then
         sh "$nbexec" "$@"
     else
@@ -81,7 +81,7 @@
             --jdkhome "$netbeans_jdkhome" \
             -J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \
             -J-Xdock:name=NetBeans \
-            "-J-Xdock:icon=$progdir/../nb5.0/netbeans.icns" \
+            "-J-Xdock:icon=$progdir/../nb6.0/netbeans.icns" \
             --branding nb \
             --clusters "$netbeans_clusters" \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
Index: windows/nb.exe
===================================================================
RCS file: /cvs/ide/launcher/windows/nb.exe,v
retrieving revision 1.18
diff -u -r1.18 nb.exe
Binary files /tmp/cvsikaWqO and nb.exe differ
Index: windows/netbeans.cpp
===================================================================
RCS file: /cvs/ide/launcher/windows/netbeans.cpp,v
retrieving revision 1.19
diff -u -r1.19 netbeans.cpp
--- windows/netbeans.cpp	8 Sep 2005 19:46:58 -0000	1.19
+++ windows/netbeans.cpp	2 Mar 2006 09:30:44 -0000
@@ -31,9 +31,9 @@
 static char dirs[4098] = "", extradirs[4098];
 static char jdkswitch[MAX_PATH] = "";
 
-static char* defaultDirs[] = { "nb5.0",
-                               "ide6",
-                               "enterprise2",
+static char* defaultDirs[] = { "nb6.0",
+                               "ide8",
+                               "enterprise4",
                                "harness",
                                "profiler1",
                                "mobility7.2",
@@ -106,7 +106,7 @@
         strcat(strcat(dirs, ";"), extradirs);
     }
     
-    sprintf(nbexec, "%s\\platform6\\lib\\nbexec.exe", topdir);
+    sprintf(nbexec, "%s\\platform7\\lib\\nbexec.exe", topdir);
 
     sprintf(cmdline2, "\"%s\" %s -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense --branding nb --clusters \"%s\" --userdir \"%s\" %s %s",
             nbexec,
Index: windows/netbeans.exe
===================================================================
RCS file: /cvs/ide/launcher/windows/netbeans.exe,v
retrieving revision 1.18
diff -u -r1.18 netbeans.exe
Binary files /tmp/cvskkaWqO and netbeans.exe differ