Attachment #29091 for bug #73169

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 73169
Collapse All | Expand All




fi

netbeans_clusters=""
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

fi

launchNbexec() {
    nbexec="$progdir"/../platform7/lib/nbexec
    if [ "${founduserdir}" = "yes" ]; then
        sh "$nbexec" "$@"
    else

            --jdkhome "$netbeans_jdkhome" \
            -J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \
            -J-Xdock:name=NetBeans \
            "-J-Xdock:icon=$progdir/../nb6.0/netbeans.icns" \
            --branding nb \
            --clusters "$netbeans_clusters" \
            -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \




static char dirs[4098] = "", extradirs[4098];
static char jdkswitch[MAX_PATH] = "";

static char* defaultDirs[] = { "nb6.0",
                               "ide8",
                               "enterprise4",
                               "harness",
                               "profiler1",
                               "mobility7.2",

        strcat(strcat(dirs, ";"), extradirs);
    }
    
    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,

Return to bug 73169

Lines 54-60 Link Here

(-)unix/netbeans (-3 / +3 lines)
54	fi	54	fi
55		55
56	netbeans_clusters=""	56	netbeans_clusters=""
57	for i in nb5.0 ide6 enterprise2 harness profiler1 mobility7.2 extra ; do	57	for i in nb6.0 ide8 enterprise4 harness profiler1 mobility7.2 extra ; do
58	if [ -d "$progdir/../$i" ] ; then	58	if [ -d "$progdir/../$i" ] ; then
59	netbeans_clusters="$netbeans_clusters:$progdir/../$i"	59	netbeans_clusters="$netbeans_clusters:$progdir/../$i"
60	fi	60	fi
Lines 65-71 Link Here
65	fi	65	fi
66		66
67	launchNbexec() {	67	launchNbexec() {
68	nbexec="$progdir"/../platform6/lib/nbexec	68	nbexec="$progdir"/../platform7/lib/nbexec
69	if [ "${founduserdir}" = "yes" ]; then	69	if [ "${founduserdir}" = "yes" ]; then
70	sh "$nbexec" "$@"	70	sh "$nbexec" "$@"
71	else	71	else
Lines 81-87 Link Here
81	--jdkhome "$netbeans_jdkhome" \	81	--jdkhome "$netbeans_jdkhome" \
82	-J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \	82	-J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \
83	-J-Xdock:name=NetBeans \	83	-J-Xdock:name=NetBeans \
84	"-J-Xdock:icon=$progdir/../nb5.0/netbeans.icns" \	84	"-J-Xdock:icon=$progdir/../nb6.0/netbeans.icns" \
85	--branding nb \	85	--branding nb \
86	--clusters "$netbeans_clusters" \	86	--clusters "$netbeans_clusters" \
87	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \	87	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \

Lines 31-39 Link Here

(-)windows/netbeans.cpp (-4 / +4 lines)
31	static char dirs[4098] = "", extradirs[4098];	31	static char dirs[4098] = "", extradirs[4098];
32	static char jdkswitch[MAX_PATH] = "";	32	static char jdkswitch[MAX_PATH] = "";
33		33
34	static char* defaultDirs[] = { "nb5.0",	34	static char* defaultDirs[] = { "nb6.0",
35	"ide6",	35	"ide8",
36	"enterprise2",	36	"enterprise4",
37	"harness",	37	"harness",
38	"profiler1",	38	"profiler1",
39	"mobility7.2",	39	"mobility7.2",
Lines 106-112 Link Here
106	strcat(strcat(dirs, ";"), extradirs);	106	strcat(strcat(dirs, ";"), extradirs);
107	}	107	}
108		108
109	sprintf(nbexec, "%s\\platform6\\lib\\nbexec.exe", topdir);	109	sprintf(nbexec, "%s\\platform7\\lib\\nbexec.exe", topdir);
110		110
111	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",	111	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",
112	nbexec,	112	nbexec,