Attachment #15951 for bug #45467

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 45467
Collapse All | Expand All

Lines 262-268 Link Here

(-)core/arch/arch-core-launcher.xml (-2 / +2 lines)
262	<answer id="deploy-jar">	262	<answer id="deploy-jar">
263	No module JARs. Consists of various launcher scripts in the	263	No module JARs. Consists of various launcher scripts in the
264	<samp>launch/</samp> directory of the NetBeans installation. Bootstrap Java	264	<samp>launch/</samp> directory of the NetBeans installation. Bootstrap Java
265	code (part of core) resides in <samp>launch/boot.jar</samp>.	265	code (part of core) resides in <samp>lib/boot.jar</samp>.
266	</answer>	266	</answer>
267		267
268		268
Lines 336-342 Link Here
336	<api name="ClassPath-Composition" category="private" group="java.io.File" type="export">	336	<api name="ClassPath-Composition" category="private" group="java.io.File" type="export">
337	Bootstrap code creates a class loader to load the rest of the core from.	337	Bootstrap code creates a class loader to load the rest of the core from.
338	The bootstrap code is loaded from the Java application class loader,	338	The bootstrap code is loaded from the Java application class loader,
339	using the classpath <samp>launcher/*.jar</samp>.	339	using the classpath <samp>lib/*.jar</samp>.
340	</api>	340	</api>
341	<p/>	341	<p/>
342		342

Lines 154-161 Link Here

(-)core/launcher/os2/nbexec.cmd (-2 / +2 lines)
154	build_cp: procedure	154	build_cp: procedure
155	parse arg base	155	parse arg base
156	cp = ""	156	cp = ""
157	cp = cp \|\| search_jars(base\|\|"\launcher")	157	cp = cp \|\| search_jars(base\|\|"\lib")
158	cp = cp \|\| search_jars(base\|\|"\launcher\locale")	158	cp = cp \|\| search_jars(base\|\|"\lib\locale")
159	return cp	159	return cp
160		160
161	do_run_updater:	161	do_run_updater:

Lines 168-175 Link Here

(-)core/launcher/unix/nbexec (-2 / +2 lines)
168		168
169	build_cp() {	169	build_cp() {
170	base="$1"	170	base="$1"
171	append_jars_to_cp "${base}/launcher"	171	append_jars_to_cp "${base}/lib"
172	append_jars_to_cp "${base}/launcher/locale"	172	append_jars_to_cp "${base}/lib/locale"
173	}	173	}
174		174
175	do_run_updater() {	175	do_run_updater() {




    }

    pc = strrchr(buf, '\\');
    if (pc != NULL && 0 == stricmp("\\lib", pc))
        *pc = '\0';
    strcpy(plathome, buf);
    strcpy(clusters, buf);

{
    char buf[1024];

    strcat(strcpy(buf, plathome), "\\lib");
    addAllFilesToClassPath(buf, "*.jar");
    addAllFilesToClassPath(buf, "*.zip");

    strcat(strcpy(buf, plathome), "\\lib\\locale");
    addAllFilesToClassPath(buf, "*.jar");
    addAllFilesToClassPath(buf, "*.zip");


Lines 32-38 Link Here

(-)ide/launcher/os2/netbeans.cmd (-1 / +1 lines)
32	if (symbol("netbeans_j2sdkhome") = "VAR") then	32	if (symbol("netbeans_j2sdkhome") = "VAR") then
33	nb_args = "--jdkhome " \|\| netbeans_j2sdkhome \|\| " " \|\| nb_args	33	nb_args = "--jdkhome " \|\| netbeans_j2sdkhome \|\| " " \|\| nb_args
34		34
35	platdir = directory(progdir\|\|"\platform4\launcher")	35	platdir = directory(progdir\|\|"\platform4\lib")
36		36
37		37
38	nb_args='-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade --branding nb --clusters '\|\|netbeans_clusters\|\|' '\|\|nb_args	38	nb_args='-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade --branding nb --clusters '\|\|netbeans_clusters\|\|' '\|\|nb_args

Lines 53-59 Link Here

(-)ide/launcher/unix/netbeans (-1 / +1 lines)
53	Darwin*) osxappnameswitch="-J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans" ;;	53	Darwin*) osxappnameswitch="-J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans" ;;
54	esac	54	esac
55		55
56	eval "$progdir"/../platform4/launcher/nbexec \	56	eval "$progdir"/../platform4/lib/nbexec \
57	$jdkhomeswitch \	57	$jdkhomeswitch \
58	--branding nb \	58	--branding nb \
59	--clusters "$netbeans_clusters" \	59	--clusters "$netbeans_clusters" \

Lines 150-156 Link Here

(-)ide/launcher/windows/netbeans.cpp (-1 / +1 lines)
150	topdir, "\\nb4.0", topdir, "\\ide4" );	150	topdir, "\\nb4.0", topdir, "\\ide4" );
151	}	151	}
152	}	152	}
153	sprintf(nbexec, "%s\\platform4\\launcher\\nbexec.exe", topdir);	153	sprintf(nbexec, "%s\\platform4\\lib\\nbexec.exe", topdir);
154	sprintf(cmdline2, "\"%s\" %s -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade --branding nb --clusters \"%s\" --userdir \"%s\" %s %s",	154	sprintf(cmdline2, "\"%s\" %s -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade --branding nb --clusters \"%s\" --userdir \"%s\" %s %s",
155	nbexec,	155	nbexec,
156	jdkswitch,	156	jdkswitch,

Lines 1-8 Link Here

(-)nbbuild/directories.properties (-2 / +2 lines)
1	nb.beans.dir=beans	1	nb.beans.dir=beans
2	nb.bin.dir=launcher	2	nb.bin.dir=lib
3	nb.docs.dir=docs	3	nb.docs.dir=docs
4	nb.lib.dir=core	4	nb.lib.dir=core
5	nb.lib/ext.dir=launcher	5	nb.lib/ext.dir=lib
6	nb.lib/patches.dir=${nb.lib.dir}/patches	6	nb.lib/patches.dir=${nb.lib.dir}/patches
7	nb.modules.dir=modules	7	nb.modules.dir=modules
8	nb.modules/autoload.dir=${nb.modules.dir}/autoload	8	nb.modules/autoload.dir=${nb.modules.dir}/autoload




<a name="launcher"><H3>Generic Launcher</H3></a>

The <code>$nbplatform</code> cluster is guaranteed to contain 
<code>$nbplatform/lib/nbexec</code> executable that is supposed to be used
by final products.
<p>
The NetBeans IDE product should provide its own executable
<code>/usr/bin/netbeans</code> which will locate the 
<code>$nbplatform/lib/nbexec</CODE> 
(currently implemented here for 
<a href="http://www.netbeans.org/source/browse/core/nbide/launcher/unix/Attic/netbeans?showattic=1">unix</a>
and here for 

<code>--userdir $HOME/.myproductuserdir</code> to it.

<P>
The Web Product one would use <code>$nbplatform/lib/nbexec --clusters
/pathto/ide6:/pathto/web9</code> as the Web cluster is extension of the base
NetBeans IDE. 
    

    <LI><b>regular parameters</b> - these are end user oriented parameters
    printed when invoked with --help option:
    <pre>
Usage: bin/../platform4/lib/nbexec {options} arguments

General options:
  --help                show this help


The Linux case is the same as Solaris one, just instead of <code>/opt</code>
we install into <code>/usr/share</code> for everything. In case of
<code>$nbplatform/lib/nbexec</code> it should be in
<code>/usr/lib/netbeans/nbexec</code>.
Instead of <code>/etc/opt</code> we use directly <code>/etc</code>.
<P>

Lines 18-25 Link Here

(-)workspaceswitcher/app/build.xml (-2 / +2 lines)
18	<property name="tryme.args" value="" />	18	<property name="tryme.args" value="" />
19	<condition property="launcher.is.present" >	19	<condition property="launcher.is.present" >
20	<or>	20	<or>
21	<available file="build/platform4/launcher/nbexec" />	21	<available file="build/platform4/lib/nbexec" />
22	<available file="build/platform4/launcher/nbexec.exe" />	22	<available file="build/platform4/lib/nbexec.exe" />
23	</or>	23	</or>
24	</condition>	24	</condition>
25		25

Return to bug 45467

Lines 95-101 Link Here

(-)core/launcher/windows/nbexec.cpp (-3 / +3 lines)
95	}	95	}
96		96
97	pc = strrchr(buf, '\\');	97	pc = strrchr(buf, '\\');
98	if (pc != NULL && 0 == stricmp("\\launcher", pc))	98	if (pc != NULL && 0 == stricmp("\\lib", pc))
99	*pc = '\0';	99	*pc = '\0';
100	strcpy(plathome, buf);	100	strcpy(plathome, buf);
101	strcpy(clusters, buf);	101	strcpy(clusters, buf);
Lines 454-464 Link Here
454	{	454	{
455	char buf[1024];	455	char buf[1024];
456		456
457	strcat(strcpy(buf, plathome), "\\launcher");	457	strcat(strcpy(buf, plathome), "\\lib");
458	addAllFilesToClassPath(buf, "*.jar");	458	addAllFilesToClassPath(buf, "*.jar");
459	addAllFilesToClassPath(buf, "*.zip");	459	addAllFilesToClassPath(buf, "*.zip");
460		460
461	strcat(strcpy(buf, plathome), "\\launcher\\locale");	461	strcat(strcpy(buf, plathome), "\\lib\\locale");
462	addAllFilesToClassPath(buf, "*.jar");	462	addAllFilesToClassPath(buf, "*.jar");
463	addAllFilesToClassPath(buf, "*.zip");	463	addAllFilesToClassPath(buf, "*.zip");
464		464

Lines 236-247 Link Here

(-)openide/www/proposals/arch/installation.html (-5 / +5 lines)
236	<a name="launcher"><H3>Generic Launcher</H3></a>	236	<a name="launcher"><H3>Generic Launcher</H3></a>
237		237
238	The <code>$nbplatform</code> cluster is guaranteed to contain	238	The <code>$nbplatform</code> cluster is guaranteed to contain
239	<code>$nbplatform/launcher/nbexec</code> executable that is supposed to be used	239	<code>$nbplatform/lib/nbexec</code> executable that is supposed to be used
240	by final products.	240	by final products.
241	<p>	241	<p>
242	The NetBeans IDE product should provide its own executable	242	The NetBeans IDE product should provide its own executable
243	<code>/usr/bin/netbeans</code> which will locate the	243	<code>/usr/bin/netbeans</code> which will locate the
244	<code>$nbplatform/launcher/nbexec</CODE>	244	<code>$nbplatform/lib/nbexec</CODE>
245	(currently implemented here for	245	(currently implemented here for
246	<a href="http://www.netbeans.org/source/browse/core/nbide/launcher/unix/Attic/netbeans?showattic=1">unix</a>	246	<a href="http://www.netbeans.org/source/browse/core/nbide/launcher/unix/Attic/netbeans?showattic=1">unix</a>
247	and here for	247	and here for
Lines 253-259 Link Here
253	<code>--userdir $HOME/.myproductuserdir</code> to it.	253	<code>--userdir $HOME/.myproductuserdir</code> to it.
254		254
255	<P>	255	<P>
256	The Web Product one would use <code>$nbplatform/launcher/nbexec --clusters	256	The Web Product one would use <code>$nbplatform/lib/nbexec --clusters
257	/pathto/ide6:/pathto/web9</code> as the Web cluster is extension of the base	257	/pathto/ide6:/pathto/web9</code> as the Web cluster is extension of the base
258	NetBeans IDE.	258	NetBeans IDE.
259		259
Lines 273-279 Link Here
273	<LI><b>regular parameters</b> - these are end user oriented parameters	273	<LI><b>regular parameters</b> - these are end user oriented parameters
274	printed when invoked with --help option:	274	printed when invoked with --help option:
275	<pre>	275	<pre>
276	Usage: bin/../platform4/launcher/nbexec {options} arguments	276	Usage: bin/../platform4/lib/nbexec {options} arguments
277		277
278	General options:	278	General options:
279	--help show this help	279	--help show this help
Lines 750-756 Link Here
750		750
751	The Linux case is the same as Solaris one, just instead of <code>/opt</code>	751	The Linux case is the same as Solaris one, just instead of <code>/opt</code>
752	we install into <code>/usr/share</code> for everything. In case of	752	we install into <code>/usr/share</code> for everything. In case of
753	<code>$nbplatform/launcher/nbexec</code> it should be in	753	<code>$nbplatform/lib/nbexec</code> it should be in
754	<code>/usr/lib/netbeans/nbexec</code>.	754	<code>/usr/lib/netbeans/nbexec</code>.
755	Instead of <code>/etc/opt</code> we use directly <code>/etc</code>.	755	Instead of <code>/etc/opt</code> we use directly <code>/etc</code>.
756	<P>	756	<P>