Attachment #105219 for bug #194550

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

Lines 1175-1180 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java (+1 lines)
1175	Map<String,String> clusterDefs = clusterPropertiesFiles.get(nbroot);	1175	Map<String,String> clusterDefs = clusterPropertiesFiles.get(nbroot);
1176	if (clusterDefs == null) {	1176	if (clusterDefs == null) {
1177	PropertyProvider pp = loadPropertiesFile(new File(nbroot, "nbbuild" + File.separatorChar + "cluster.properties")); // NOI18N	1177	PropertyProvider pp = loadPropertiesFile(new File(nbroot, "nbbuild" + File.separatorChar + "cluster.properties")); // NOI18N
		1178	// XXX add contrib/contrib-modules.properties
1178	PropertyEvaluator clusterEval = PropertyUtils.sequentialPropertyEvaluator(	1179	PropertyEvaluator clusterEval = PropertyUtils.sequentialPropertyEvaluator(
1179	PropertyUtils.fixedPropertyProvider(Collections.<String,String>emptyMap()), pp);	1180	PropertyUtils.fixedPropertyProvider(Collections.<String,String>emptyMap()), pp);
1180	clusterDefs = clusterEval.getProperties();	1181	clusterDefs = clusterEval.getProperties();

Lines 92-97 Link Here

(-)a/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java (+1 lines)
92	}	92	}
93	File buildPropertiesFile = new File(nbroot, "nbbuild" + File.separatorChar + "build.properties");	93	File buildPropertiesFile = new File(nbroot, "nbbuild" + File.separatorChar + "build.properties");
94	File clusterPropertiesFile = new File(nbroot, "nbbuild" + File.separatorChar + "cluster.properties");	94	File clusterPropertiesFile = new File(nbroot, "nbbuild" + File.separatorChar + "cluster.properties");
		95	// XXX add contrib/contrib-modules.properties
95	File goldenFile = new File(nbroot, "nbbuild" + File.separatorChar + "build" + File.separatorChar + "generated" + File.separatorChar + "moduleconfigs.txt");	96	File goldenFile = new File(nbroot, "nbbuild" + File.separatorChar + "build" + File.separatorChar + "generated" + File.separatorChar + "moduleconfigs.txt");
96	@SuppressWarnings("unchecked")	97	@SuppressWarnings("unchecked")
97	Map<String,String> properties = getProject().getProperties();	98	Map<String,String> properties = getProject().getProperties();

Lines 196-201 Link Here

(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java (+1 lines)
196	Map<File,Long[]> timestampsAndSizes = new HashMap<File,Long[]>();	196	Map<File,Long[]> timestampsAndSizes = new HashMap<File,Long[]>();
197	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "cluster.properties"), timestampsAndSizes);	197	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "cluster.properties"), timestampsAndSizes);
198	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "build.properties"), timestampsAndSizes);	198	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "build.properties"), timestampsAndSizes);
		199	// XXX add contrib/contrib-modules.properties
199	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "user.build.properties"), timestampsAndSizes);	200	registerTimestampAndSize(new File(root, "nbbuild" + File.separatorChar + "user.build.properties"), timestampsAndSizes);
200	if (doFastScan) {	201	if (doFastScan) {
201	if (project != null) {	202	if (project != null) {

Lines 269-274 Link Here

(-)a/nbbuild/build.properties (+1 lines)
269	contrib/core.registry,\	269	contrib/core.registry,\
270	contrib/convertor,\	270	contrib/convertor,\
271	nbjunit	271	nbjunit
		272	# XXX move contrib/* to contrib/contrib-modules.properties
272		273
273	# List of old and deprecated APIs for building complete javadoc	274	# List of old and deprecated APIs for building complete javadoc
274		275

Lines 65-70 Link Here

(-)a/nbbuild/build.xml (+1 lines)
65	<target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>	65	<target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>
66		66
67	<target name="-load-build-properties">	67	<target name="-load-build-properties">
		68	<!-- XXX add contrib/contrib-modules.properties -->
68	<property file="build.properties"/>	69	<property file="build.properties"/>
69	</target>	70	</target>
70		71

Lines 245-250 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
245	nb.cluster.apisupport	245	nb.cluster.apisupport
246	nb.cluster.testtools=\	246	nb.cluster.testtools=\
247	contrib/jemmysupport	247	contrib/jemmysupport
		248	# XXX move contrib/* to contrib/contrib-modules.properties
248		249
249	nb.cluster.ide.dir=ide11	250	nb.cluster.ide.dir=ide11
250	nb.cluster.ide.depends=nb.cluster.platform	251	nb.cluster.ide.depends=nb.cluster.platform

Lines 53-58 Link Here

(-)a/nbbuild/default-properties.xml (+1 lines)
53	<property name="build.sysclasspath" value="ignore"/>	53	<property name="build.sysclasspath" value="ignore"/>
54		54
55	<property name="clusters.list.file" location="${nb_all}/nbbuild/cluster.properties"/>	55	<property name="clusters.list.file" location="${nb_all}/nbbuild/cluster.properties"/>
		56	<!-- XXX add contrib/contrib-modules.properties -->
56	<property name="netbeans.dest.dir" location="${nb_all}/nbbuild/netbeans"/>	57	<property name="netbeans.dest.dir" location="${nb_all}/nbbuild/netbeans"/>
57	<property name="netbeans.build.dir" location="${nb_all}/nbbuild/build"/>	58	<property name="netbeans.build.dir" location="${nb_all}/nbbuild/build"/>
58	<property name="netbeans.javadoc.dir" location="${netbeans.build.dir}/javadoc"/>	59	<property name="netbeans.javadoc.dir" location="${netbeans.build.dir}/javadoc"/>

Lines 149-154 Link Here

(-)a/nbbuild/javadoctools/template.xml (+1 lines)
149	</selector>	149	</selector>
150	<property name="javadoc.files" value="all-java-files" />	150	<property name="javadoc.files" value="all-java-files" />
151		151
		152	<!-- XXX add contrib/contrib-modules.properties -->
152	<property file="../build.properties" />	153	<property file="../build.properties" />
153		154
154	<condition property="javadoc.reference.generated" >	155	<condition property="javadoc.reference.generated" >

Lines 83-88 Link Here

(-)a/nbbuild/monitor.xml (+1 lines)
83	<property file="user.build.properties"/>	83	<property file="user.build.properties"/>
84		84
85	<!-- Read standard property file -->	85	<!-- Read standard property file -->
		86	<!-- XXX add contrib/contrib-modules.properties -->
86	<property file="build.properties"/>	87	<property file="build.properties"/>
87		88
88	<!-- Define modules. -->	89	<!-- Define modules. -->

Return to bug 194550