Attachment #7031 for bug #26319

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

Lines 6-8 Link Here

(-)nbbuild/.cvsignore (+1 lines)
6	testuserdir	6	testuserdir
7	user.build.properties	7	user.build.properties
8	modules_javadoc	8	modules_javadoc
		9	moduledefs-tmp.properties




# if set to false, clean build never fail on calls of the clean targets.
stop.when.clean.error=true

# Choose which configuration to use
# (or explicitly set properties 'modules' and 'fixedmodules').
# The config must define a config.fixedmodules.XXX property and
# a config.modules.XXX property, where XXX is the config name.
# Each is a list of module names, as subdirectories beneath the
# root of the source tree, separated by commas.
moduleconfig=stable

config.fixedmodules.platform=core, \
        openide, \
        core/ui, \
        core/windows
config.modules.platform=autoupdate, \
        core/javahelp

config.fixedmodules.superslim=core, \
        openide, \
        core/javahelp, \
        core/compiler, \

        core/ui, \
        core/windows, \
        core/ide
config.modules.superslim=classfile, \
config.superslim=classfile, \
        clazz, \
        editor, \
        html, \

        text, \
        utilities

config.fixedmodules.slim=${config.fixedmodules.superslim}
config.modules.slim=${config.modules.superslim}, \
        autoupdate, \
        beans, \
        debuggercore, \

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

config.fixedmodules.stable=${config.fixedmodules.slim}
config.modules.stable=${config.modules.slim}, \
        ant, \
        apisupport/lite, \
        applet, \

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

config.fixedmodules.stable-with-apisupport=${config.fixedmodules.stable}
config.modules.stable-with-apisupport=${config.modules.stable}, \
        apisupport, \
        apisupport/ant, \
        apisupport/apidocs

config.fixedmodules.bloated=${config.fixedmodules.stable-with-apisupport}
config.modules.bloated=${config.modules.stable-with-apisupport}, \
        ant/docs, \
        classclosure, \
        corba, \

        web/taglibed, \
        openidex/looks

config.fixedmodules.bloated-plus-extrabins=${config.fixedmodules.bloated}
config.modules.bloated-plus-extrabins=${config.modules.bloated}, \
        icebrowser, \
        jini

# moduleconfig for nbms in Daily Alpha Update Centre
# consider modules icebrowser,vcscvs,jini,debuggertools
config.fixedmodules.daily-alpa-nbms=${config.fixedmodules.stable-with-apisupport}
config.modules.daily-alpha-nbms=${config.modules.stable-with-apisupport}, \
        ant/docs, \
        classclosure, \
        corba, \

        xml/api

# configuration for signature test builds
config.fixedmodules.sigtest=${config.fixedmodules.stable}
config.modules.sigtest=${config.modules.stable}, \
        mdr, \
        openidex/looks




    </tstamp>
    <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
    <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
    <taskdef name="configmods" classname="org.netbeans.nbbuild.ConfigureModules" classpath="nbantext.jar"/>
    <taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc" classpath="nbantext.jar"/>
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
    <taskdef name="check" classname="org.netbeans.nbbuild.CheckValue" classpath="nbantext.jar"/>
    <taskdef name="validatexml" classname="org.netbeans.nbbuild.XMLValidate" classpath="nbantext.jar;${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>

    <!-- Read the user property file at first -->

    <!-- Read standard property file -->
    <property file="build.properties"/>

    <!-- Define modules. -->
    <!-- The following is not permitted by Ant: -->
    <!-- <property name="modules" value="${config.modules.${moduleconfig}}"/> -->
    <!-- So this is a little trick to do it anyway. -->
    <echo file="moduledefs-tmp.properties">modules=$${config.modules.${moduleconfig}}
fixedmodules=$${config.fixedmodules.${moduleconfig}}
</echo>
    <property file="moduledefs-tmp.properties"/>
    <property name="allmodules" value="${fixedmodules},${modules}"/>

    <!-- We need absolute path to ${netbeans.dest} -->
    <property name="netbeans.dest.abs" location="${netbeans.dest}"/>

    <!-- But this it is OK to change: -->
    <property name="tryme.args" value=" -J-Dnetbeans.debug.exceptions=true ${tryme.args.additional}"/>

    <!-- Override this with the Ant command, e.g. -Dmoduleconfig=superslim -->
    <property name="moduleconfig" value="stable"/>

    <!-- You can also explicitly set a particular list of modules if you prefer: -->
    <!-- -Dmodules=foo,bar,... (do not include core or openide) -->

    <configmods property="modules" selectedconfig="${moduleconfig}">
      <config name="platform" modules="autoupdate"/>

      <config name="superslim" modules="${config.superslim}"/>

      <config name="slim" modules="${config.slim}"/>
      <!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->

      <config name="stable" modules="${config.stable}"/>

      <config name="stable-with-apisupport" modules="${config.stable-with-apisupport}"/>

      <config name="bloated" modules="${config.bloated}"/>
      <!-- You are on your own for getting the binaries for some of these: -->

      <config name="bloated-plus-extrabins" modules="${config.bloated-plus-extrabins}"/>

      <!-- config for making NBMs for Daily Alpha Update Centre -->
      <config name="daily-alpha-nbms" modules="${config.daily-alpha-nbms}"/>

      <!-- config for javadoc -->
      <config name="javadoc" modules="${config.javadoc}"/>

      <!-- config for API signature test builds -->
      <config name="sigtest" modules="${config.sigtest}"/>
    </configmods>

  </target>

  <target name="check-for-binaries" depends="bootstrap-init" unless="have-binaries-already">

      <!-- It's good idea to call merge target before this one.
           NbMerge.java can set property "modules" to the list of realy
           built modules (excluding fixedmodules which must build everytime). -->
      <for-each startdir=".." target="nbm" locations="${allmodules}"/>
  </target>
  <target name="nbm" description="Dummy target."/>


    <delete dir="${netbeans.dest}"/>
    <delete dir="${test.user.dir}"/>
    <delete dir="modules_javadoc"/>
    <delete file="moduledefs-tmp.properties"/>
  </target>

  <target name="clean" depends="init,localclean"
          description="Clean out (almost) all build products.">
    <cleanall topdir=".." 
              modules="${allmodules}" 
              targetname="clean"
              resolvedependencies="${resolve.clean.dependencies}"
              deptargetprefix="all-"

  </target>

  <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
    <echo message="modules=${allmodules}"/>
  </target>
</project>

Lines 21-26 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/CheckValue.java (+1 lines)
21	/** Task to check value of any property. If value match than it will set	21	/** Task to check value of any property. If value match than it will set
22	* another property to specified value	22	* another property to specified value
23	* @author Michal Zlamal	23	* @author Michal Zlamal
		24	* @deprecated unused
24	*/	25	*/
25	public class CheckValue extends Task {	26	public class CheckValue extends Task {
26	String property = null;	27	String property = null;

Lines 23-28 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/ConfigureModules.java (+1 lines)
23	* Ugly implementation because of the poor support for initialization	23	* Ugly implementation because of the poor support for initialization
24	* from nested elements in Ant.	24	* from nested elements in Ant.
25	* @author Jesse Glick	25	* @author Jesse Glick
		26	* @deprecated unused
26	*/	27	*/
27	public class ConfigureModules extends Task {	28	public class ConfigureModules extends Task {
28		29

Return to bug 26319

Lines 26-33 Link Here

(-)nbbuild/build.properties (-11 / +31 lines)
26	# if set to false, clean build never fail on calls of the clean targets.	26	# if set to false, clean build never fail on calls of the clean targets.
27	stop.when.clean.error=true	27	stop.when.clean.error=true
28		28
29	# Only useful to override in conjunction with merge target during development:	29	# Choose which configuration to use
30	fixedmodules=core, \	30	# (or explicitly set properties 'modules' and 'fixedmodules').
		31	# The config must define a config.fixedmodules.XXX property and
		32	# a config.modules.XXX property, where XXX is the config name.
		33	# Each is a list of module names, as subdirectories beneath the
		34	# root of the source tree, separated by commas.
		35	moduleconfig=stable
		36
		37	config.fixedmodules.platform=core, \
		38	openide, \
		39	core/ui, \
		40	core/windows
		41	config.modules.platform=autoupdate, \
		42	core/javahelp
		43
		44	config.fixedmodules.superslim=core, \
31	openide, \	45	openide, \
32	core/javahelp, \	46	core/javahelp, \
33	core/compiler, \	47	core/compiler, \
Lines 35-42 Link Here
35	core/ui, \	49	core/ui, \
36	core/windows, \	50	core/windows, \
37	core/ide	51	core/ide
38		52	config.modules.superslim=classfile, \
39	config.superslim=classfile, \
40	clazz, \	53	clazz, \
41	editor, \	54	editor, \
42	html, \	55	html, \
Lines 48-54 Link Here
48	text, \	61	text, \
49	utilities	62	utilities
50		63
51	config.slim=${config.superslim}, \	64	config.fixedmodules.slim=${config.fixedmodules.superslim}
		65	config.modules.slim=${config.modules.superslim}, \
52	autoupdate, \	66	autoupdate, \
53	beans, \	67	beans, \
54	debuggercore, \	68	debuggercore, \
Lines 75-81 Link Here
75	vcsgeneric/profiles/pvcs, \	89	vcsgeneric/profiles/pvcs, \
76	vcsgeneric/profiles/vss	90	vcsgeneric/profiles/vss
77		91
78	config.stable=${config.slim}, \	92	config.fixedmodules.stable=${config.fixedmodules.slim}
		93	config.modules.stable=${config.modules.slim}, \
79	ant, \	94	ant, \
80	apisupport/lite, \	95	apisupport/lite, \
81	applet, \	96	applet, \
Lines 105-116 Link Here
105	${local.config.xml}, \	120	${local.config.xml}, \
106	${local.config.vcsprofiles}	121	${local.config.vcsprofiles}
107		122
108	config.stable-with-apisupport=${config.stable}, \	123	config.fixedmodules.stable-with-apisupport=${config.fixedmodules.stable}
		124	config.modules.stable-with-apisupport=${config.modules.stable}, \
109	apisupport, \	125	apisupport, \
110	apisupport/ant, \	126	apisupport/ant, \
111	apisupport/apidocs	127	apisupport/apidocs
112		128
113	config.bloated=${config-stable-with-apisupport}, \	129	config.fixedmodules.bloated=${config.fixedmodules.stable-with-apisupport}
		130	config.modules.bloated=${config.modules.stable-with-apisupport}, \
114	ant/docs, \	131	ant/docs, \
115	classclosure, \	132	classclosure, \
116	corba, \	133	corba, \
Lines 136-148 Link Here
136	web/taglibed, \	153	web/taglibed, \
137	openidex/looks	154	openidex/looks
138		155
139	config.bloated-plus-extrabins=${config.bloated}, \	156	config.fixedmodules.bloated-plus-extrabins=${config.fixedmodules.bloated}
		157	config.modules.bloated-plus-extrabins=${config.modules.bloated}, \
140	icebrowser, \	158	icebrowser, \
141	jini	159	jini
142		160
143	# moduleconfig for nbms in Daily Alpha Update Centre	161	# moduleconfig for nbms in Daily Alpha Update Centre
144	# consider modules icebrowser,vcscvs,jini,debuggertools	162	# consider modules icebrowser,vcscvs,jini,debuggertools
145	config.daily-alpha-nbms=${config.stable-with-apisupport}, \	163	config.fixedmodules.daily-alpa-nbms=${config.fixedmodules.stable-with-apisupport}
		164	config.modules.daily-alpha-nbms=${config.modules.stable-with-apisupport}, \
146	ant/docs, \	165	ant/docs, \
147	classclosure, \	166	classclosure, \
148	corba, \	167	corba, \
Lines 190-195 Link Here
190	xml/api	209	xml/api
191		210
192	# configuration for signature test builds	211	# configuration for signature test builds
193	config.sigtest=${config.stable}, \	212	config.fixedmodules.sigtest=${config.fixedmodules.stable}
		213	config.modules.sigtest=${config.modules.stable}, \
194	mdr, \	214	mdr, \
195	openidex/looks	215	openidex/looks

Lines 76-85 Link Here

(-)nbbuild/build.xml (-43 / +13 lines)
76	</tstamp>	76	</tstamp>
77	<taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>	77	<taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
78	<taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>	78	<taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
79	<taskdef name="configmods" classname="org.netbeans.nbbuild.ConfigureModules" classpath="nbantext.jar"/>
80	<taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc" classpath="nbantext.jar"/>	79	<taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc" classpath="nbantext.jar"/>
81	<taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>	80	<taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
82	<taskdef name="check" classname="org.netbeans.nbbuild.CheckValue" classpath="nbantext.jar"/>
83	<taskdef name="validatexml" classname="org.netbeans.nbbuild.XMLValidate" classpath="nbantext.jar;${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>	81	<taskdef name="validatexml" classname="org.netbeans.nbbuild.XMLValidate" classpath="nbantext.jar;${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>
84		82
85	<!-- Read the user property file at first -->	83	<!-- Read the user property file at first -->
Lines 88-98 Link Here
88	<!-- Read standard property file -->	86	<!-- Read standard property file -->
89	<property file="build.properties"/>	87	<property file="build.properties"/>
90		88
91	<!-- Check if we want to build platform -->	89	<!-- Define modules. -->
92	<check property="moduleconfig"	90	<!-- The following is not permitted by Ant: -->
93	is="platform"	91	<!-- <property name="modules" value="${config.modules.${moduleconfig}}"/> -->
94	set="fixedmodules"	92	<!-- So this is a little trick to do it anyway. -->
95	tovalue="core,openide,core/javahelp,core/compiler,core/execution,core/ui,core/windows"/>	93	<echo file="moduledefs-tmp.properties">modules=$${config.modules.${moduleconfig}}
		94	fixedmodules=$${config.fixedmodules.${moduleconfig}}
		95	</echo>
		96	<property file="moduledefs-tmp.properties"/>
		97	<property name="allmodules" value="${fixedmodules},${modules}"/>
96		98
97	<!-- We need absolute path to ${netbeans.dest} -->	99	<!-- We need absolute path to ${netbeans.dest} -->
98	<property name="netbeans.dest.abs" location="${netbeans.dest}"/>	100	<property name="netbeans.dest.abs" location="${netbeans.dest}"/>
Lines 103-141 Link Here
103	<!-- But this it is OK to change: -->	105	<!-- But this it is OK to change: -->
104	<property name="tryme.args" value=" -J-Dnetbeans.debug.exceptions=true ${tryme.args.additional}"/>	106	<property name="tryme.args" value=" -J-Dnetbeans.debug.exceptions=true ${tryme.args.additional}"/>
105		107
106	<!-- Override this with the Ant command, e.g. -Dmoduleconfig=superslim -->
107	<property name="moduleconfig" value="stable"/>
108
109	<!-- You can also explicitly set a particular list of modules if you prefer: -->
110	<!-- -Dmodules=foo,bar,... (do not include core or openide) -->
111
112	<configmods property="modules" selectedconfig="${moduleconfig}">
113	<config name="platform" modules="autoupdate"/>
114
115	<config name="superslim" modules="${config.superslim}"/>
116
117	<config name="slim" modules="${config.slim}"/>
118	<!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->
119
120	<config name="stable" modules="${config.stable}"/>
121
122	<config name="stable-with-apisupport" modules="${config.stable-with-apisupport}"/>
123
124	<config name="bloated" modules="${config.bloated}"/>
125	<!-- You are on your own for getting the binaries for some of these: -->
126
127	<config name="bloated-plus-extrabins" modules="${config.bloated-plus-extrabins}"/>
128
129	<!-- config for making NBMs for Daily Alpha Update Centre -->
130	<config name="daily-alpha-nbms" modules="${config.daily-alpha-nbms}"/>
131
132	<!-- config for javadoc -->
133	<config name="javadoc" modules="${config.javadoc}"/>
134
135	<!-- config for API signature test builds -->
136	<config name="sigtest" modules="${config.sigtest}"/>
137	</configmods>
138
139	</target>	108	</target>
140		109
141	<target name="check-for-binaries" depends="bootstrap-init" unless="have-binaries-already">	110	<target name="check-for-binaries" depends="bootstrap-init" unless="have-binaries-already">
Lines 631-637 Link Here
631	<!-- It's good idea to call merge target before this one.	600	<!-- It's good idea to call merge target before this one.
632	NbMerge.java can set property "modules" to the list of realy	601	NbMerge.java can set property "modules" to the list of realy
633	built modules (excluding fixedmodules which must build everytime). -->	602	built modules (excluding fixedmodules which must build everytime). -->
634	<for-each startdir=".." target="nbm" locations="${fixedmodules},${modules}"/>	603	<for-each startdir=".." target="nbm" locations="${allmodules}"/>
635	</target>	604	</target>
636	<target name="nbm" description="Dummy target."/>	605	<target name="nbm" description="Dummy target."/>
637		606
Lines 1233-1244 Link Here
1233	<delete dir="${netbeans.dest}"/>	1202	<delete dir="${netbeans.dest}"/>
1234	<delete dir="${test.user.dir}"/>	1203	<delete dir="${test.user.dir}"/>
1235	<delete dir="modules_javadoc"/>	1204	<delete dir="modules_javadoc"/>
		1205	<delete file="moduledefs-tmp.properties"/>
1236	</target>	1206	</target>
1237		1207
1238	<target name="clean" depends="init,localclean"	1208	<target name="clean" depends="init,localclean"
1239	description="Clean out (almost) all build products.">	1209	description="Clean out (almost) all build products.">
1240	<cleanall topdir=".."	1210	<cleanall topdir=".."
1241	modules="${fixedmodules},${modules}"	1211	modules="${allmodules}"
1242	targetname="clean"	1212	targetname="clean"
1243	resolvedependencies="${resolve.clean.dependencies}"	1213	resolvedependencies="${resolve.clean.dependencies}"
1244	deptargetprefix="all-"	1214	deptargetprefix="all-"
Lines 1247-1252 Link Here
1247	</target>	1217	</target>
1248		1218
1249	<target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">	1219	<target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
1250	<echo message="modules=${fixedmodules},${modules}"/>	1220	<echo message="modules=${allmodules}"/>
1251	</target>	1221	</target>
1252	</project>	1222	</project>