Attachment #107819 for bug #197842

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




                entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
            } else {
                entries = scanNetBeansOrgSources(new File(nball), properties, project);
                        
                String extra = properties.get("extra.clusters");
                if (extra != null) {
                    List<File> arr = new ArrayList<File>();
                    for (String s : extra.split(":")) {
                        File cluster = FileUtils.getFileUtils().resolveFile(new File(nball), s);
                        if (!cluster.exists()) {
                            throw new BuildException("cluster from extra.clusters does not exist: " + cluster);
                        }
                        arr.add(cluster);
                    }
                    entries.putAll(scanBinaries(project, arr.toArray(new File[0])));
                }
            }
        }
    }




        File jar = module.getJar();
        if (jar == null) return null;

        String ec = getProject().getProperty("extra.clusters");
        if (ec == null) {
            OK: if (module.getClusterName() != null && clusterPath != null) {
                File clusterF = jar.getParentFile();
                while (clusterF != null) {
                    if (clusterPath.contains(clusterF)) {
                        break OK;
                    }
                    clusterF = clusterF.getParentFile();
                }
                String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
                        " against because it is part of the cluster " +
                        jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
                        "Cluster.path is: " + clusterPath;
                throw new BuildException(msg, getLocation());
            }
            String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
                    " against because it is part of the cluster " +
                    jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
                    "Cluster.path is: " + clusterPath;
            throw new BuildException(msg, getLocation());
        }
        if (excludedModules != null && excludedModules.contains(cnb)) { // again #68716
            throw new BuildException("Module " + cnb + " excluded from the target platform", getLocation());

Lines 41-46 Link Here

(-)a/nbbuild/cluster.properties (+2 lines)
41	# Version 2 license, then the option applies only if the new code is	41	# Version 2 license, then the option applies only if the new code is
42	# made subject to such option by the copyright holder.	42	# made subject to such option by the copyright holder.
43		43
		44	extra.clusters=../netbinox-mylyn-sample/eclipse
		45
44	cluster.config=full	46	cluster.config=full
45	clusters.prefix=libnb	47	clusters.prefix=libnb
46		48

Lines 154-160 Link Here

(-)a/nbbuild/default.xml (-1 / +2 lines)
154	<available property="clusters.file" file="${nb_all}/ide/launcher/netbeans.clusters" value="${nb_all}/ide/launcher/netbeans.clusters"/>	154	<available property="clusters.file" file="${nb_all}/ide/launcher/netbeans.clusters" value="${nb_all}/ide/launcher/netbeans.clusters"/>
155	<!-- fallback for orphaned modules -->	155	<!-- fallback for orphaned modules -->
156	<property name="clusters.file" value="${netbeans.dest.dir}/etc/netbeans.clusters"/>	156	<property name="clusters.file" value="${netbeans.dest.dir}/etc/netbeans.clusters"/>
157	<loadfile property="cluster.path.evaluated" srcfile="${clusters.file}">	157	<loadfile property="cluster.path.read" srcfile="${clusters.file}">
158	<filterchain>	158	<filterchain>
159	<striplinecomments>	159	<striplinecomments>
160	<comment value="#"/>	160	<comment value="#"/>
Lines 163-168 Link Here
163	<striplinebreaks/>	163	<striplinebreaks/>
164	</filterchain>	164	</filterchain>
165	</loadfile>	165	</loadfile>
		166	<property name="cluster.path.evaluated" value="${extra.clusters}:${cluster.path.read}"/>
166	<path id="cluster.path.id" path="${cluster.path.evaluated}"/>	167	<path id="cluster.path.id" path="${cluster.path.evaluated}"/>
167	<property name="cluster.path.final" refid="cluster.path.id"/>	168	<property name="cluster.path.final" refid="cluster.path.id"/>
168	</target>	169	</target>

Lines 91-96 Link Here

(-)a/openide.text/nbproject/project.xml (+8 lines)
91	</run-dependency>	91	</run-dependency>
92	</dependency>	92	</dependency>
93	<dependency>	93	<dependency>
		94	<code-name-base>org.eclipse.equinox.common</code-name-base>
		95	<build-prerequisite/>
		96	<compile-dependency/>
		97	<run-dependency>
		98	<specification-version>3.5</specification-version>
		99	</run-dependency>
		100	</dependency>
		101	<dependency>
94	<code-name-base>org.openide.util</code-name-base>	102	<code-name-base>org.openide.util</code-name-base>
95	<build-prerequisite/>	103	<build-prerequisite/>
96	<compile-dependency/>	104	<compile-dependency/>

Lines 68-73 Link Here

(-)a/openide.text/src/org/netbeans/modules/openide/text/Installer.java (+2 lines)
68	Integer v = new Integer(1);	68	Integer v = new Integer(1);
69	mimeTypes.put(mimeType, v);	69	mimeTypes.put(mimeType, v);
70	}	70	}
		71	Class<?> c = org.eclipse.core.runtime.Assert.class;
		72	System.err.println("loaded: " + c);
71	}	73	}
72		74
73	@Override	75	@Override

Return to bug 197842

Lines 797-802 Link Here

(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java (+13 lines)
797	entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));	797	entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
798	} else {	798	} else {
799	entries = scanNetBeansOrgSources(new File(nball), properties, project);	799	entries = scanNetBeansOrgSources(new File(nball), properties, project);
		800
		801	String extra = properties.get("extra.clusters");
		802	if (extra != null) {
		803	List<File> arr = new ArrayList<File>();
		804	for (String s : extra.split(":")) {
		805	File cluster = FileUtils.getFileUtils().resolveFile(new File(nball), s);
		806	if (!cluster.exists()) {
		807	throw new BuildException("cluster from extra.clusters does not exist: " + cluster);
		808	}
		809	arr.add(cluster);
		810	}
		811	entries.putAll(scanBinaries(project, arr.toArray(new File[0])));
		812	}
800	}	813	}
801	}	814	}
802	}	815	}

Lines 1094-1112 Link Here

(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java (-11 / +14 lines)
1094	File jar = module.getJar();	1094	File jar = module.getJar();
1095	if (jar == null) return null;	1095	if (jar == null) return null;
1096		1096
1097	OK: if (module.getClusterName() != null && clusterPath != null) {	1097	String ec = getProject().getProperty("extra.clusters");
1098	File clusterF = jar.getParentFile();	1098	if (ec == null) {
1099	while (clusterF != null) {	1099	OK: if (module.getClusterName() != null && clusterPath != null) {
1100	if (clusterPath.contains(clusterF)) {	1100	File clusterF = jar.getParentFile();
1101	break OK;	1101	while (clusterF != null) {
		1102	if (clusterPath.contains(clusterF)) {
		1103	break OK;
		1104	}
		1105	clusterF = clusterF.getParentFile();
1102	}	1106	}
1103	clusterF = clusterF.getParentFile();	1107	String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
		1108	" against because it is part of the cluster " +
		1109	jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
		1110	"Cluster.path is: " + clusterPath;
		1111	throw new BuildException(msg, getLocation());
1104	}	1112	}
1105	String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
1106	" against because it is part of the cluster " +
1107	jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
1108	"Cluster.path is: " + clusterPath;
1109	throw new BuildException(msg, getLocation());
1110	}	1113	}
1111	if (excludedModules != null && excludedModules.contains(cnb)) { // again #68716	1114	if (excludedModules != null && excludedModules.contains(cnb)) { // again #68716
1112	throw new BuildException("Module " + cnb + " excluded from the target platform", getLocation());	1115	throw new BuildException("Module " + cnb + " excluded from the target platform", getLocation());