Attachment #14057 for bug #32080

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




    <patternset id="core.files">
      <include name="${nb.lib.dir}/core.jar"/>
      <include name="${nb.lib.dir}/ide.ks"/>
      <include name="${nb.bin.dir}/boot.jar"/>
      <include name="${nb.bin.dir}/security.policy"/>
      <include name="${nb.bin.dir}/ide.cfg"/>
      <include name="${nb.bin.dir}/ide.policy"/>
      <include name="${nb.bin.dir}/macosx_launcher.dmg"/>
      <include name="${nb.bin.dir}/runide.exe"/>
      <include name="${nb.bin.dir}/runide.sh"/>

      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
      <pathelement location="${openide/explorer.dir}/${nb.lib.dir}/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- XXX remove soon -->
      <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
      <pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
    </path>
  </target>



  <!-- XXX move to bootstrap/build.xml -->  
  <target name="boot" depends="init">
		<property name="module.name" value="core/bootstrap" />
    
    <javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" />
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/boot.jar"
            basedir="bootstrap/src"
            excludesfile="../nbbuild/standard-jar-excludes.txt"
	    compress="false">

  </target>

  <target name="release" depends="init">
    <copy file="release/bin/runide.sh" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/nbexec" />
    <copy file="release/bin/ide.policy" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/security.policy" />
    <copy file="release/lib/ide.ks" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/keystore.ks" />
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" includeEmptyDirs="false">
      <fileset dir="release/bin" excludesfile="../nbbuild/standard-jar-excludes.txt">
        <!-- These do not currently work anyway: -->
        <exclude name="unsupported/nbscript*"/>
        <exclude name="**/runide.sh" />
        <exclude name="**/ide.policy" />
        <exclude name="**/ide.ks" />
      </fileset>
    </copy>
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}" includeEmptyDirs="false">

Lines 216-223 Link Here

(-)core/bootstrap/src/org/netbeans/Main.java (-3 / +3 lines)
216		216
217	private static void build_cp(File base, Collection toAdd, boolean localeOnly) {	217	private static void build_cp(File base, Collection toAdd, boolean localeOnly) {
218	if (!localeOnly) {	218	if (!localeOnly) {
219	append_jars_to_cp (new File (base, "lib/patches"), toAdd);	219	append_jars_to_cp (new File (base, "boot/patches"), toAdd);
220	append_jars_to_cp (new File (base, "lib"), toAdd);	220	append_jars_to_cp (new File (base, "boot"), toAdd);
221	}	221	}
222	// XXX a minor optimization: exclude any unused locale JARs	222	// XXX a minor optimization: exclude any unused locale JARs
223	// For example, lib/locale/ might contain:	223	// For example, lib/locale/ might contain:
Lines 231-236 Link Here
231	// [etc.]	231	// [etc.]
232	// Only some of these will apply to the current session, based on the	232	// Only some of these will apply to the current session, based on the
233	// current values of Locale.default and NbBundle.branding.	233	// current values of Locale.default and NbBundle.branding.
234	append_jars_to_cp (new File (base, "lib/locale"), toAdd);	234	append_jars_to_cp (new File (base, "boot/locale"), toAdd);
235	}	235	}
236	}	236	}

Lines 27-33 Link Here

(-)core/execution/build.xml (-1 / +1 lines)
27	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>	27	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
28	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>	28	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>	29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	30	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
31	</path>	31	</path>
32	</target>	32	</target>
33		33

Lines 19-25 Link Here

(-)core/ide/build.xml (-1 / +1 lines)
19	<target name="init" depends="default.init">	19	<target name="init" depends="default.init">
20	<patternset id="core/ide.files">	20	<patternset id="core/ide.files">
21	<include name="${nb.modules.dir}/core-ide.jar"/>	21	<include name="${nb.modules.dir}/core-ide.jar"/>
22	<include name="${nb.bin.dir}/icons/*"/>	22	<!-- <include name="${nb.bin.dir}/icons/*"/> -->
23	<include name="${nb.docs.dir}/NetBeansWeb.html"/>	23	<include name="${nb.docs.dir}/NetBeansWeb.html"/>
24	<include name="README.html"/>	24	<include name="README.html"/>
25	<include name="netbeans.css"/>	25	<include name="netbeans.css"/>




#                 Sun Public License Notice
# 
# The contents of this file are subject to the Sun Public License
# Version 1.0 (the "License"). You may not use this file except in
# compliance with the License. A copy of the License is available at
# http://www.sun.com/
# 
# The Original Code is NetBeans. The Initial Developer of the Original
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
# Microsystems, Inc. All Rights Reserved.

# For use from runide.sh, do not run directly.

# Default userdir, can be overridden by -userdir switch. This value should be
# changed for each new version so that the user can switch between versions of
# the IDE without risking loss of settings, e.g. ~/.netbeans/dev for dev builds,
# ~/.netbeans/3.4 for NB 3.4, etc.
#
# Note: string after last slash in value of userdir variable is used
#       by installer build to identify release of NetBeans and to set
#       userdir by "OS native" NetBeans installer.
#       Please change userdir only with advance notification to NB
#       buildmasters.

userdir=${HOME}/.netbeans/dev

# Default JDK home, can be overridden by the -jdkhome switch, or the
# value of the $NB_JDK_HOME environment variable. If both are present
# the -jdkhome switch has precedence.
#
# If desired, this is a good place for an installer program to record
# the JDK that was found at installation time. For example, on Linux
# systems /etc/profile.d/netbeans.sh could: export NB_JDK_HOME=/usr/java
#
# Note: setting this variable will cause NetBeans to ignore the value of
# the ${JDK_HOME} and ${JAVA_PATH} environment variables.

jdkhome="$NB_JDK_HOME"

Removed Link Here

(-)core/release/bin/ide.cfg (-3 lines)
1	-J-Xms24m -J-Xmx96m
2	-J-Dnetbeans.logger.console=true
3	-J-ea




# Normally, editing this script should not be required.
# -----------------------------------------------------

# use $JDK_HOME or the -jdkhome switch, do not edit this here
# (see below for info on .runide_defaults.sh)
jdkhome=""

# append on command line or ide.cfg, with -J prefix on each


oldpwd=`pwd` ; cd "${idehome}"; idehome=`pwd`; cd "${oldpwd}"; unset oldpwd

# calculate branding to brand userdir with
defaults="$idehome/bin/.runide_defaults.sh"
if [ -r "$idehome/lib/branding" ]; then
    branding=`cat "$idehome/lib/branding"`
    if [ -r "$idehome/bin/.runide_defaults_$branding.sh" ]; then
        defaults="$idehome/bin/.runide_defaults_$branding.sh"
    fi
fi
# This script should set the var userdir at the least:
# (another likely option would be $jdkhome, see #18628)
. "$defaults"

jargs=${jreflags}
jargs="$jargs -Dnetbeans.home=\"$idehome\""
jargs="$jargs -Djava.security.policy=\"$idehome/launcher/security.policy\""

args=""


    jdkhome="$JAVA_PATH"
fi

if [ ! -z "$NB_PATH" ]; then
    nbpath="$NB_PATH"
else 
    nbpath="$progdir/../.."
fi

# default value for dirs argument, starts only platform
nbdirs=platform*

#
# parse arguments
#

                prefixcp=$prefixcp$1;
            fi
            ;;
        --dirs)
            shift;
            if [ $# -gt 0 ] ; then
                nbdirs="$1"
            fi
            ;;
        -J*) jopt=`expr "X-$1" : 'X--J\(.*\)'`; jargs="$jargs \"$jopt\"";;
        *) args="$args \"$1\"" ;;
    esac

done
} # parse_args()

# Process any system config
# Note that there is no quoting scheme for these files.
if [ -r "${NB_CONFIG_SYSTEM}" ]; then
    parse_args `cat "${NB_CONFIG_SYSTEM}"`
fi

# Process user config
# Note that there is no quoting scheme for these files.
if [ -r "${NB_CONFIG_USER}" ]; then
    parse_args `cat "${NB_CONFIG_USER}"`
elif [ -r "${progdir}/ide.cfg" ]; then
    parse_args `cat "${progdir}"/ide.cfg`
# else leave as is
fi

if [ -f /usr/j2se/opt/javahelp/lib/jhall.jar ]; then

# Process arguments given on the command line.
parse_args "$@"


resolvedirs() {
    # iterate thru $2 == $nbdirs to find them
    SEP=""
    echo $nbdirs | tr ':' '\n' | while read CLUSTER; do
        # iterate thru $1 == $nbpath
        FOUND=`echo $nbpath | tr ':' '\n' | while read DIR; do
            if [ -d "$CLUSTER" ]; then
                echo $CLUSTER
            else 
                ls -d "$DIR"/$CLUSTER 2>/dev/null
            fi
        done | sort -u -r` 

        if [ -z "$FOUND" ]; then
            echo Cannot found directory \"$CLUSTER\" in search locations \"$nbpath\"
            exit 2
        fi

        echo -n "$SEP"
        echo -n "$FOUND"
        SEP=":"
    done
} # end of resolvedirs

dirsresult=`resolvedirs \"$nbpath\" \"$nbdirs\"`
exitcode=$?
if [ "0" != "$exitcode" ]; then
    echo $dirsresult
    exit 5
fi

jargs="$jargs -Dnetbeans.dirs=\"$dirsresult\""


#
# check JDK
#

# check userdir
#

if [ -z "$userdir" ]; then
    if [ -z "$NB_USER_DIR" ]; then
        echo Need to specify user dir using env variable NB_USER_DIR or command line option --userdir
        exit 7
    fi
    userdir="$NB_USER_DIR"
fi

args="--userdir \"${userdir}\" $args"

#
# increase file descriptor's limit, on Solaris it's set to 64, too small for
# fastjavac


build_cp() {
    base="$1"
    append_jars_to_cp "${base}/launcher"
    append_jars_to_cp "${base}/launcher/locale"
}

do_run_updater() {

    
    build_cp "${idehome}"
    
    if [ -f "${idehome}/boot/updater.jar" ] ; then
        updatercp="${idehome}/boot/updater.jar"
    fi

    # JDK tools

Lines 163-170 Link Here

(-)core/src/org/netbeans/core/Bundle.properties (-2 / +2 lines)
163	NTF_ExceptionalException=\	163	NTF_ExceptionalException=\
164	A {0} exception has occurred.\n\	164	A {0} exception has occurred.\n\
165	Please report this at http://www.netbeans.org/issues.html,\n\	165	Please report this at http://www.netbeans.org/issues.html,\n\
166	including a copy of your ide.log file as an attachment.\n\	166	including a copy of your messages.log file as an attachment.\n\
167	The ide.log file is located in your {1} folder.	167	The messages.log file is located in your {1} folder.
168	NTF_ExceptionalExceptionTitle=Unexpected Exception	168	NTF_ExceptionalExceptionTitle=Unexpected Exception
169	# {0} - class name of exception	169	# {0} - class name of exception
170	NTF_ExceptionWarning=\	170	NTF_ExceptionWarning=\

Lines 178-184 Link Here

(-)core/src/org/netbeans/core/CLIOptions.java (-1 / +1 lines)
178		178
179	if (!NonGui.noLogging) {	179	if (!NonGui.noLogging) {
180	try {	180	try {
181	NonGui.logger = new TopLogging(NonGui.getSystemDir());	181	NonGui.logger = new TopLogging(NonGui.getLogDir());
182	} catch (IOException e) {	182	} catch (IOException e) {
183	System.err.println("Cannot create log file. Logging disabled."); // NOI18N	183	System.err.println("Cannot create log file. Logging disabled."); // NOI18N
184	e.printStackTrace();	184	e.printStackTrace();

Lines 155-161 Link Here

(-)core/src/org/netbeans/core/LookupCache.java (-2 / +2 lines)
155	private static File cacheFile() {	155	private static File cacheFile() {
156	String ud = System.getProperty("netbeans.user");	156	String ud = System.getProperty("netbeans.user");
157	if (ud != null) {	157	if (ud != null) {
158	File cachedir = new File(ud, "cache"); // NOI18N	158	File cachedir = new File(new File (ud, "var"), "cache"); // NOI18N
159	cachedir.mkdirs();	159	cachedir.mkdirs();
160	return new File(cachedir, "folder-lookup.ser"); // NOI18N	160	return new File(cachedir, "folder-lookup.ser"); // NOI18N
161	} else {	161	} else {
Lines 170-176 Link Here
170	private static File stampFile() {	170	private static File stampFile() {
171	String ud = System.getProperty("netbeans.user");	171	String ud = System.getProperty("netbeans.user");
172	if (ud != null) {	172	if (ud != null) {
173	File cachedir = new File(ud, "cache"); // NOI18N	173	File cachedir = new File(new File (ud, "var"), "cache"); // NOI18N
174	cachedir.mkdirs();	174	cachedir.mkdirs();
175	return new File(cachedir, "lookup-stamp.txt"); // NOI18N	175	return new File(cachedir, "lookup-stamp.txt"); // NOI18N
176	} else {	176	} else {

Lines 28-34 Link Here

(-)core/src/org/netbeans/core/NbRepository.java (-1 / +1 lines)
28	*/	28	*/
29	public final class NbRepository extends Repository {	29	public final class NbRepository extends Repository {
30	/** name of system folder to be located in the USER_DIR and HOME_DIR */	30	/** name of system folder to be located in the USER_DIR and HOME_DIR */
31	static final String SYSTEM_FOLDER = "system"; // NOI18N	31	static final String SYSTEM_FOLDER = "config"; // NOI18N
32		32
33	/**	33	/**
34	* Create a repository based on the normal system file system.	34	* Create a repository based on the normal system file system.

Lines 150-155 Link Here

(-)core/src/org/netbeans/core/NonGui.java (+6 lines)
150	}	150	}
151	}	151	}
152		152
		153	/** Directory to place logs into logging.
		154	*/
		155	protected static String getLogDir () {
		156	return new File (new File (getUserDir (), "var"), "log").toString ();
		157	}
		158
153	/** System directory getter.	159	/** System directory getter.
154	*/	160	*/
155	protected static String getSystemDir () {	161	protected static String getSystemDir () {

Lines 314-320 Link Here

(-)core/src/org/netbeans/core/NotifyException.java (-1 / +1 lines)
314	curBundle.getString("NTF_ExceptionalException"),	314	curBundle.getString("NTF_ExceptionalException"),
315	new Object[] {	315	new Object[] {
316	current.getClassName (),	316	current.getClassName (),
317	new File (System.getProperty("netbeans.user"), "system") // NOI18N	317	NonGui.getLogDir ()
318	}	318	}
319	)	319	)
320	);	320	);




public class TopLogging
{
    /** The name of the log file */
    public static final String LOG_FILE_NAME = "messages.log"; // NOI18N

    private static boolean disabledConsole = true;


    /** Creates a new TopLogging - redirects the System.err to a log file.
     * @param logDir A directory for the log file
     */
    TopLogging (String logDir) throws IOException  {
        topLogging = this;
        
        File logFileDir = new File (logDir);

    private static TopLogging getDefault() {
        if (topLogging == null) {
            try {
                new TopLogging(NonGui.getLogDir());
            } catch (IOException x) {
                org.openide.ErrorManager.getDefault().notify(x);
            }

Lines 805-811 Link Here

(-)core/src/org/netbeans/core/modules/ModuleList.java (-1 / +1 lines)
805	}	805	}
806	File instmod = new File(dir.folder, "installedModules.xml"); // NOI18N	806	File instmod = new File(dir.folder, "installedModules.xml"); // NOI18N
807	if (instmod.isFile()) {	807	if (instmod.isFile()) {
808	File sysmod = new File(new File(dir.folder.getParentFile(), "system"), "Modules"); // NOI18N	808	File sysmod = new File(new File(dir.folder.getParentFile(), "config"), "Modules"); // NOI18N
809	sysmod.mkdirs();	809	sysmod.mkdirs();
810	// Whether we will try to write to the proper directory, or just	810	// Whether we will try to write to the proper directory, or just
811	// write to the system file system (= user dir) instead.	811	// write to the system file system (= user dir) instead.

Lines 1168-1174 Link Here

(-)core/src/org/netbeans/core/modules/NbInstaller.java (-1 / +1 lines)
1168	if (usingManifestCache) {	1168	if (usingManifestCache) {
1169	String userdir = System.getProperty("netbeans.user");	1169	String userdir = System.getProperty("netbeans.user");
1170	if (userdir != null) {	1170	if (userdir != null) {
1171	manifestCacheFile = new File(new File(new File(userdir), "cache"), "all-manifests.dat"); // NOI18N	1171	manifestCacheFile = new File(new File(new File(new File (userdir), "var"), "cache"), "all-manifests.dat"); // NOI18N
1172	Util.err.log("Using manifest cache in " + manifestCacheFile);	1172	Util.err.log("Using manifest cache in " + manifestCacheFile);
1173	} else {	1173	} else {
1174	// Some special startup mode, e.g. with Plain.	1174	// Some special startup mode, e.g. with Plain.

Lines 366-371 Link Here

(-)core/src/org/netbeans/core/projects/SystemFileSystem.java (-1 / +4 lines)
366		366
367	if (userDir != null) {	367	if (userDir != null) {
368	// only one file system	368	// only one file system
		369	if (!userDir.exists ()) {
		370	userDir.mkdirs ();
		371	}
369	LocalFileSystem l = new LocalFileSystemEx ();	372	LocalFileSystem l = new LocalFileSystemEx ();
370	l.setRootDirectory (userDir);	373	l.setRootDirectory (userDir);
371	user = l;	374	user = l;
Lines 391-397 Link Here
391	FileSystem[] arr = new FileSystem[home == null ? 2 : 3];	394	FileSystem[] arr = new FileSystem[home == null ? 2 : 3];
392	arr[0] = new ModuleLayeredFileSystem(user, new FileSystem[0], null);	395	arr[0] = new ModuleLayeredFileSystem(user, new FileSystem[0], null);
393	if (home != null) {	396	if (home != null) {
394	File cachedir = new File(userDir.getParentFile(), "cache"); // NOI18N	397	File cachedir = new File(new File (userDir.getParentFile(), "var"), "cache"); // NOI18N
395	arr[1] = new ModuleLayeredFileSystem(home, extras, cachedir);	398	arr[1] = new ModuleLayeredFileSystem(home, extras, cachedir);
396	}	399	}
397	FixedFileSystem.deflt = new FixedFileSystem	400	FixedFileSystem.deflt = new FixedFileSystem

Lines 67-72 Link Here

(-)editor/build.xml (+1 lines)
67	<target name="release" depends="init">	67	<target name="release" depends="init">
68	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">	68	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
69	<fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>	69	<fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
		70	<mapper type="glob" from="system/" to="${nb.system.dir}/" />
70	</copy>	71	</copy>
71	</target>	72	</target>
72		73

Lines 71-76 Link Here

(-)nbbuild/build.properties (+2 lines)
71	core/windows	71	core/windows
72	config.modules.platform=autoupdate, \	72	config.modules.platform=autoupdate, \
73	core/settings, \	73	core/settings, \
		74	core/execution, \
		75	openide/execution, \
74	core/javahelp, \	76	core/javahelp, \
75	text	77	text
76		78





    <!-- see issue #35744 http://www.netbeans.org/issues/show_bug.cgi?id=35744 -->
    <delete file="NetBeans-${buildnum}.zip"/>

    <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
        
    <!-- generate the generic launcher -->
    <mkdir dir="${netbeans.dest.dir}/bin" />
    <echo file="${netbeans.dest.dir}/bin/netbeans">#!/bin/sh
#
# resolve symlinks
#
PRG=$0

while [ -h "$PRG" ]; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
	PRG="$link"
    else
	PRG="`dirname "$PRG"`/$link"
    fi
done

progdir=`dirname "$PRG"`
export NB_USER_DIR=$HOME/.netbeans/dev
export NB_CONFIG_SYSTEM="$progdir"/../etc/netbeans.conf
export NB_CONFIG_USER=$NB_USER_DIR/config
exec /bin/sh $progdir/../${nb.cluster.platform.dir}/${nb.bin.dir}/nbexec --dirs ${nb.cluster.platform.dir}:${nb.cluster.ide.dir}:${nb.cluster.nb.dir} "$@"
</echo>
    <!-- generate nb config -->
    <mkdir dir="${netbeans.dest.dir}/etc" />
    <echo file="${netbeans.dest.dir}/etc/netbeans.conf">-J-Xms24m -J-Xmx96m
-J-Dnetbeans.logger.console=true
-J-ea
</echo>

    <!-- package the zip file -->
    <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
      <zipfileset file="${netbeans.dest}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
      <zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
      <zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/*.com" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
      <zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/*.exe" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
      <zipfileset dir="${netbeans.dest}" prefix="${netbeans.dest}"/>
    </zip>
    <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).

      <arg line="${sanitystart.args}"/>
    </exec>
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
      <arg value="${netbeans.dest}/bin/netbeans"/>
      <arg value="-jdkhome"/>
      <arg file="${jdkhome}"/>
      <arg value="-userdir"/>

    <echo>Finished starting the IDE, pay attention to any reported errors.</echo>
  </target>

  <target name="check-for-build"  >
    <available property="have-build" file="${openide.dir}/${nb.lib.dir}/openide.jar"/>
  </target>
  <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
    <ant dir="." target="build-nozip"/>

      <arg line="${tryme.args}"/>
    </exec>
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
      <arg value="${netbeans.dest}/bin/netbeans"/>
      <arg value="-jdkhome"/>
      <arg file="${jdkhome}"/>
      <arg value="-userdir"/>

      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
    </exec>
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
      <arg value="${netbeans.dest}/bin/netbeans"/>
      <arg value="-jdkhome"/>
      <arg file="${jdkhome}"/>
      <arg value="-userdir"/>




        vcsgeneric/profiles/pvcs, \
        vcsgeneric/profiles/vss

clusters.list=nb.cluster.platform,nb.cluster.ide,nb.cluster.nb

nb.cluster.platform=core, \
        openide, \
        openide/compiler, \
        openide/util, \
        openide/actions, \
        openide/awt, \

        openide/compat, \
        openide/text, \
        openide/windows, \
        openide/deprecated, \
        openide/loaders, \
        openide/io, \
        openide/execution, \
        autoupdate, \
        core/term, \
        core/output, \
        core/settings, \
        core/deprecated, \
        java/srcmodel, \
        libs/regexp, \
        debuggercore/oldapi, \
        core/javahelp, \
        libs/regexp, \
        core/execution, \
        core/ui, \
        core/windows
        core/ide

nb.cluster.platform.dir=platform4

nb.cluster.ide=classfile, \
        clazz, \
        editor, \
        html, \
        image, \
        openide/deprecated, \
        openide/compiler, \
        core/deprecated, \
        core/ide, \
        core/compiler, \
        java/srcmodel, \
        debuggercore/oldapi, \
        java/api, \
        java, \
        junit, \

        text, \
        utilities, \
        utilities/group,\
        autoupdate, \
        autoupdate/updatecenters, \
        apisupport, \
        apisupport/ant, \
        apisupport/apidocs, \

        schema2beans/dev, \
        tomcatint/tomcat5, \
        tomcatint/tomcat5/bundled, \
        ui/welcome, \
        usersguide, \
        vcscore, \
        vcscvs/compat, \

        ${local.config.vcsprofiles}, \
        ${local.config.tasklist4barracuda}

nb.cluster.ide.dir=ide4

# special cluster for NetBeans only extensions
nb.cluster.nb=ui/welcome,\
        autoupdate/updatecenters
nb.cluster.nb.dir=nb4.0


nb.cluster.test=xtest/plugins_src/deprecated, \
        xtest/plugins_src/ide

Lines 8-14 Link Here

(-)nbbuild/default-properties.xml (-1 / +1 lines)
8	<property name="nbm_alias" value="nb_ide"/>	8	<property name="nbm_alias" value="nb_ide"/>
9		9
10	<property name="clusters.list.file" location="${nb_all}/nbbuild/cluster.properties"/>	10	<property name="clusters.list.file" location="${nb_all}/nbbuild/cluster.properties"/>
11	<property name="netbeans.dest.dir" location="${nb_all}/nbbuild"/>	11	<property name="netbeans.dest.dir" location="${nb_all}/nbbuild/netbeans"/>
12	<property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>	12	<property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
13	<property name="directoryList.file" location="${nb_all}/nbbuild/directories.properties"/>	13	<property name="directoryList.file" location="${nb_all}/nbbuild/directories.properties"/>
14		14

Lines 1-7 Link Here

(-)nbbuild/directories.properties (-3 / +3 lines)
1	nb.beans.dir=beans	1	nb.beans.dir=beans
2	nb.bin.dir=bin	2	nb.bin.dir=launcher
3	nb.docs.dir=docs	3	nb.docs.dir=docs
4	nb.lib.dir=lib	4	nb.lib.dir=boot
5	nb.lib/patches.dir=${nb.lib.dir}/patches	5	nb.lib/patches.dir=${nb.lib.dir}/patches
6	nb.modules.dir=modules	6	nb.modules.dir=modules
7	nb.modules/autoload.dir=${nb.modules.dir}/autoload	7	nb.modules/autoload.dir=${nb.modules.dir}/autoload
Lines 11-15 Link Here
11	nb.modules/eager.dir=${nb.modules.dir}/eager	11	nb.modules/eager.dir=${nb.modules.dir}/eager
12	nb.modules/patches.dir=${nb.modules.dir}/patches	12	nb.modules/patches.dir=${nb.modules.dir}/patches
13	nb.sources.dir=sources	13	nb.sources.dir=sources
14	nb.system.dir=system	14	nb.system.dir=config
15	nb.update_tracking.dir=update_tracking	15	nb.update_tracking.dir=update_tracking

Lines 47-53 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java (-1 / +1 lines)
47	log("Basedir: " + basedir + " rootdir: " + rootdir, Project.MSG_VERBOSE);	47	log("Basedir: " + basedir + " rootdir: " + rootdir, Project.MSG_VERBOSE);
48	if (!basedir.startsWith(rootdir)) throw new BuildException( "This module in on different path than the root dir",this.getLocation());	48	if (!basedir.startsWith(rootdir)) throw new BuildException( "This module in on different path than the root dir",this.getLocation());
49	String modulename = basedir.substring(rootdir.length() + 1).replace(File.separatorChar,'/');	49	String modulename = basedir.substring(rootdir.length() + 1).replace(File.separatorChar,'/');
50	this.getProject().setProperty( name, modulename);	50	this.getProject().setNewProperty( name, modulename);
51	}	51	}
52	catch (IOException ex) {	52	catch (IOException ex) {
53	throw new BuildException("Root dir or module's base dir wasn't recognized", ex, this.getLocation());	53	throw new BuildException("Root dir or module's base dir wasn't recognized", ex, this.getLocation());

Lines 154-160 Link Here

(-)openide/build.xml (-1 / +4 lines)
154	work in loaders_32143 branch. Shall provide enough time to module	154	work in loaders_32143 branch. Shall provide enough time to module
155	writers using the old code to update to new replacements.	155	writers using the old code to update to new replacements.
156	-->	156	-->
157	<ant antfile="build.xml" target="jars" dir="loaders" />	157	<ant antfile="build.xml" target="jars" dir="loaders" >
		158	<property name="module.name" value="openide/loaders" />
		159	</ant>
158	<ant antfile="build.xml" target="openide-compat" dir="compat" />	160	<ant antfile="build.xml" target="openide-compat" dir="compat" />
159	<ant antfile="build.xml" target="openide-compat" dir="windows" />	161	<ant antfile="build.xml" target="openide-compat" dir="windows" />
160	<ant antfile="build.xml" target="openide-compat" dir="text" />	162	<ant antfile="build.xml" target="openide-compat" dir="text" />
Lines 163-168 Link Here
163	<target name="release" depends="init">	165	<target name="release" depends="init">
164	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">	166	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
165	<fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>	167	<fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
		168	<mapper type="glob" from="system/" to="${nb.system.dir}/" />
166	</copy>	169	</copy>
167	</target>	170	</target>
168		171

Lines 85-91 Link Here

(-)openide/compat/build.xml (-1 / +1 lines)
85		85
86	<target name="openide-compat"	86	<target name="openide-compat"
87	description="Regenerates different classes from openide to make them compatible with pre openide-loaders.jar version. Shall be just a temporary solution"	87	description="Regenerates different classes from openide to make them compatible with pre openide-loaders.jar version. Shall be just a temporary solution"
88	depends="compile"	88	depends="compile, init"
89	>	89	>
90	<taskdef name="preprocess" classname="org.netbeans.nbbuild.Preprocess" classpath="${nbroot}/nbbuild/nbantext.jar"/>	90	<taskdef name="preprocess" classname="org.netbeans.nbbuild.Preprocess" classpath="${nbroot}/nbbuild/nbantext.jar"/>
91		91

Lines 62-68 Link Here

(-)openide/compat/test/build.xml (-1 / +1 lines)
62	<target name="generate" depends="init">	62	<target name="generate" depends="init">
63	<echo>Generating compatibility APIs from ${netbeans.home}/lib/openide.jar</echo>	63	<echo>Generating compatibility APIs from ${netbeans.home}/lib/openide.jar</echo>
64	<path id="boot.cp">	64	<path id="boot.cp">
65	<pathelement location="${netbeans.home}/lib/ext/boot.jar"/>	65	<pathelement location="${netbeans.home}/${nb.bin.dir}/boot.jar"/>
66	<!-- See xtest/instance/build-clover.xml for explanation: -->	66	<!-- See xtest/instance/build-clover.xml for explanation: -->
67	<pathelement location="${netbeans.home}/lib/ext/clover.jar"/>	67	<pathelement location="${netbeans.home}/lib/ext/clover.jar"/>
68	</path>	68	</path>

Lines 35-41 Link Here

(-)openide/compiler/build.xml (-1 / +2 lines)
35	<taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>	35	<taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>
36	<enhanceclass basedir="src">	36	<enhanceclass basedir="src">
37	<classpath>	37	<classpath>
38	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	38	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		39	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
39	<!-- See xtest/instance/build-clover.xml for explanation: -->	40	<!-- See xtest/instance/build-clover.xml for explanation: -->
40	<pathelement location="../../core/netbeans/lib/ext/clover.jar"/>	41	<pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
41	</classpath>	42	</classpath>

Lines 52-57 Link Here

(-)openide/deprecated/build.xml (+1 lines)
52	<target name="release" depends="init">	52	<target name="release" depends="init">
53	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">	53	<copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
54	<fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>	54	<fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
		55	<mapper type="glob" from="system/" to="${nb.system.dir}/" />
55	</copy>	56	</copy>
56	</target>	57	</target>
57		58

Lines 50-56 Link Here

(-)openide/explorer/build.xml (-1 / +2 lines)
50		50
51	<enhanceclass basedir="src" >	51	<enhanceclass basedir="src" >
52	<classpath>	52	<classpath>
53	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	53	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		54	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
54	<!-- See xtest/instance/build-clover.xml for explanation: -->	55	<!-- See xtest/instance/build-clover.xml for explanation: -->
55	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>	56	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
56	</classpath>	57	</classpath>

Lines 47-53 Link Here

(-)openide/fs/build.xml (-1 / +2 lines)
47		47
48	<enhanceclass basedir="src" >	48	<enhanceclass basedir="src" >
49	<classpath>	49	<classpath>
50	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	50	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		51	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
51	<!-- See xtest/instance/build-clover.xml for explanation: -->	52	<!-- See xtest/instance/build-clover.xml for explanation: -->
52	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>	53	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
53	</classpath>	54	</classpath>

Lines 35-41 Link Here

(-)openide/io/build.xml (-1 / +2 lines)
35	classpath="${nb_all}/nbbuild/nbantext.jar"/>	35	classpath="${nb_all}/nbbuild/nbantext.jar"/>
36	<enhanceclass basedir="src">	36	<enhanceclass basedir="src">
37	<classpath>	37	<classpath>
38	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	38	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		39	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
39	<!-- See xtest/instance/build-clover.xml for explanation: -->	40	<!-- See xtest/instance/build-clover.xml for explanation: -->
40	<pathelement location="../../core/netbeans/lib/ext/clover.jar"/>	41	<pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
41	</classpath>	42	</classpath>

Lines 44-50 Link Here

(-)openide/loaders/build.xml (-1 / +2 lines)
44	<taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>	44	<taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>
45	<enhanceclass basedir="src">	45	<enhanceclass basedir="src">
46	<classpath>	46	<classpath>
47	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	47	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		48	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
48	<!-- See xtest/instance/build-clover.xml for explanation: -->	49	<!-- See xtest/instance/build-clover.xml for explanation: -->
49	<pathelement location="${nb_all}/core/netbeans/lib/ext/clover.jar"/>	50	<pathelement location="${nb_all}/core/netbeans/lib/ext/clover.jar"/>
50	</classpath>	51	</classpath>

Lines 48-54 Link Here

(-)openide/nodes/build.xml (-1 / +2 lines)
48		48
49	<enhanceclass basedir="src" >	49	<enhanceclass basedir="src" >
50	<classpath>	50	<classpath>
51	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	51	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		52	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
52	<!-- See xtest/instance/build-clover.xml for explanation: -->	53	<!-- See xtest/instance/build-clover.xml for explanation: -->
53	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>	54	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
54	</classpath>	55	</classpath>




                <pathelement location="../execution/src/"/>
                <pathelement location="../io/src/"/>
                <pathelement location="../windows/src/"/>
                <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
                <pathelement location="../../core/src/"/>
	</path>
    </target>

	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
 	      -->
	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
             <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
             <!-- XXX -->
             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>

                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/> <!-- for the manifest -->
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- for the manifest -->
                <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- for the manifest -->
                <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
                <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>

                <fileset dir="../../libs/external">

	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
 	      --> 
	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
             <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
             <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>




<project name="openide/util" default="netbeans" basedir=".">
  <import file="../../nbbuild/default.xml"/>

  <target name="boot" depends="init" >
    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
    <property file="${moduleCluster.file}"/>
  </target>

      <pathelement location="src" />
  </path>
  
  <target name="compile" depends="boot,init">
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
      <property name="localdir" location="src" />
      <property name="selector" value="openide.util" />

    
    <enhanceclass basedir="src" >
        <classpath>
            <pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
            <pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
            <!-- See xtest/instance/build-clover.xml for explanation: -->
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
        </classpath>

Lines 37-43 Link Here

(-)utilities/build.xml (-1 / +1 lines)
37	<path id="cli-cp">	37	<path id="cli-cp">
38	<pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>	38	<pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
39	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>	39	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
40	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	40	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
41	</path>	41	</path>
42	</target>	42	</target>
43		43

Lines 155-161 Link Here

(-)xtest/lib/module_harness.xml (+4 lines)
155	<target name="init_cluster_properties">	155	<target name="init_cluster_properties">
156	<!-- Read moduleCluster.properties and directories.properties from netbeans.dest.dir -->	156	<!-- Read moduleCluster.properties and directories.properties from netbeans.dest.dir -->
157	<property file="${netbeans.dest.dir}/directories.properties"/>	157	<property file="${netbeans.dest.dir}/directories.properties"/>
		158	<!-- read from second location -->
		159	<property file="${netbeans.dest.dir}/../directories.properties"/>
158	<property file="${netbeans.dest.dir}/moduleCluster.properties"/>	160	<property file="${netbeans.dest.dir}/moduleCluster.properties"/>
		161	<!-- read also from this location -->
		162	<property file="${netbeans.dest.dir}/netbeans/moduleCluster.properties"/>
159	</target>	163	</target>
160		164
161	<!-- ======== -->	165	<!-- ======== -->

Lines 27-33 Link Here

(-)xtest/plugins_src/deprecated/build.xml (-1 / +1 lines)
27	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />	27	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
28	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />	28	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>	29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	30	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
31	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>	31	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
32	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>	32	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
33	<pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>	33	<pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>

Lines 27-33 Link Here

(-)xtest/plugins_src/ide/build.xml (-1 / +1 lines)
27	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />	27	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
28	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />	28	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>	29	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	30	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
31	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>	31	<pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
32	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>	32	<pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
33	<pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>	33	<pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>

Return to bug 32080

Lines 1090-1099 Link Here

(-)nbbuild/build.xml (-8 / +44 lines)
1090		1090
1091	<!-- see issue #35744 http://www.netbeans.org/issues/show_bug.cgi?id=35744 -->	1091	<!-- see issue #35744 http://www.netbeans.org/issues/show_bug.cgi?id=35744 -->
1092	<delete file="NetBeans-${buildnum}.zip"/>	1092	<delete file="NetBeans-${buildnum}.zip"/>
		1093
		1094	<loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
		1095
		1096	<!-- generate the generic launcher -->
		1097	<mkdir dir="${netbeans.dest.dir}/bin" />
		1098	<echo file="${netbeans.dest.dir}/bin/netbeans">#!/bin/sh
		1099	#
		1100	# resolve symlinks
		1101	#
		1102	PRG=$0
		1103
		1104	while [ -h "$PRG" ]; do
		1105	ls=`ls -ld "$PRG"`
		1106	link=`expr "$ls" : '^.-> \(.\)$' 2>/dev/null`
		1107	if expr "$link" : '^/' 2> /dev/null >/dev/null; then
		1108	PRG="$link"
		1109	else
		1110	PRG="`dirname "$PRG"`/$link"
		1111	fi
		1112	done
		1113
		1114	progdir=`dirname "$PRG"`
		1115	export NB_USER_DIR=$HOME/.netbeans/dev
		1116	export NB_CONFIG_SYSTEM="$progdir"/../etc/netbeans.conf
		1117	export NB_CONFIG_USER=$NB_USER_DIR/config
		1118	exec /bin/sh $progdir/../${nb.cluster.platform.dir}/${nb.bin.dir}/nbexec --dirs ${nb.cluster.platform.dir}:${nb.cluster.ide.dir}:${nb.cluster.nb.dir} "$@"
		1119	</echo>
		1120	<!-- generate nb config -->
		1121	<mkdir dir="${netbeans.dest.dir}/etc" />
		1122	<echo file="${netbeans.dest.dir}/etc/netbeans.conf">-J-Xms24m -J-Xmx96m
		1123	-J-Dnetbeans.logger.console=true
		1124	-J-ea
		1125	</echo>
		1126
		1127	<!-- package the zip file -->
1093	<zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">	1128	<zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
1094	<zipfileset file="${netbeans.dest}/bin/runide.sh" filemode="755" prefix="${netbeans.dest}/bin"/>	1129	<zipfileset file="${netbeans.dest}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
1095	<zipfileset file="${netbeans.dest}/bin/*.com" filemode="755" prefix="${netbeans.dest}/bin"/>	1130	<zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
1096	<zipfileset file="${netbeans.dest}/bin/*.exe" filemode="755" prefix="${netbeans.dest}/bin"/>	1131	<zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/*.com" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
		1132	<zipfileset file="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}/*.exe" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/${nb.bin.dir}"/>
1097	<zipfileset dir="${netbeans.dest}" prefix="${netbeans.dest}"/>	1133	<zipfileset dir="${netbeans.dest}" prefix="${netbeans.dest}"/>
1098	</zip>	1134	</zip>
1099	<echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).	1135	<echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).
Lines 1169-1175 Link Here
1169	<arg line="${sanitystart.args}"/>	1205	<arg line="${sanitystart.args}"/>
1170	</exec>	1206	</exec>
1171	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">	1207	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
1172	<arg value="${netbeans.dest}/bin/runide.sh"/>	1208	<arg value="${netbeans.dest}/bin/netbeans"/>
1173	<arg value="-jdkhome"/>	1209	<arg value="-jdkhome"/>
1174	<arg file="${jdkhome}"/>	1210	<arg file="${jdkhome}"/>
1175	<arg value="-userdir"/>	1211	<arg value="-userdir"/>
Lines 1179-1186 Link Here
1179	<echo>Finished starting the IDE, pay attention to any reported errors.</echo>	1215	<echo>Finished starting the IDE, pay attention to any reported errors.</echo>
1180	</target>	1216	</target>
1181		1217
1182	<target name="check-for-build">	1218	<target name="check-for-build" >
1183	<available property="have-build" file="${netbeans.dest}/lib/openide.jar"/>	1219	<available property="have-build" file="${openide.dir}/${nb.lib.dir}/openide.jar"/>
1184	</target>	1220	</target>
1185	<target name="maybe-build-nozip" depends="check-for-build" unless="have-build">	1221	<target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
1186	<ant dir="." target="build-nozip"/>	1222	<ant dir="." target="build-nozip"/>
Lines 1206-1212 Link Here
1206	<arg line="${tryme.args}"/>	1242	<arg line="${tryme.args}"/>
1207	</exec>	1243	</exec>
1208	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">	1244	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
1209	<arg value="${netbeans.dest}/bin/runide.sh"/>	1245	<arg value="${netbeans.dest}/bin/netbeans"/>
1210	<arg value="-jdkhome"/>	1246	<arg value="-jdkhome"/>
1211	<arg file="${jdkhome}"/>	1247	<arg file="${jdkhome}"/>
1212	<arg value="-userdir"/>	1248	<arg value="-userdir"/>
Lines 1227-1233 Link Here
1227	<arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />	1263	<arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
1228	</exec>	1264	</exec>
1229	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">	1265	<exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
1230	<arg value="${netbeans.dest}/bin/runide.sh"/>	1266	<arg value="${netbeans.dest}/bin/netbeans"/>
1231	<arg value="-jdkhome"/>	1267	<arg value="-jdkhome"/>
1232	<arg file="${jdkhome}"/>	1268	<arg file="${jdkhome}"/>
1233	<arg value="-userdir"/>	1269	<arg value="-userdir"/>

Lines 19-28 Link Here

(-)core/build.xml (-7 / +14 lines)
19	<patternset id="core.files">	19	<patternset id="core.files">
20	<include name="${nb.lib.dir}/core.jar"/>	20	<include name="${nb.lib.dir}/core.jar"/>
21	<include name="${nb.lib.dir}/ide.ks"/>	21	<include name="${nb.lib.dir}/ide.ks"/>
22	<include name="${nb.lib.dir}/ext/boot.jar"/>	22	<include name="${nb.bin.dir}/boot.jar"/>
23	<include name="${nb.bin.dir}/.runide_defaults.sh"/>	23	<include name="${nb.bin.dir}/security.policy"/>
24	<include name="${nb.bin.dir}/ide.cfg"/>
25	<include name="${nb.bin.dir}/ide.policy"/>
26	<include name="${nb.bin.dir}/macosx_launcher.dmg"/>	24	<include name="${nb.bin.dir}/macosx_launcher.dmg"/>
27	<include name="${nb.bin.dir}/runide.exe"/>	25	<include name="${nb.bin.dir}/runide.exe"/>
28	<include name="${nb.bin.dir}/runide.sh"/>	26	<include name="${nb.bin.dir}/runide.sh"/>
Lines 38-44 Link Here
38	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>	36	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
39	<pathelement location="${openide/explorer.dir}/${nb.lib.dir}/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->	37	<pathelement location="${openide/explorer.dir}/${nb.lib.dir}/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->
40	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- XXX remove soon -->	38	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- XXX remove soon -->
41	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	39	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		40	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
42	</path>	41	</path>
43	</target>	42	</target>
44		43
Lines 50-58 Link Here
50		49
51	<!-- XXX move to bootstrap/build.xml -->	50	<!-- XXX move to bootstrap/build.xml -->
52	<target name="boot" depends="init">	51	<target name="boot" depends="init">
		52	<property name="module.name" value="core/bootstrap" />
		53
53	<javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>	54	<javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>
54	<mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext" />	55	<mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" />
55	<jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext/boot.jar"	56	<jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/boot.jar"
56	basedir="bootstrap/src"	57	basedir="bootstrap/src"
57	excludesfile="../nbbuild/standard-jar-excludes.txt"	58	excludesfile="../nbbuild/standard-jar-excludes.txt"
58	compress="false">	59	compress="false">
Lines 72-81 Link Here
72	</target>	73	</target>
73		74
74	<target name="release" depends="init">	75	<target name="release" depends="init">
		76	<copy file="release/bin/runide.sh" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/nbexec" />
		77	<copy file="release/bin/ide.policy" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}/security.policy" />
		78	<copy file="release/lib/ide.ks" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/keystore.ks" />
75	<copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" includeEmptyDirs="false">	79	<copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" includeEmptyDirs="false">
76	<fileset dir="release/bin" excludesfile="../nbbuild/standard-jar-excludes.txt">	80	<fileset dir="release/bin" excludesfile="../nbbuild/standard-jar-excludes.txt">
77	<!-- These do not currently work anyway: -->	81	<!-- These do not currently work anyway: -->
78	<exclude name="unsupported/nbscript*"/>	82	<exclude name="unsupported/nbscript*"/>
		83	<exclude name="**/runide.sh" />
		84	<exclude name="**/ide.policy" />
		85	<exclude name="**/ide.ks" />
79	</fileset>	86	</fileset>
80	</copy>	87	</copy>
81	<copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}" includeEmptyDirs="false">	88	<copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}" includeEmptyDirs="false">

Removed Link Here

(-)core/release/bin/.runide_defaults.sh (-38 lines)
1	# Sun Public License Notice
2	#
3	# The contents of this file are subject to the Sun Public License
4	# Version 1.0 (the "License"). You may not use this file except in
5	# compliance with the License. A copy of the License is available at
6	# http://www.sun.com/
7	#
8	# The Original Code is NetBeans. The Initial Developer of the Original
9	# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
10	# Microsystems, Inc. All Rights Reserved.
11
12	# For use from runide.sh, do not run directly.
13
14	# Default userdir, can be overridden by -userdir switch. This value should be
15	# changed for each new version so that the user can switch between versions of
16	# the IDE without risking loss of settings, e.g. ~/.netbeans/dev for dev builds,
17	# ~/.netbeans/3.4 for NB 3.4, etc.
18	#
19	# Note: string after last slash in value of userdir variable is used
20	# by installer build to identify release of NetBeans and to set
21	# userdir by "OS native" NetBeans installer.
22	# Please change userdir only with advance notification to NB
23	# buildmasters.
24
25	userdir=${HOME}/.netbeans/dev
26
27	# Default JDK home, can be overridden by the -jdkhome switch, or the
28	# value of the $NB_JDK_HOME environment variable. If both are present
29	# the -jdkhome switch has precedence.
30	#
31	# If desired, this is a good place for an installer program to record
32	# the JDK that was found at installation time. For example, on Linux
33	# systems /etc/profile.d/netbeans.sh could: export NB_JDK_HOME=/usr/java
34	#
35	# Note: setting this variable will cause NetBeans to ignore the value of
36	# the ${JDK_HOME} and ${JAVA_PATH} environment variables.
37
38	jdkhome="$NB_JDK_HOME"

Lines 15-22 Link Here

(-)core/release/bin/runide.sh (-28 / +73 lines)
15	# Normally, editing this script should not be required.	15	# Normally, editing this script should not be required.
16	# -----------------------------------------------------	16	# -----------------------------------------------------
17		17
18	# use $JDK_HOME or $NB_JDK_HOME or the -jdkhome switch, do not edit this here	18	# use $JDK_HOME or the -jdkhome switch, do not edit this here
19	# (see below for info on .runide_defaults.sh)
20	jdkhome=""	19	jdkhome=""
21		20
22	# append on command line or ide.cfg, with -J prefix on each	21	# append on command line or ide.cfg, with -J prefix on each
Lines 47-67 Link Here
47		46
48	oldpwd=`pwd` ; cd "${idehome}"; idehome=`pwd`; cd "${oldpwd}"; unset oldpwd	47	oldpwd=`pwd` ; cd "${idehome}"; idehome=`pwd`; cd "${oldpwd}"; unset oldpwd
49		48
50	# calculate branding to brand userdir with
51	defaults="$idehome/bin/.runide_defaults.sh"
52	if [ -r "$idehome/lib/branding" ]; then
53	branding=`cat "$idehome/lib/branding"`
54	if [ -r "$idehome/bin/.runide_defaults_$branding.sh" ]; then
55	defaults="$idehome/bin/.runide_defaults_$branding.sh"
56	fi
57	fi
58	# This script should set the var userdir at the least:
59	# (another likely option would be $jdkhome, see #18628)
60	. "$defaults"
61
62	jargs=${jreflags}	49	jargs=${jreflags}
63	jargs="$jargs -Dnetbeans.home=\"$idehome\""	50	jargs="$jargs -Dnetbeans.home=\"$idehome\""
64	jargs="$jargs -Djava.security.policy=\"$idehome/bin/ide.policy\""	51	jargs="$jargs -Djava.security.policy=\"$idehome/launcher/security.policy\""
65		52
66	args=""	53	args=""
67		54
Lines 87-92 Link Here
87	jdkhome="$JAVA_PATH"	74	jdkhome="$JAVA_PATH"
88	fi	75	fi
89		76
		77	if [ ! -z "$NB_PATH" ]; then
		78	nbpath="$NB_PATH"
		79	else
		80	nbpath="$progdir/../.."
		81	fi
		82
		83	# default value for dirs argument, starts only platform
		84	nbdirs=platform*
		85
90	#	86	#
91	# parse arguments	87	# parse arguments
92	#	88	#
Lines 130-136 Link Here
130	prefixcp=$prefixcp$1;	126	prefixcp=$prefixcp$1;
131	fi	127	fi
132	;;	128	;;
133		129	--dirs)
		130	shift;
		131	if [ $# -gt 0 ] ; then
		132	nbdirs="$1"
		133	fi
		134	;;
134	-J) jopt=`expr "X-$1" : 'X--J\(.\)'`; jargs="$jargs \"$jopt\"";;	135	-J) jopt=`expr "X-$1" : 'X--J\(.\)'`; jargs="$jargs \"$jopt\"";;
135	*) args="$args \"$1\"" ;;	136	*) args="$args \"$1\"" ;;
136	esac	137	esac
Lines 138-150 Link Here
138	done	139	done
139	} # parse_args()	140	} # parse_args()
140		141
141	# Process any ./ide.cfg or ~/ide.cfg.	142	# Process any system config
		143	# Note that there is no quoting scheme for these files.
		144	if [ -r "${NB_CONFIG_SYSTEM}" ]; then
		145	parse_args `cat "${NB_CONFIG_SYSTEM}"`
		146	fi
		147
		148	# Process user config
142	# Note that there is no quoting scheme for these files.	149	# Note that there is no quoting scheme for these files.
143	if [ -r "${HOME}/ide.cfg" ]; then	150	if [ -r "${NB_CONFIG_USER}" ]; then
144	parse_args `cat "${HOME}"/ide.cfg`	151	parse_args `cat "${NB_CONFIG_USER}"`
145	elif [ -r "${progdir}/ide.cfg" ]; then
146	parse_args `cat "${progdir}"/ide.cfg`
147	# else leave as is
148	fi	152	fi
149		153
150	if [ -f /usr/j2se/opt/javahelp/lib/jhall.jar ]; then	154	if [ -f /usr/j2se/opt/javahelp/lib/jhall.jar ]; then
Lines 156-161 Link Here
156	# Process arguments given on the command line.	160	# Process arguments given on the command line.
157	parse_args "$@"	161	parse_args "$@"
158		162
		163
		164	resolvedirs() {
		165	# iterate thru $2 == $nbdirs to find them
		166	SEP=""
		167	echo $nbdirs \| tr ':' '\n' \| while read CLUSTER; do
		168	# iterate thru $1 == $nbpath
		169	FOUND=`echo $nbpath \| tr ':' '\n' \| while read DIR; do
		170	if [ -d "$CLUSTER" ]; then
		171	echo $CLUSTER
		172	else
		173	ls -d "$DIR"/$CLUSTER 2>/dev/null
		174	fi
		175	done \| sort -u -r`
		176
		177	if [ -z "$FOUND" ]; then
		178	echo Cannot found directory \"$CLUSTER\" in search locations \"$nbpath\"
		179	exit 2
		180	fi
		181
		182	echo -n "$SEP"
		183	echo -n "$FOUND"
		184	SEP=":"
		185	done
		186	} # end of resolvedirs
		187
		188	dirsresult=`resolvedirs \"$nbpath\" \"$nbdirs\"`
		189	exitcode=$?
		190	if [ "0" != "$exitcode" ]; then
		191	echo $dirsresult
		192	exit 5
		193	fi
		194
		195	jargs="$jargs -Dnetbeans.dirs=\"$dirsresult\""
		196
		197
159	#	198	#
160	# check JDK	199	# check JDK
161	#	200	#
Lines 177-186 Link Here
177	# check userdir	216	# check userdir
178	#	217	#
179		218
180	if [ ! -z "$userdir" ] ; then	219	if [ -z "$userdir" ]; then
181	args="--userdir \"${userdir}\" $args"	220	if [ -z "$NB_USER_DIR" ]; then
		221	echo Need to specify user dir using env variable NB_USER_DIR or command line option --userdir
		222	exit 7
		223	fi
		224	userdir="$NB_USER_DIR"
182	fi	225	fi
183		226
		227	args="--userdir \"${userdir}\" $args"
		228
184	#	229	#
185	# increase file descriptor's limit, on Solaris it's set to 64, too small for	230	# increase file descriptor's limit, on Solaris it's set to 64, too small for
186	# fastjavac	231	# fastjavac
Lines 202-209 Link Here
202		247
203	build_cp() {	248	build_cp() {
204	base="$1"	249	base="$1"
205	append_jars_to_cp "${base}/lib/ext"	250	append_jars_to_cp "${base}/launcher"
206	append_jars_to_cp "${base}/lib/ext/locale"	251	append_jars_to_cp "${base}/launcher/locale"
207	}	252	}
208		253
209	do_run_updater() {	254	do_run_updater() {
Lines 287-294 Link Here
287		332
288	build_cp "${idehome}"	333	build_cp "${idehome}"
289		334
290	if [ -f "${idehome}/lib/updater.jar" ] ; then	335	if [ -f "${idehome}/boot/updater.jar" ] ; then
291	updatercp="${idehome}/lib/updater.jar"	336	updatercp="${idehome}/boot/updater.jar"
292	fi	337	fi
293		338
294	# JDK tools	339	# JDK tools

Lines 29-35 Link Here

(-)core/src/org/netbeans/core/TopLogging.java (-3 / +3 lines)
29	public class TopLogging	29	public class TopLogging
30	{	30	{
31	/** The name of the log file */	31	/** The name of the log file */
32	public static final String LOG_FILE_NAME = "ide.log"; // NOI18N	32	public static final String LOG_FILE_NAME = "messages.log"; // NOI18N
33		33
34	private static boolean disabledConsole = true;	34	private static boolean disabledConsole = true;
35		35
Lines 49-55 Link Here
49	/** Creates a new TopLogging - redirects the System.err to a log file.	49	/** Creates a new TopLogging - redirects the System.err to a log file.
50	* @param logDir A directory for the log file	50	* @param logDir A directory for the log file
51	*/	51	*/
52	public TopLogging (String logDir) throws IOException {	52	TopLogging (String logDir) throws IOException {
53	topLogging = this;	53	topLogging = this;
54		54
55	File logFileDir = new File (logDir);	55	File logFileDir = new File (logDir);
Lines 87-93 Link Here
87	private static TopLogging getDefault() {	87	private static TopLogging getDefault() {
88	if (topLogging == null) {	88	if (topLogging == null) {
89	try {	89	try {
90	new TopLogging(NonGui.getSystemDir());	90	new TopLogging(NonGui.getLogDir());
91	} catch (IOException x) {	91	} catch (IOException x) {
92	org.openide.ErrorManager.getDefault().notify(x);	92	org.openide.ErrorManager.getDefault().notify(x);
93	}	93	}

Lines 23-33 Link Here

(-)nbbuild/cluster.properties (-15 / +19 lines)
23	vcsgeneric/profiles/pvcs, \	23	vcsgeneric/profiles/pvcs, \
24	vcsgeneric/profiles/vss	24	vcsgeneric/profiles/vss
25		25
26	clusters.list=nb.cluster.platform,nb.cluster.ide	26	clusters.list=nb.cluster.platform,nb.cluster.ide,nb.cluster.nb
27		27
28	nb.cluster.platform=core, \	28	nb.cluster.platform=core, \
29	openide, \	29	openide, \
30	openide/compiler, \
31	openide/util, \	30	openide/util, \
32	openide/actions, \	31	openide/actions, \
33	openide/awt, \	32	openide/awt, \
Lines 38-68 Link Here
38	openide/compat, \	37	openide/compat, \
39	openide/text, \	38	openide/text, \
40	openide/windows, \	39	openide/windows, \
41	openide/deprecated, \
42	openide/loaders, \	40	openide/loaders, \
43	openide/io, \	41	openide/io, \
44	openide/execution, \	42	openide/execution, \
		43	autoupdate, \
45	core/term, \	44	core/term, \
46	core/output, \	45	core/output, \
47	core/settings, \	46	core/settings, \
48	core/deprecated, \
49	java/srcmodel, \
50	libs/regexp, \
51	debuggercore/oldapi, \
52	core/javahelp, \	47	core/javahelp, \
53	core/compiler, \	48	libs/regexp, \
54	core/execution, \	49	core/execution, \
55	core/ui, \	50	core/ui, \
56	core/windows, \	51	core/windows
57	core/ide
58		52
59	nb.cluster.platform.dir=netbeans	53	nb.cluster.platform.dir=platform4
60		54
61	nb.cluster.ide=classfile, \	55	nb.cluster.ide=classfile, \
62	clazz, \	56	clazz, \
63	editor, \	57	editor, \
64	html, \	58	html, \
65	image, \	59	image, \
		60	openide/deprecated, \
		61	openide/compiler, \
		62	core/deprecated, \
		63	core/ide, \
		64	core/compiler, \
		65	java/srcmodel, \
		66	debuggercore/oldapi, \
66	java/api, \	67	java/api, \
67	java, \	68	java, \
68	junit, \	69	junit, \
Lines 71-78 Link Here
71	text, \	72	text, \
72	utilities, \	73	utilities, \
73	utilities/group,\	74	utilities/group,\
74	autoupdate, \
75	autoupdate/updatecenters, \
76	apisupport, \	75	apisupport, \
77	apisupport/ant, \	76	apisupport/ant, \
78	apisupport/apidocs, \	77	apisupport/apidocs, \
Lines 110-116 Link Here
110	schema2beans/dev, \	109	schema2beans/dev, \
111	tomcatint/tomcat5, \	110	tomcatint/tomcat5, \
112	tomcatint/tomcat5/bundled, \	111	tomcatint/tomcat5/bundled, \
113	ui/welcome, \
114	usersguide, \	112	usersguide, \
115	vcscore, \	113	vcscore, \
116	vcscvs/compat, \	114	vcscvs/compat, \
Lines 129-135 Link Here
129	${local.config.vcsprofiles}, \	127	${local.config.vcsprofiles}, \
130	${local.config.tasklist4barracuda}	128	${local.config.tasklist4barracuda}
131		129
132	nb.cluster.ide.dir=netbeans	130	nb.cluster.ide.dir=ide4
		131
		132	# special cluster for NetBeans only extensions
		133	nb.cluster.nb=ui/welcome,\
		134	autoupdate/updatecenters
		135	nb.cluster.nb.dir=nb4.0
		136
133		137
134	nb.cluster.test=xtest/plugins_src/deprecated, \	138	nb.cluster.test=xtest/plugins_src/deprecated, \
135	xtest/plugins_src/ide	139	xtest/plugins_src/ide

Lines 252-258 Link Here

(-)openide/test/build.xml (-4 / +4 lines)
252	<pathelement location="../execution/src/"/>	252	<pathelement location="../execution/src/"/>
253	<pathelement location="../io/src/"/>	253	<pathelement location="../io/src/"/>
254	<pathelement location="../windows/src/"/>	254	<pathelement location="../windows/src/"/>
255	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	255	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
256	<pathelement location="../../core/src/"/>	256	<pathelement location="../../core/src/"/>
257	</path>	257	</path>
258	</target>	258	</target>
Lines 267-273 Link Here
267	<pathelement location="${netbeans.home}/modules/somemodule.jar"/>	267	<pathelement location="${netbeans.home}/modules/somemodule.jar"/>
268	-->	268	-->
269	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>	269	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
270	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	270	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
271	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>	271	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
272	<!-- XXX -->	272	<!-- XXX -->
273	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>	273	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
Lines 306-312 Link Here
306	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/> <!-- for the manifest -->	306	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/> <!-- for the manifest -->
307	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- for the manifest -->	307	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- for the manifest -->
308	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- for the manifest -->	308	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- for the manifest -->
309	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	309	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
310	<pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>	310	<pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
311		311
312	<fileset dir="../../libs/external">	312	<fileset dir="../../libs/external">
Lines 327-333 Link Here
327	<pathelement location="${netbeans.home}/modules/somemodule.jar"/>	327	<pathelement location="${netbeans.home}/modules/somemodule.jar"/>
328	-->	328	-->
329	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>	329	<pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
330	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	330	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
331	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>	331	<pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
332	<pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>	332	<pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
333	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>	333	<pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>

Lines 15-21 Link Here

(-)openide/util/build.xml (-3 / +4 lines)
15	<project name="openide/util" default="netbeans" basedir=".">	15	<project name="openide/util" default="netbeans" basedir=".">
16	<import file="../../nbbuild/default.xml"/>	16	<import file="../../nbbuild/default.xml"/>
17		17
18	<target name="boot">	18	<target name="boot" depends="init" >
19	<ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />	19	<ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
20	<property file="${moduleCluster.file}"/>	20	<property file="${moduleCluster.file}"/>
21	</target>	21	</target>
Lines 34-40 Link Here
34	<pathelement location="src" />	34	<pathelement location="src" />
35	</path>	35	</path>
36		36
37	<target name="compile" depends="init">	37	<target name="compile" depends="boot,init">
38	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	38	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
39	<property name="localdir" location="src" />	39	<property name="localdir" location="src" />
40	<property name="selector" value="openide.util" />	40	<property name="selector" value="openide.util" />
Lines 46-52 Link Here
46		46
47	<enhanceclass basedir="src" >	47	<enhanceclass basedir="src" >
48	<classpath>	48	<classpath>
49	<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>	49	<pathelement location="${core.dir}/${nb.bin.dir}/boot.jar"/>
		50	<pathelement location="${openide.dir}/${nb.bin.dir}/boot.jar"/>
50	<!-- See xtest/instance/build-clover.xml for explanation: -->	51	<!-- See xtest/instance/build-clover.xml for explanation: -->
51	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>	52	<pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
52	</classpath>	53	</classpath>