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

(-)ant/build.xml (-46 / +45 lines)
Lines 15-55 Link Here
15
-->
15
-->
16
16
17
<project name="ant" default="netbeans" basedir=".">
17
<project name="ant" default="netbeans" basedir=".">
18
  <import file="../nbbuild/default.xml"/> 
18
19
19
  <property name="homepage.base" value="netbeans.org"/>
20
  <target name="init" depends="default.init">
20
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
22
23
  <property name="nbm_alias" value="nb_ide"/>
24
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
26
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
27
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
28
29
  <target name="init">
30
    <ant dir="external" target="unscramble"/>
21
    <ant dir="external" target="unscramble"/>
31
    <ant dir="../libs/external" target="unscramble"/>
22
    <ant dir="../libs/external" target="unscramble"/>
23
    <patternset id="ant.files">
24
      <include name="${nb.modules.dir}/ant.jar"/>
25
      <include name="ant/nblib/bridge.jar"/>
26
      <include name="ant/lib/**"/>
27
    </patternset>
28
29
    <path id="cp">
30
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
34
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
35
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
36
      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
37
      <fileset dir="../libs/external">
38
        <include name="xerces*.jar"/>
39
      </fileset>
40
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
41
    </path>
42
    <path id="cp+ant">
43
      <path refid="cp"/>
44
      <pathelement location="src"/>
45
      <pathelement location="external/lib/ant.jar"/>
46
    </path>
32
  </target>
47
  </target>
33
  
34
  <path id="cp">
35
    <pathelement location="../openide/openide-13javac-workaround.jar"/>
36
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
37
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
38
    <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
39
    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
40
    <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
41
    <pathelement location="../java/api/netbeans/modules/autoload/java-api.jar"/>
42
    <fileset dir="../libs/external">
43
      <include name="xerces*.jar"/>
44
    </fileset>
45
    <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
46
  </path>
47
48
  <path id="cp+ant">
49
    <path refid="cp"/>
50
    <pathelement location="src"/>
51
    <pathelement location="external/lib/ant.jar"/>
52
  </path>
53
48
54
  <target name="compile" depends="init">
49
  <target name="compile" depends="init">
55
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
50
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
Lines 61-78 Link Here
61
  </target>
56
  </target>
62
57
63
  <target name="jars" depends="compile">
58
  <target name="jars" depends="compile">
64
    <mkdir dir="netbeans/modules"/>
59
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
65
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
60
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
66
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
61
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
67
    <locjar jarfile="netbeans/modules/ant.jar"
62
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ant.jar"
68
         manifest="manifest-subst.mf"
63
         manifest="manifest-subst.mf"
69
         basedir="src"
64
         basedir="src"
70
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
65
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
71
	 compress="false">
66
	 compress="false">
72
      <locale name="ja"/>
67
    </jar>
73
    </locjar>
68
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/nblib"/>
74
    <mkdir dir="netbeans/ant/nblib"/>
69
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/ant/nblib/bridge.jar" compress="false">
75
    <jar jarfile="netbeans/ant/nblib/bridge.jar" compress="false">
76
      <fileset dir="src-bridge">
70
      <fileset dir="src-bridge">
77
        <excludesfile name="../nbbuild/standard-jar-excludes.txt"/>
71
        <excludesfile name="../nbbuild/standard-jar-excludes.txt"/>
78
      </fileset>
72
      </fileset>
Lines 80-99 Link Here
80
  </target>
74
  </target>
81
75
82
  <target name="release" depends="init">
76
  <target name="release" depends="init">
83
    <mkdir dir="netbeans/ant/lib"/>
77
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/lib"/>
84
    <copy todir="netbeans/ant/lib">
78
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/ant/lib">
85
      <fileset dir="external/lib"/>
79
      <fileset dir="external/lib"/>
86
    </copy>
80
    </copy>
87
  </target>
81
  </target>
88
82
89
  <target name="netbeans" depends="jars,release" description="Build module.">
83
  <target name="netbeans" depends="jars,release" description="Build module.">
90
    <genlist targetname="nbm" outputfiledir="netbeans"/>
84
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/ant.jar">
85
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
86
        <patternset refID="ant.files"/>
87
      </fileset>
88
    </genlist>
91
  </target>
89
  </target>
92
90
93
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
91
  <target name="nbm" depends="netbeans" description="Build module NBM file.">
94
    <makenbm file="ant.nbm"
92
    <makenbm file="ant.nbm"
95
             topdir="."
93
             productdir="${netbeans.dest.dir}/${cluster.dir}"
96
             module="netbeans/modules/ant.jar"
94
             module="${nb.modules.dir}/ant.jar"
97
	     homepage="http://ant.${homepage.base}/"
95
	     homepage="http://ant.${homepage.base}/"
98
	     distribution="http://${dist.base}/ant.nbm">
96
	     distribution="http://${dist.base}/ant.nbm">
99
      <license name="ant-license.txt">
97
      <license name="ant-license.txt">
Lines 110-116 Link Here
110
    <nbinstaller module="netbeans/modules/ant.jar" action="reinstall"/>
108
    <nbinstaller module="netbeans/modules/ant.jar" action="reinstall"/>
111
  </target>
109
  </target>
112
110
113
  <target name="clean" description="Clean out build products.">
111
  <target name="clean" depends="init" description="Clean out build products.">
114
    <delete>
112
    <delete>
115
      <fileset dir="src">
113
      <fileset dir="src">
116
        <include name="**/*.class"/>
114
        <include name="**/*.class"/>
Lines 118-128 Link Here
118
      <fileset dir="src-bridge">
116
      <fileset dir="src-bridge">
119
        <include name="**/*.class"/>
117
        <include name="**/*.class"/>
120
      </fileset>
118
      </fileset>
119
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
120
        <patternset refID="ant.files"/>
121
      </fileset>
121
    </delete>
122
    </delete>
122
    <delete file="manifest-subst.mf"/>
123
    <delete file="manifest-subst.mf"/>
123
    <delete file="ant.nbm"/>
124
    <delete file="ant.nbm"/>
124
    <delete dir="netbeans"/>
125
    <delete dir="Info"/>
126
    <delete dir="javadoc"/>
125
    <delete dir="javadoc"/>
127
    <!-- See target 'release-helper': -->
126
    <!-- See target 'release-helper': -->
128
    <delete dir="release-work"/>
127
    <delete dir="release-work"/>
Lines 229-235 Link Here
229
</echo>
228
</echo>
230
  </target>
229
  </target>
231
230
232
    <target name="javadoc" description="Build Javadoc.">
231
    <target name="javadoc" depends="init" description="Build Javadoc.">
233
        <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
232
        <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
234
            <property name="javadoc.base" location="."/>
233
            <property name="javadoc.base" location="."/>
235
            <property name="javadoc.name" value="AntModuleAPI"/>
234
            <property name="javadoc.name" value="AntModuleAPI"/>
(-)applet/build.xml (-45 / +41 lines)
Lines 13-86 Link Here
13
-->
13
-->
14
14
15
<project name="applet" default="netbeans" basedir=".">
15
<project name="applet" default="netbeans" basedir=".">
16
  
16
  <import file="../nbbuild/default.xml"/> 
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
17
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
19
    <patternset id="applet.files">
20
      <include name="${nb.modules.dir}/applet.jar"/>
21
    </patternset>
24
22
25
  <target name="compile">
23
    <path id="cp">
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
28
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
29
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
30
      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
31
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
32
    </path>
33
  </target>
34
35
  <target name="compile" depends="init">
26
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
36
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27
      <classpath>
37
      <classpath refID="cp"/>
28
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
29
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
30
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
31
        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
32
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
33
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
34
	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
35
	<pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
36
	<!--<pathelement location="../html/netbeans/modules/html.jar"/> -->
37
      </classpath>
38
    </javac>
38
    </javac>
39
  </target>
39
  </target>
40
40
  <target name="jars" depends="compile">
41
  <target name="jars" depends="compile">
41
    <mkdir dir="netbeans/modules"/>
42
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
42
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
45
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/applet.jar"
45
    <locjar jarfile="netbeans/modules/applet.jar"
46
         manifest="manifest-subst.mf"
46
            manifest="manifest-subst.mf"
47
         basedir="src"
47
            basedir="src"
48
         excludesfile="../nbbuild/standard-jar-excludes.txt"
48
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
49
	 compress="false">
49
	    compress="false">
50
    </jar>
50
      <locale name="ja"/>
51
      <!-- Not using locale kits yet... -->
52
      <!-- <localekit dir="src" includesfile="../nbbuild/standard-localekit-includes.txt"/> -->
53
    </locjar>
54
  </target>
51
  </target>
55
52
56
  <target name="netbeans" depends="jars">
53
  <target name="netbeans" depends="jars">
57
    <genlist targetname="nbm" outputfiledir="netbeans"/>
54
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/applet.jar">
55
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
56
        <patternset refID="applet.files"/>
57
      </fileset>
58
    </genlist>
58
  </target>
59
  </target>
59
60
60
  <target name="nbm" depends="netbeans">
61
  <target name="nbm" depends="netbeans">
61
    <makenbm file="applet.nbm"
62
    <makenbm file="applet.nbm"
62
             topdir="."
63
             productdir="${netbeans.dest.dir}/${cluster.dir}"
63
             module="netbeans/modules/applet.jar"
64
             module="${nb.modules.dir}/applet.jar"
64
	     homepage="http://applet.${homepage.base}/"
65
	     homepage="http://applet.${homepage.base}/"
65
	     distribution="http://${dist.base}/applet.nbm">
66
	     distribution="http://${dist.base}/applet.nbm">
66
      <license file="${license.file}"/>
67
      <license file="${license.file}"/>
67
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
68
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
68
    </makenbm>
69
    </makenbm>
69
  </target>
70
  </target>
70
  <target name="clean">
71
72
  <target name="clean" depends="init">
71
    <delete>
73
    <delete>
72
      <fileset dir="src">
74
      <fileset dir="src">
73
        <include name="**/*.class"/>
75
        <include name="**/*.class"/>
74
      </fileset>
76
      </fileset>
77
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
78
        <patternset refID="applet.files"/>
79
      </fileset>
75
    </delete>
80
    </delete>
76
    <delete file="manifest-subst.mf"/>
81
    <delete file="manifest-subst.mf"/>
77
    <delete file="applet.nbm"/>
82
    <delete file="applet.nbm"/>
78
    <delete dir="netbeans"/>
79
    <delete dir="javadoc"/>
83
    <delete dir="javadoc"/>
80
    <delete dir="Info"/>
81
  </target>
84
  </target>
82
85
83
  <target name="javadoc" description="Build applet module API documentation.">
86
  <target name="javadoc" depends="init" description="Build applet module API documentation.">
84
    <tstamp/>
87
    <tstamp/>
85
    <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
88
    <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
86
    <property name="openide-docs-location" value="http://www.netbeans.org/download/apis/"/>
89
    <property name="openide-docs-location" value="http://www.netbeans.org/download/apis/"/>
Lines 101-114 Link Here
101
      <sourcepath>
104
      <sourcepath>
102
        <pathelement location="src"/>
105
        <pathelement location="src"/>
103
      </sourcepath>
106
      </sourcepath>
104
      <classpath>
107
      <classpath refID="cp"/> 
105
        <!-- this classpath probably should be the same as for compilation -->
106
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
107
        <fileset dir="../openide/netbeans/lib">
108
          <include name="openide*.jar" />
109
        </fileset>
110
	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
111
      </classpath>
112
      <link href="${jdk-docs-location}"
108
      <link href="${jdk-docs-location}"
113
            offline="true"
109
            offline="true"
114
            packagelistLoc="../openide/api/doc"
110
            packagelistLoc="../openide/api/doc"
(-)autoupdate/build.xml (-41 / +41 lines)
Lines 13-41 Link Here
13
-->
13
-->
14
14
15
<project name="autoupdate" default="netbeans" basedir=".">
15
<project name="autoupdate" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="autoupdate.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/autoupdate.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
      <include name="${nb.lib.dir}/updater.jar"/>
21
22
    </patternset>
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
23
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
24
    <path id="cp">
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
25
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
  
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
  <path id="cp">
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
    <pathelement location="../openide/openide-13javac-workaround.jar"/>
28
      <pathelement location="libsrc"/>
28
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
29
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
29
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
      <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
30
    <pathelement location="libsrc"/>
31
      <!-- commenting out for now, readd if required: -jglick
31
    <pathelement location="../core/netbeans/lib/core.jar"/>
32
      <pathelement location="src" />
32
    <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
33
      -->
33
    <!-- commenting out for now, readd if required: -jglick
34
    </path>
34
    <pathelement location="src" />
35
  </target>
35
    -->
36
  </path>
37
36
38
  <target name="compile">
37
  <target name="compile" depends="init">
39
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"/>
38
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"/>
40
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
39
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
      <classpath refid="cp" />
40
      <classpath refid="cp" />
Lines 43-76 Link Here
43
  </target>
42
  </target>
44
43
45
  <target name="jars" depends="compile">
44
  <target name="jars" depends="compile">
46
    <mkdir dir="netbeans/modules"/>
45
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
47
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
46
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
47
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
48
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/autoupdate.jar"
50
    <locjar jarfile="netbeans/modules/autoupdate.jar"
49
         manifest="manifest-subst.mf"
51
            manifest="manifest-subst.mf"
50
         basedir="src"
52
            basedir="src"
51
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
53
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
52
	 compress="false"/>
54
	    compress="false">
53
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
55
      <locale name="ja"/>
54
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/updater.jar"
56
    </locjar>
57
    <mkdir dir="netbeans/lib"/>
58
    <locjar jarfile="netbeans/lib/updater.jar"
59
         basedir="libsrc"
55
         basedir="libsrc"
60
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
56
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
61
	 compress="false">
57
	 compress="false"/>
62
      <locale name="ja"/>
63
    </locjar>
64
  </target>
58
  </target>
65
59
66
  <target name="netbeans" depends="jars">
60
  <target name="netbeans" depends="jars">
67
    <genlist targetname="nbm" outputfiledir="netbeans"/>
61
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/autoupdate.jar">
62
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
63
        <patternset refID="autoupdate.files"/>
64
      </fileset>
65
    </genlist>
68
  </target>
66
  </target>
69
67
70
  <target name="nbm" depends="netbeans">
68
  <target name="nbm" depends="netbeans">
71
    <makenbm file="autoupdate.nbm"
69
    <makenbm file="autoupdate.nbm"
72
             topdir="."
70
             productdir="${netbeans.dest.dir}/${cluster.dir}"
73
             module="netbeans/modules/autoupdate.jar"
71
             module="${nb.modules.dir}/autoupdate.jar"
74
	     homepage="http://${homepage.base}/"
72
	     homepage="http://${homepage.base}/"
75
	     distribution="http://${dist.base}/autoupdate.nbm"
73
	     distribution="http://${dist.base}/autoupdate.nbm"
76
		 excludes="netbeans/lib,netbeans/lib/*"> 
74
		 excludes="netbeans/lib,netbeans/lib/*"> 
Lines 79-85 Link Here
79
    </makenbm>
77
    </makenbm>
80
  </target>
78
  </target>
81
79
82
  <target name="clean">
80
  <target name="clean" depends="init">
83
    <delete>
81
    <delete>
84
      <fileset dir="src">
82
      <fileset dir="src">
85
        <include name="**/*.class"/>
83
        <include name="**/*.class"/>
Lines 87-101 Link Here
87
      <fileset dir="libsrc">
85
      <fileset dir="libsrc">
88
        <include name="**/*.class"/>
86
        <include name="**/*.class"/>
89
      </fileset>
87
      </fileset>
88
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
89
        <patternset refID="autoupdate.files"/>
90
      </fileset>
90
    </delete>
91
    </delete>
91
    <delete file="manifest-subst.mf"/>
92
    <delete file="manifest-subst.mf"/>
92
    <delete file="autoupdate.nbm"/>
93
    <delete file="autoupdate.nbm"/>
93
    <delete dir="netbeans"/>
94
    <delete dir="javadoc"/>
94
    <delete dir="javadoc"/>
95
    <delete dir="Info"/>
95
    <delete dir="Info"/>
96
  </target>
96
  </target>
97
97
98
  <target name="javadoc" description="Build autoupdate module API documentation.">
98
  <target name="javadoc" depends="init" description="Build autoupdate module API documentation.">
99
        <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
99
        <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
100
            <property name="javadoc.base" location="."/>
100
            <property name="javadoc.base" location="."/>
101
            <property name="javadoc.name" value="AutoUpdateAPI"/>
101
            <property name="javadoc.name" value="AutoUpdateAPI"/>
(-)autoupdate/updatecenters/build.xml (-23 / +29 lines)
Lines 13-45 Link Here
13
-->
13
-->
14
14
15
<project name="autoupdate/updatecenters" default="netbeans" basedir=".">
15
<project name="autoupdate/updatecenters" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <property name="nbroot" value="../.."/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="autoupdate/updatecenters.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/eager/autoupdate-updatecenters.jar"/>
20
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
  
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25
22
26
  <target name="jars">
23
    <path id="cp">
27
    <mkdir dir="netbeans/modules/eager"/>
24
    </path>
25
  </target>
26
27
  <target name="jars" depends="init">
28
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/eager"/>
28
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
29
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
29
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
30
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
30
    <locjar jarfile="netbeans/modules/eager/autoupdate-updatecenters.jar"
31
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/eager/autoupdate-updatecenters.jar"
31
            manifest="manifest-subst.mf"
32
         manifest="manifest-subst.mf"
32
            basedir="src"
33
         basedir="src"
33
	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
34
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
34
	    compress="false">
35
	 compress="false"/>
35
        <locale name="ja"/>
36
    </locjar>
37
  </target>
36
  </target>
38
37
39
  <target name="nbm" depends="netbeans">
38
  <target name="nbm" depends="netbeans">
40
    <makenbm file="autoupdate-updatecenters.nbm"
39
    <makenbm file="autoupdate-updatecenters.nbm"
41
             topdir="."
40
             productdir="${netbeans.dest.dir}/${cluster.dir}"
42
             module="netbeans/modules/eager/autoupdate-updatecenters.jar"
41
             module="${nb.modules.dir}/eager/autoupdate-updatecenters.jar"
43
             homepage="http://${homepage.base}"
42
             homepage="http://${homepage.base}"
44
	     distribution="http://${dist.base}/autoupdate-updatescenters.nbm">
43
	     distribution="http://${dist.base}/autoupdate-updatescenters.nbm">
45
      <license file="${license.file}"/>
44
      <license file="${license.file}"/>
Lines 48-61 Link Here
48
  </target>
47
  </target>
49
48
50
  <target name="netbeans" depends="jars">
49
  <target name="netbeans" depends="jars">
51
    <!-- XXX is this the right outputfiledir? -->
50
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/eager/autoupdate-updatecenters.jar">
52
    <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
51
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
52
        <patternset refID="autoupdate/updatecenters.files"/>
53
      </fileset>
54
    </genlist>
53
  </target>
55
  </target>
54
56
55
  <target name="clean">
57
  <target name="clean" depends="init">
58
    <delete>
59
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
60
        <patternset refID="autoupdate/updatecenters.files"/>
61
      </fileset>
62
    </delete>
56
    <delete file="manifest-subst.mf"/>
63
    <delete file="manifest-subst.mf"/>
57
    <delete file="autoupdate-updatecenters.nbm"/>
64
    <delete file="autoupdate-updatecenters.nbm"/>
58
    <delete dir="netbeans"/>
59
    <delete dir="Info"/>
65
    <delete dir="Info"/>
60
  </target>
66
  </target>
61
67
(-)beans/build.xml (-43 / +38 lines)
Lines 13-83 Link Here
13
-->
13
-->
14
14
15
<project name="beans" default="netbeans" basedir=".">
15
<project name="beans" default="netbeans" basedir=".">
16
  
16
  <import file="../nbbuild/default.xml"/> 
17
  <property name="nbm_alias" value="nb_ide"/>
17
18
  <property name="homepage.base" value="netbeans.org"/>
18
  <target name="init" depends="default.init">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19
    <patternset id="beans.files">
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
20
      <include name="${nb.modules.dir}/beans.jar"/>
21
    </patternset>
21
22
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
    <path id="cp">
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
28
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
29
      <pathelement location="${jdkhome}/lib/tools.jar"/>
30
    </path>
31
  </target>
24
32
25
  <target name="compile">
33
  <target name="compile" depends="init">
26
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27
      <classpath>
35
      <classpath refID="cp"/>
28
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
29
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
30
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
31
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
32
	<pathelement location="../java/netbeans/modules/java.jar"/>
33
	<pathelement location="{java.home}/lib/tools.jar"/>
34
      </classpath>
35
    </javac>
36
    </javac>
36
  </target>
37
  </target>
38
37
  <target name="jars" depends="compile">
39
  <target name="jars" depends="compile">
38
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
40
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
39
    <mkdir dir="netbeans/modules"/>
40
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <locjar jarfile="netbeans/modules/beans.jar"
43
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/beans.jar"
43
            manifest="manifest-subst.mf"
44
         manifest="manifest-subst.mf"
44
            basedir="src"
45
         basedir="src"
45
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
46
         excludesfile="../nbbuild/standard-jar-excludes.txt"
46
	    compress="false">
47
         compress="false"/>
47
      <locale name="ja"/>
48
      <!-- Not yet: -->
49
      <!-- <localekit dir="src" includesfile="../nbbuild/standard-localekit-includes.txt"/> -->
50
    </locjar>
51
  </target>
48
  </target>
52
  
49
  
53
  <target name="netbeans" depends="jars">
50
  <target name="netbeans" depends="jars">
54
    <genlist targetname="nbm" outputfiledir="netbeans"/>
51
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/beans.jar">
52
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
        <patternset refID="beans.files"/>
54
      </fileset>
55
    </genlist>
55
  </target>
56
  </target>
56
 
57
 
57
  <target name="nbm" depends="netbeans">
58
  <target name="nbm" depends="netbeans">
58
    <makenbm file="beans.nbm"
59
    <makenbm file="beans.nbm"
59
             topdir="."
60
             productdir="${netbeans.dest.dir}/${cluster.dir}"
60
             module="netbeans/modules/beans.jar"
61
             module="${nb.modules.dir}/beans.jar"
61
	     homepage="http://beans.${homepage.base}/"
62
	     homepage="http://beans.${homepage.base}/"
62
	     distribution="http://${dist.base}/beans.nbm">
63
	     distribution="http://${dist.base}/beans.nbm">
63
      <license file="${license.file}"/>
64
      <license file="${license.file}"/>
64
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
65
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
65
    </makenbm>
66
    </makenbm>
66
  </target>
67
  </target>
67
  <target name="clean">
68
69
  <target name="clean" depends="init">
68
    <delete>
70
    <delete>
69
      <fileset dir="src">
71
      <fileset dir="src">
70
        <include name="**/*.class"/>
72
        <include name="**/*.class"/>
71
      </fileset>
73
      </fileset>
74
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
        <patternset refID="beans.files"/>
76
      </fileset>
72
    </delete>
77
    </delete>
73
    <delete file="manifest-subst.mf"/>
78
    <delete file="manifest-subst.mf"/>
74
    <delete file="beans.nbm"/>
79
    <delete file="beans.nbm"/>
75
    <delete dir="netbeans"/>
76
    <delete dir="javadoc"/>
80
    <delete dir="javadoc"/>
77
    <delete dir="Info"/>
78
  </target>
81
  </target>
79
82
80
  <target name="javadoc" description="Build beans module API documentation.">
83
  <target name="javadoc" depends="init" description="Build beans module API documentation.">
81
    <tstamp/>
84
    <tstamp/>
82
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
85
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
83
    <echo message="Build beans module API documentation..."/>
86
    <echo message="Build beans module API documentation..."/>
Lines 96-110 Link Here
96
      <sourcepath>
99
      <sourcepath>
97
        <pathelement location="src"/>
100
        <pathelement location="src"/>
98
      </sourcepath>
101
      </sourcepath>
99
      <classpath>
102
      <classpath refID="cp"/>
100
        <!-- this classpath probably should be the same as for compilation -->
101
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
102
        <fileset dir="../openide/netbeans/lib">
103
          <include name="openide*.jar" />
104
        </fileset>
105
	<pathelement location="../java/netbeans/modules/java.jar"/>
106
	<pathelement location="{java.home}/lib/tools.jar"/>
107
      </classpath>
108
    </javadoc>    
103
    </javadoc>    
109
  </target>
104
  </target>
110
105
(-)classfile/build.xml (-15 / +25 lines)
Lines 13-37 Link Here
13
-->
13
-->
14
14
15
<project name="classfile" default="netbeans" basedir=".">
15
<project name="classfile" default="netbeans" basedir=".">
16
  <property name="homepage.base" value="netbeans.org"/>
16
  <import file="../nbbuild/default.xml"/> 
17
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
18
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
19
  <property name="nbm_alias" value="nb_ide"/>
20
21
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
17
25
  <target name="compile">
18
  <target name="init" depends="default.init">
19
    <patternset id="classfile.files">
20
      <include name="${nb.modules/autoload.dir}/classfile.jar"/>
21
    </patternset>
22
    <path id="cp">
23
      <!-- Empty -->
24
    </path>
25
  </target>
26
27
  <target name="compile" depends="init">
26
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
      <classpath refID="cp"/>
27
    </javac>
30
    </javac>
28
  </target>
31
  </target>
29
32
30
  <target name="jars" depends="compile">
33
  <target name="jars" depends="compile">
31
    <mkdir dir="netbeans/modules/autoload" />
34
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}" />
32
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
35
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
33
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
36
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
34
    <jar jarfile="netbeans/modules/autoload/classfile.jar" 
37
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/classfile.jar" 
35
     manifest="manifest-subst.mf" 
38
     manifest="manifest-subst.mf" 
36
     basedir="src" 
39
     basedir="src" 
37
     excludesfile="../nbbuild/standard-jar-excludes.txt" 
40
     excludesfile="../nbbuild/standard-jar-excludes.txt" 
Lines 39-51 Link Here
39
  </target>
42
  </target>
40
43
41
  <target name="netbeans" depends="jars">
44
  <target name="netbeans" depends="jars">
42
    <genlist targetname="nbm" outputfiledir="netbeans"/>
45
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/classfile.jar">
46
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
47
        <patternset refID="classfile.files"/>
48
      </fileset>
49
    </genlist>
43
  </target>
50
  </target>
44
51
45
  <target name="nbm" depends="netbeans">
52
  <target name="nbm" depends="netbeans">
46
    <makenbm file="classfile.nbm"
53
    <makenbm file="classfile.nbm"
47
             topdir="."
54
             productdir="${netbeans.dest.dir}/${cluster.dir}"
48
             module="netbeans/modules/autoload/classfile.jar"
55
             module="${nb.modules/autoload.dir}/classfile.jar"
49
	     homepage="http://classfile.${homepage.base}/"
56
	     homepage="http://classfile.${homepage.base}/"
50
	     distribution="http://${dist.base}/classfile.nbm">
57
	     distribution="http://${dist.base}/classfile.nbm">
51
      <license file="${license.file}"/>
58
      <license file="${license.file}"/>
Lines 53-62 Link Here
53
    </makenbm>
60
    </makenbm>
54
  </target>
61
  </target>
55
62
56
  <target name="clean">
63
  <target name="clean" depends="init">
57
    <delete>
64
    <delete>
58
      <fileset dir="src">
65
      <fileset dir="src">
59
        <include name="**/*.class"/>
66
        <include name="**/*.class"/>
67
      </fileset>
68
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
69
        <patternset refID="classfile.files"/>
60
      </fileset>
70
      </fileset>
61
    </delete>
71
    </delete>
62
    <delete file="manifest-subst.mf"/>
72
    <delete file="manifest-subst.mf"/>
(-)clazz/build.xml (-41 / +40 lines)
Lines 13-74 Link Here
13
-->
13
-->
14
14
15
<project name="clazz" default="netbeans" basedir=".">
15
<project name="clazz" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="clazz.files">
20
      <include name="${nb.modules.dir}/clazz.jar"/>
21
    </patternset>
22
    <path id="cp">
23
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
24
      <pathelement location="${classfile.dir}/${nb.modules/autoload.dir}/classfile.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
28
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
29
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
30
    </path>
31
  </target>
16
32
17
  <property name="nbm_alias" value="nb_ide"/>
33
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
25
  <target name="compile">
26
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27
      <classpath>
35
      <classpath refID="cp"/>
28
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
29
	<pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
30
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
31
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
33
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
34
        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
35
      </classpath>
36
    </javac>
36
    </javac>
37
  </target>
37
  </target>
38
38
  <target name="jars" depends="compile">
39
  <target name="jars" depends="compile">
39
    <mkdir dir="netbeans/modules"/>
40
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
40
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
43
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/clazz.jar"
43
    <locjar jarfile="netbeans/modules/clazz.jar"
44
         manifest="manifest-subst.mf"
44
            manifest="manifest-subst.mf"
45
         basedir="src"
45
            basedir="src"
46
         excludesfile="../nbbuild/standard-jar-excludes.txt"
46
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
47
         compress="false"/>
47
	    compress="false">
48
      <locale name="ja"/>
49
    </locjar>
50
  </target>
48
  </target>
51
49
52
  <target name="netbeans" depends="jars">
50
  <target name="netbeans" depends="jars">
53
    <genlist targetname="nbm" outputfiledir="netbeans"/>
51
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/clazz.jar">
52
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
        <patternset refID="clazz.files"/>
54
      </fileset>
55
    </genlist>
54
  </target>
56
  </target>
55
57
56
  <target name="nbm" depends="netbeans">
58
  <target name="nbm" depends="netbeans">
57
    <makenbm file="clazz.nbm"
59
    <makenbm file="clazz.nbm"
58
             topdir="."
60
             productdir="${netbeans.dest.dir}/${cluster.dir}"
59
             module="netbeans/modules/clazz.jar"
61
             module="${nb.modules.dir}/clazz.jar"
60
	     homepage="http://clazz.${homepage.base}/"
62
             homepage="http://clazz.${homepage.base}/"
61
	     distribution="http://${dist.base}/clazz.nbm">
63
             distribution="http://${dist.base}/clazz.nbm">
62
      <license file="${license.file}"/>
64
      <license file="${license.file}"/>
63
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
65
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
64
    </makenbm>
66
    </makenbm>
65
  </target>
67
  </target>
66
68
67
  <target name="clean">
69
  <target name="clean" depends="init">
68
    <delete>
70
    <delete>
69
      <fileset dir="src">
71
      <fileset dir="src">
70
        <include name="**/*.class"/>
72
        <include name="**/*.class"/>
71
      </fileset>
73
      </fileset>
74
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
        <patternset refID="clazz.files"/>
76
      </fileset>
72
    </delete>
77
    </delete>
73
    <delete file="manifest-subst.mf"/>
78
    <delete file="manifest-subst.mf"/>
74
    <delete file="clazz.nbm"/>
79
    <delete file="clazz.nbm"/>
Lines 95-101 Link Here
95
    <nbinstaller action="reinstall" module="reload/clazz.jar"/>
100
    <nbinstaller action="reinstall" module="reload/clazz.jar"/>
96
  </target>
101
  </target>
97
102
98
  <target name="javadoc" description="Build clazz module API documentation.">
103
  <target name="javadoc" depends="init" description="Build clazz module API documentation.">
99
    <tstamp/>
104
    <tstamp/>
100
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
105
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
101
    <echo message="Build clazz module API documentation..."/>
106
    <echo message="Build clazz module API documentation..."/>
Lines 114-126 Link Here
114
      <sourcepath>
119
      <sourcepath>
115
        <pathelement location="src"/>
120
        <pathelement location="src"/>
116
      </sourcepath>
121
      </sourcepath>
117
      <classpath>
122
      <classpath refID="cp"/> 
118
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
119
	<pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
120
        <fileset dir="../openide/netbeans/lib">
121
          <include name="openide*.jar" />
122
        </fileset>
123
      </classpath>
124
    </javadoc>    
123
    </javadoc>    
125
  </target>
124
  </target>
126
125
(-)core/build.xml (-39 / +64 lines)
Lines 13-90 Link Here
13
-->
13
-->
14
14
15
<project name="core" default="netbeans" basedir=".">
15
<project name="core" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
19
    <patternset id="core.files">
19
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
20
      <include name="${nb.lib.dir}/core.jar"/>
20
  <property name="homepage.base" value="netbeans.org"/>
21
      <include name="${nb.lib.dir}/ide.ks"/>
21
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
      <include name="${nb.lib.dir}/ext/boot.jar"/>
22
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
23
      <include name="${nb.bin.dir}/.runide_defaults.sh"/>
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"/>
27
      <include name="${nb.bin.dir}/runide.exe"/>
28
      <include name="${nb.bin.dir}/runide.sh"/>
29
      <include name="${nb.bin.dir}/runide_exe_defaults"/>
30
      <include name="${nb.bin.dir}/runideopenvms.com"/>
31
      <include name="${nb.bin.dir}/runideos2.cmd"/>
32
      <include name="${nb.bin.dir}/runidew.exe"/>
33
      <include name="${nb.system.dir}/ModuleAutoDeps/org-netbeans-core.xml"/>
34
      <include name="CREDITS.html"/>
35
    </patternset>
36
    <path id="cp">
37
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
38
      <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 -->
40
      <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"/>
42
    </path>
43
  </target>
23
44
24
  <target name="compile" depends="boot">
45
  <target name="compile" depends="init,boot">
25
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
46
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
26
      <classpath>
47
      <classpath refid="cp"/>
27
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
28
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
29
        <pathelement location="../openide/explorer/netbeans/lib/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->
30
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/> <!-- XXX remove soon -->
31
        <pathelement location="netbeans/lib/ext/boot.jar"/>
32
      </classpath>
33
    </javac>
48
    </javac>
34
  </target>
49
  </target>
35
50
36
  <!-- XXX move to bootstrap/build.xml -->  
51
  <!-- XXX move to bootstrap/build.xml -->  
37
  <target name="boot">
52
  <target name="boot" depends="init">
38
    <javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>
53
    <javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>
39
    <mkdir dir="netbeans/lib/ext" />
54
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext" />
40
    <jar jarfile="netbeans/lib/ext/boot.jar"
55
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext/boot.jar"
41
            basedir="bootstrap/src"
56
            basedir="bootstrap/src"
42
            excludesfile="../nbbuild/standard-jar-excludes.txt"
57
            excludesfile="../nbbuild/standard-jar-excludes.txt"
43
	    compress="false">
58
	    compress="false">
44
    </jar>
59
    </jar>
45
  </target>
60
  </target>
46
61
47
  <target name="jars" depends="compile">
62
  <target name="jars" depends="init,compile">
48
    <mkdir dir="netbeans/lib"/>
63
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
49
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
64
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
50
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
65
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
51
    <locjar jarfile="netbeans/lib/core.jar"
66
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/core.jar"
52
            basedir="src"
67
            basedir="src"
53
            manifest="manifest-subst.mf"
68
            manifest="manifest-subst.mf"
54
            excludesfile="../nbbuild/standard-jar-excludes.txt"
69
            excludesfile="../nbbuild/standard-jar-excludes.txt"
55
            excludes="org/netbeans/*class"
70
            excludes="org/netbeans/*class"
56
	    compress="false">
71
	    compress="false"/>
57
      <locale name="ja"/>
58
    </locjar>
59
  </target>
72
  </target>
60
73
61
  <target name="release">
74
  <target name="release" depends="init">
62
    <copy todir="netbeans" includeEmptyDirs="false">
75
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" includeEmptyDirs="false">
63
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
76
      <fileset dir="release/bin" excludesfile="../nbbuild/standard-jar-excludes.txt">
64
        <!-- These do not currently work anyway: -->
77
        <!-- These do not currently work anyway: -->
65
        <exclude name="bin/unsupported/nbscript*"/>
78
        <exclude name="unsupported/nbscript*"/>
66
      </fileset>
79
      </fileset>
67
    </copy>
80
    </copy>
68
    <fixcrlf srcdir="netbeans/bin" eol="crlf">
81
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}" includeEmptyDirs="false">
82
      <fileset dir="release/lib" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
83
    </copy>
84
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}" includeEmptyDirs="false">
85
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
86
    </copy>
87
    
88
    <fixcrlf srcdir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" eol="crlf">
69
      <include name="**/*.bat"/>
89
      <include name="**/*.bat"/>
70
      <include name="**/*.cmd"/>
90
      <include name="**/*.cmd"/>
71
    </fixcrlf>
91
    </fixcrlf>
72
    <fixcrlf srcdir="netbeans/bin" eol="lf">
92
    <fixcrlf srcdir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" eol="lf">
73
      <include name="**/*.sh"/>
93
      <include name="**/*.sh"/>
74
      <include name="**/ide.cfg"/>
94
      <include name="**/ide.cfg"/>
75
    </fixcrlf>
95
    </fixcrlf>
76
  </target>
96
  </target>
77
97
78
  <target name="netbeans" depends="jars,release" description="Build everything.">
98
  <target name="netbeans" depends="init,jars,release" description="Build everything.">
79
    <mkdir dir="netbeans/lib/patches"/>
99
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib/patches.dir}"/>
80
    <mkdir dir="netbeans/modules"/>
100
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
81
    <genlist targetname="nbm" outputfiledir="netbeans"/>
101
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/core.jar">
102
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
103
        <patternset refID="core.files"/>
104
      </fileset>
105
    </genlist>
82
  </target>
106
  </target>
83
107
84
  <target name="nbm" depends="netbeans" description="Build an NBM.">
108
  <target name="nbm" depends="netbeans" description="Build an NBM.">
85
    <makenbm file="core.nbm"
109
    <makenbm file="core.nbm"
86
             topdir="."
110
             productdir="${netbeans.dest.dir}/${cluster.dir}"
87
             module="netbeans/lib/core.jar"
111
             module="${nb.lib.dir}/core.jar"
88
	     homepage="http://core.${homepage.base}/"
112
	     homepage="http://core.${homepage.base}/"
89
	     distribution="http://${dist.base}/core.nbm">
113
	     distribution="http://${dist.base}/core.nbm">
90
      <license file="${license.file}"/>
114
      <license file="${license.file}"/>
Lines 92-98 Link Here
92
    </makenbm>
116
    </makenbm>
93
  </target>
117
  </target>
94
118
95
  <target name="lib-modules" description="Create a standalone Modules API and implementation.">
119
  <target name="lib-modules" description="Create a standalone Modules API and implementation." depends="init">
96
    <mkdir dir="modules-lib/src"/>
120
    <mkdir dir="modules-lib/src"/>
97
    <copy todir="modules-lib/src">
121
    <copy todir="modules-lib/src">
98
      <fileset dir="../openide/src">
122
      <fileset dir="../openide/src">
Lines 143-149 Link Here
143
    </jar>
167
    </jar>
144
  </target>
168
  </target>
145
169
146
  <target name="clean" description="Clean all build products.">
170
  <target name="clean" depends="init" description="Clean all build products.">
147
    <delete>
171
    <delete>
148
      <fileset dir="src">
172
      <fileset dir="src">
149
        <include name="**/*.class"/>
173
        <include name="**/*.class"/>
Lines 154-163 Link Here
154
      <fileset dir=".">
178
      <fileset dir=".">
155
        <include name="*-subst.mf"/>
179
        <include name="*-subst.mf"/>
156
      </fileset>
180
      </fileset>
181
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
182
        <patternset refID="core.files"/>
183
      </fileset>
157
    </delete>
184
    </delete>
158
    <delete dir="netbeans"/>
159
    <delete dir="modules-lib"/>
185
    <delete dir="modules-lib"/>
160
    <delete dir="Info"/>
161
    <delete file="core.nbm"/>
186
    <delete file="core.nbm"/>
162
  </target>
187
  </target>
163
188
(-)core/compiler/build.xml (-32 / +34 lines)
Lines 13-63 Link Here
13
-->
13
-->
14
14
15
<project name="core/compiler" default="netbeans" basedir=".">
15
<project name="core/compiler" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
19
      <patternset id="core/compiler.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
        <include name="${nb.modules/autoload.dir}/core-compiler.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
21
      </patternset>
21
22
      <path id="cp">
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
27
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
28
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
29
        <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
30
      </path>
31
    </target>
25
32
26
    <target name="compile">
33
    <target name="compile" depends="init">
27
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
            <classpath>
35
            <classpath refID="cp"/>
29
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
30
                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
31
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
33
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
34
                <pathelement location="../netbeans/lib/core.jar"/>
35
                <pathelement location="../output/netbeans/modules/autoload/core-output.jar"/>
36
            </classpath>
37
        </javac>
36
        </javac>
38
    </target>
37
    </target>
39
38
40
    <target name="jars" depends="compile">
39
    <target name="jars" depends="compile">
41
        <mkdir dir="netbeans/modules/autoload"/>
40
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <locjar jarfile="netbeans/modules/autoload/core-compiler.jar"
43
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-compiler.jar"
45
                basedir="src"
44
             basedir="src"
46
                manifest="manifest-subst.mf"
45
             manifest="manifest-subst.mf"
47
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
46
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
48
	        compress="false">
47
	     compress="false"/>
49
            <locale name="ja"/>
50
        </locjar>
51
    </target>
48
    </target>
52
49
53
    <target name="netbeans" depends="jars">
50
    <target name="netbeans" depends="jars">
54
        <genlist targetname="nbm" outputfiledir="netbeans"/>
51
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-compiler.jar">
52
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
             <patternset refID="core/compiler.files"/>
54
          </fileset>
55
        </genlist>
55
    </target>
56
    </target>
56
57
57
    <target name="nbm" depends="netbeans">
58
    <target name="nbm" depends="netbeans">
58
        <makenbm file="core-compiler.nbm"
59
        <makenbm file="core-compiler.nbm"
59
                 topdir="."
60
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
60
                 module="netbeans/modules/autoload/core-compiler.jar"
61
                 module="${nb.modules/autoload.dir}/core-compiler.jar"
61
                 homepage="http://core.${homepage.base}/"
62
                 homepage="http://core.${homepage.base}/"
62
                 distribution="http://${dist.base}/core-compiler.nbm">
63
                 distribution="http://${dist.base}/core-compiler.nbm">
63
            <license file="${license.file}"/>
64
            <license file="${license.file}"/>
Lines 65-78 Link Here
65
        </makenbm>
66
        </makenbm>
66
    </target>
67
    </target>
67
68
68
    <target name="clean">
69
    <target name="clean" depends="init">
69
        <delete>
70
        <delete>
70
            <fileset dir="src">
71
            <fileset dir="src">
71
                <include name="**/*.class"/>
72
                <include name="**/*.class"/>
72
            </fileset>
73
            </fileset>
74
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
              <patternset refID="core/compiler.files"/>
76
            </fileset>
73
        </delete>
77
        </delete>
74
        <delete dir="netbeans"/>
75
        <delete dir="Info"/>
76
        <delete file="core-compiler.nbm"/>
78
        <delete file="core-compiler.nbm"/>
77
        <delete file="manifest-subst.mf"/>
79
        <delete file="manifest-subst.mf"/>
78
    </target>
80
    </target>
(-)core/deprecated/build.xml (-35 / +34 lines)
Lines 13-66 Link Here
13
-->
13
-->
14
14
15
<project name="core/deprecated" default="netbeans" basedir=".">
15
<project name="core/deprecated" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
17
   
16
18
17
    <property name="nb_all" value="../.."/>
19
    <target name="init" depends="default.init">
18
20
      <patternset id="core/deprecated.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
        <include name="${nb.modules/autoload.dir}/core-deprecated.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
23
      <path id="cp">
24
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
         <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/>
27
         <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
28
         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
         <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30
      </path>
31
    </target>
22
32
23
    <property name="nbm_alias" value="nb_ide"/>
33
    <target name="compile" depends="init">
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
  
28
    <target name="compile">
29
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
            <classpath>
35
            <classpath refID="cp"/>
31
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
32
                <fileset dir="${nb_all}/openide/netbeans/lib">
33
                    <include name="openide*.jar" />
34
                </fileset>
35
                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
36
                <pathelement location="${nb_all}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/>
37
                <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
38
                <pathelement location="${nb_all}/core/netbeans/lib/core.jar"/>
39
            </classpath>
40
        </javac>
36
        </javac>
41
    </target>
37
    </target>
42
38
43
    <target name="jars" depends="compile">
39
    <target name="jars" depends="compile">
44
        <mkdir dir="netbeans/modules/autoload"/>
40
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
45
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
46
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
47
        <locjar jarfile="netbeans/modules/autoload/core-deprecated.jar"
43
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-deprecated.jar"
48
                manifest="manifest-subst.mf"
44
             manifest="manifest-subst.mf"
49
                basedir="src"
45
             basedir="src"
50
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
46
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
51
	        compress="false">
47
	     compress="false"/>
52
            <locale name="ja"/>
53
        </locjar>
54
    </target>
48
    </target>
55
49
56
    <target name="netbeans" depends="jars">
50
    <target name="netbeans" depends="jars">
57
        <genlist targetname="nbm" outputfiledir="netbeans"/>
51
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-deprecated.jar">
52
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
             <patternset refID="core/deprecated.files"/>
54
          </fileset>
55
        </genlist>
58
    </target>
56
    </target>
59
57
60
    <target name="nbm" depends="netbeans">
58
    <target name="nbm" depends="netbeans">
61
        <makenbm file="core-deprecated.nbm"
59
        <makenbm file="core-deprecated.nbm"
62
                 topdir="."
60
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
63
                 module="netbeans/modules/autoload/core-deprecated.jar"
61
                 module="${nb.modules/autoload.dir}/core-deprecated.jar"
64
                 homepage="http://core.${homepage.base}/"
62
                 homepage="http://core.${homepage.base}/"
65
                 distribution="http://${dist.base}/core-deprecated.nbm">
63
                 distribution="http://${dist.base}/core-deprecated.nbm">
66
            <license file="${license.file}"/>
64
            <license file="${license.file}"/>
Lines 68-83 Link Here
68
        </makenbm>
66
        </makenbm>
69
    </target>
67
    </target>
70
  
68
  
71
    <target name="clean">
69
    <target name="clean" depends="init">
72
        <delete>
70
        <delete>
73
            <fileset dir="src">
71
            <fileset dir="src">
74
                <include name="**/*.class"/>
72
                <include name="**/*.class"/>
75
            </fileset>
73
            </fileset>
74
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
              <patternset refID="core/deprecated.files"/>
76
            </fileset>
76
        </delete>
77
        </delete>
77
        <delete file="manifest-subst.mf"/>
78
        <delete file="manifest-subst.mf"/>
78
        <delete file="core-deprecated.nbm"/>
79
        <delete file="core-deprecated.nbm"/>
79
        <delete dir="netbeans"/>
80
        <delete dir="Info"/>
81
    </target>
80
    </target>
82
  
81
  
83
</project>
82
</project>
(-)core/execution/build.xml (-32 / +35 lines)
Lines 13-63 Link Here
13
-->
13
-->
14
14
15
<project name="core/execution" default="netbeans" basedir=".">
15
<project name="core/execution" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
17
  
16
18
17
    <property name="nbm_alias" value="nb_ide"/>
19
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
20
      <patternset id="core/execution.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21
        <include name="${nb.modules/autoload.dir}/core-execution.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
22
      </patternset>
21
23
      <path id="cp">
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
24
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
25
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
26
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.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"/>
29
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30
        <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
31
      </path>
32
    </target>
25
33
26
    <target name="compile">
34
    <target name="compile" depends="init">
27
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
            <classpath>
36
            <classpath refID="cp"/>
29
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
30
                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
31
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
33
                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
34
                <pathelement location="../netbeans/lib/core.jar"/>
35
                <pathelement location="../netbeans/lib/ext/boot.jar"/>
36
            </classpath>
37
        </javac>
37
        </javac>
38
    </target>
38
    </target>
39
39
40
    <target name="jars" depends="compile">
40
    <target name="jars" depends="compile">
41
        <mkdir dir="netbeans/modules/autoload"/>
41
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <locjar jarfile="netbeans/modules/autoload/core-execution.jar"
44
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-execution.jar"
45
                basedir="src"
45
             basedir="src"
46
                manifest="manifest-subst.mf"
46
             manifest="manifest-subst.mf"
47
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
48
	        compress="false">
48
	     compress="false"/>
49
            <locale name="ja"/>
50
        </locjar>
51
    </target>
49
    </target>
52
50
53
    <target name="netbeans" depends="jars">
51
    <target name="netbeans" depends="jars">
54
        <genlist targetname="nbm" outputfiledir="netbeans"/>
52
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-execution.jar">
53
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
             <patternset refID="core/execution.files"/>
55
          </fileset>
56
        </genlist>
55
    </target>
57
    </target>
56
58
57
    <target name="nbm" depends="netbeans">
59
    <target name="nbm" depends="netbeans">
58
        <makenbm file="core-execution.nbm"
60
        <makenbm file="core-execution.nbm"
59
                 topdir="."
61
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
60
                 module="netbeans/modules/autoload/core-execution.jar"
62
                 module="${nb.modules/autoload.dir}/core-execution.jar"
61
                 homepage="http://core.${homepage.base}/"
63
                 homepage="http://core.${homepage.base}/"
62
                 distribution="http://${dist.base}/core-execution.nbm">
64
                 distribution="http://${dist.base}/core-execution.nbm">
63
            <license file="${license.file}"/>
65
            <license file="${license.file}"/>
Lines 65-79 Link Here
65
        </makenbm>
67
        </makenbm>
66
    </target>
68
    </target>
67
69
68
    <target name="clean">
70
    <target name="clean" depends="init">
69
        <delete>
71
        <delete>
70
            <fileset dir="src">
72
            <fileset dir="src">
71
                <include name="**/*.class"/>
73
                <include name="**/*.class"/>
72
            </fileset>
74
            </fileset>
75
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
76
              <patternset refID="core/execution.files"/>
77
            </fileset>
73
        </delete>
78
        </delete>
74
        <delete dir="netbeans"/>
75
        <delete file="core-execution.nbm"/>
79
        <delete file="core-execution.nbm"/>
76
        <delete dir="Info"/>
77
        <delete file="manifest-subst.mf"/>
80
        <delete file="manifest-subst.mf"/>
78
    </target>
81
    </target>
79
82
(-)core/ide/build.xml (-34 / +43 lines)
Lines 13-74 Link Here
13
-->
13
-->
14
14
15
<project name="core/ide" default="netbeans" basedir=".">
15
<project name="core/ide" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
17
  
16
18
17
    <property name="nbm_alias" value="nb_ide"/>
19
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
20
      <patternset id="core/ide.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21
        <include name="${nb.modules.dir}/core-ide.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
22
        <include name="${nb.bin.dir}/icons/*"/>
21
    <property name="build.sysclasspath" value="ignore"/>
23
        <include name="${nb.bin.dir}/docs/NetBeansWeb.html"/>
22
24
        <include name="CHANGES.html"/>
23
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
25
        <include name="README.html"/>
24
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
26
        <include name="netbeans-whatisnew.css"/>
25
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
27
        <include name="netbeans.css"/>
28
      </patternset>
29
      <path id="cp">
30
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
33
      </path>
34
    </target>
26
35
27
    <target name="compile">
36
    <target name="compile" depends="init">
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
            <classpath>
38
            <classpath refID="cp"/>
30
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
31
                <fileset dir="../../openide/netbeans/lib">
32
                    <include name="openide*.jar" />
33
                </fileset>
34
                <pathelement location="../netbeans/lib/core.jar"/>
35
            </classpath>
36
        </javac>
39
        </javac>
37
    </target>
40
    </target>
38
41
39
    <target name="jars" depends="compile">
42
    <target name="jars" depends="compile">
40
        <mkdir dir="netbeans/modules"/>
43
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <locjar jarfile="netbeans/modules/core-ide.jar"
46
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-ide.jar"
44
                basedir="src"
47
             basedir="src"
45
                manifest="manifest-subst.mf"
48
             manifest="manifest-subst.mf"
46
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
49
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
	        compress="false">
50
	     compress="false"/>
48
            <locale name="ja"/>
49
        </locjar>
50
    </target>
51
    </target>
51
52
52
    <target name="release">
53
    <target name="release" depends="init">
53
        <!-- Note: this will indeed modify working sources if there is a change. -->
54
        <!-- Note: this will indeed modify working sources if there is a change. -->
54
        <!-- That is as desired: want an up-to-date copy of this file. -->
55
        <!-- That is as desired: want an up-to-date copy of this file. -->
55
        <!-- Note also that if www or testwww are not checked out, nothing happens; use CVS copy. -->
56
        <!-- Note also that if www or testwww are not checked out, nothing happens; use CVS copy. -->
56
        <copy file="../../testwww/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
57
        <copy file="../../testwww/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
57
        <copy file="../../www/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
58
        <copy file="../../www/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
58
        <!-- Now the regular parts: -->
59
        <!-- Now the regular parts: -->
59
        <copy todir="netbeans" includeEmptyDirs="false">
60
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" includeEmptyDirs="false">
60
            <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
61
            <fileset dir="release/bin" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
62
        </copy>
63
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}" includeEmptyDirs="false">
64
            <fileset dir="release/docs" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
61
        </copy>
65
        </copy>
62
    </target>
66
    </target>
63
67
64
    <target name="netbeans" depends="jars,release">
68
    <target name="netbeans" depends="jars,release">
65
        <genlist targetname="nbm" outputfiledir="netbeans"/>
69
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-ide.jar">
70
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
71
             <patternset refID="core/ide.files"/>
72
          </fileset>
73
        </genlist>
66
    </target>
74
    </target>
67
75
68
    <target name="nbm" depends="netbeans">
76
    <target name="nbm" depends="netbeans">
69
        <makenbm file="core-ide.nbm"
77
        <makenbm file="core-ide.nbm"
70
                 topdir="."
78
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
71
                 module="netbeans/modules/core-ide.jar"
79
                 module="${nb.modules.dir}/core-ide.jar"
72
                 homepage="http://core.${homepage.base}/"
80
                 homepage="http://core.${homepage.base}/"
73
                 distribution="http://${dist.base}/core-ide.nbm">
81
                 distribution="http://${dist.base}/core-ide.nbm">
74
            <license file="${license.file}"/>
82
            <license file="${license.file}"/>
Lines 76-90 Link Here
76
        </makenbm>
84
        </makenbm>
77
    </target>
85
    </target>
78
86
79
    <target name="clean">
87
    <target name="clean" depends="init">
80
        <delete>
88
        <delete>
81
            <fileset dir="src">
89
            <fileset dir="src">
82
                <include name="**/*.class"/>
90
                <include name="**/*.class"/>
83
            </fileset>
91
            </fileset>
92
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
93
              <patternset refID="core/ide.files"/>
94
            </fileset>
84
        </delete>
95
        </delete>
85
        <delete dir="netbeans"/>
86
        <delete file="core-ide.nbm"/>
96
        <delete file="core-ide.nbm"/>
87
        <delete dir="Info"/>
88
        <delete file="manifest-subst.mf"/>
97
        <delete file="manifest-subst.mf"/>
89
    </target>
98
    </target>
90
99
(-)core/javahelp/build.xml (-36 / +34 lines)
Lines 13-39 Link Here
13
-->
13
-->
14
14
15
<project name="core/javahelp" default="netbeans" basedir=".">
15
<project name="core/javahelp" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
17
  
16
18
17
    <property name="nbm_alias" value="nb_ide"/>
19
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
20
      <patternset id="core/javahelp.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21
        <include name="${nb.modules/autoload.dir}/javahelp-api.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
22
        <include name="${nb.modules/autoload.dir}/ext/jh*.jar"/>
21
23
      </patternset>
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
24
      <path id="cp">
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
25
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
26
         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
    <property name="nbroot" location="../.."/>
27
         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
28
         <fileset dir="../external">
27
    <target name="init">
29
           <include name="jh*.jar"/>
28
        <ant dir="../external" target="unscramble"/>
30
         </fileset>
29
        <path id="cp">
31
      </path>
30
            <pathelement location="../../openide/openide-13javac-workaround.jar"/>
31
            <pathelement location="../../openide/netbeans/lib/openide.jar"/>
32
            <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
33
            <fileset dir="../external">
34
                <include name="jh*.jar"/>
35
            </fileset>
36
        </path>
37
    </target>
32
    </target>
38
33
39
    <target name="compile" depends="init">
34
    <target name="compile" depends="init">
Lines 43-63 Link Here
43
    </target>
38
    </target>
44
39
45
    <target name="jars" depends="compile">
40
    <target name="jars" depends="compile">
46
        <mkdir dir="netbeans/modules/autoload"/>
41
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
47
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
        <locjar jarfile="netbeans/modules/autoload/javahelp-api.jar"
44
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"
50
                basedir="src"
45
             basedir="src"
51
                manifest="manifest-subst.mf"
46
             manifest="manifest-subst.mf"
52
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
53
	        compress="false">
48
             compress="false"/>
54
            <locale name="ja"/>
55
        </locjar>
56
    </target>
49
    </target>
57
50
58
    <target name="release" depends="init">
51
    <target name="release" depends="init">
59
        <mkdir dir="netbeans/modules/autoload/ext"/>
52
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
60
        <copy todir="netbeans/modules/autoload/ext">
53
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
61
            <fileset dir="../external">
54
            <fileset dir="../external">
62
                <include name="jh*.jar"/>
55
                <include name="jh*.jar"/>
63
            </fileset>
56
            </fileset>
Lines 65-77 Link Here
65
    </target>
58
    </target>
66
59
67
    <target name="netbeans" depends="jars,release" description="Build everything.">
60
    <target name="netbeans" depends="jars,release" description="Build everything.">
68
        <genlist targetname="nbm" outputfiledir="netbeans"/>
61
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/javahelp-api.jar">
62
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
63
             <patternset refID="core/javahelp.files"/>
64
          </fileset>
65
        </genlist>
69
    </target>
66
    </target>
70
67
71
    <target name="nbm" depends="netbeans" description="Build NBM.">
68
    <target name="nbm" depends="netbeans" description="Build NBM.">
72
        <makenbm file="javahelp-api.nbm"
69
        <makenbm file="javahelp-api.nbm"
73
                 topdir="."
70
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
74
                 module="netbeans/modules/autoload/javahelp-api.jar"
71
                 module="${nb.modules/autoload.dir}/javahelp-api.jar"
75
                 homepage="http://core.${homepage.base}/"
72
                 homepage="http://core.${homepage.base}/"
76
                 distribution="http://${dist.base}/javahelp-api.nbm">
73
                 distribution="http://${dist.base}/javahelp-api.nbm">
77
            <license name="javahelp-api-license.txt">
74
            <license name="javahelp-api-license.txt">
Lines 97-111 Link Here
97
        <nbinstaller module="reload/javahelp-api.jar" action="reinstall"/>
94
        <nbinstaller module="reload/javahelp-api.jar" action="reinstall"/>
98
    </target>
95
    </target>
99
96
100
    <target name="clean" description="Clean build products.">
97
    <target name="clean" depends="init" description="Clean build products.">
101
        <delete>
98
        <delete>
102
            <fileset dir="src">
99
            <fileset dir="src">
103
                <include name="**/*.class"/>
100
                <include name="**/*.class"/>
104
            </fileset>
101
            </fileset>
102
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
103
              <patternset refID="core/javahelp.files"/>
104
            </fileset>
105
        </delete>
105
        </delete>
106
        <delete dir="netbeans"/>
107
        <delete file="javahelp-api.nbm"/>
106
        <delete file="javahelp-api.nbm"/>
108
        <delete dir="Info"/>
109
        <delete dir="javadoc"/>
107
        <delete dir="javadoc"/>
110
        <delete file="manifest-subst.mf"/>
108
        <delete file="manifest-subst.mf"/>
111
    </target>
109
    </target>
(-)core/naming/build.xml (-11 / +1 lines)
Lines 13-29 Link Here
13
-->
13
-->
14
14
15
<project name="core/naming" default="netbeans" basedir=".">
15
<project name="core/naming" default="netbeans" basedir=".">
16
16
    <import file="../../nbbuild/default.xml"/> 
17
    <property name="nb_all" value="../.."/>
18
19
    <property name="nbm_alias" value="nb_ide"/>
20
    <property name="homepage.base" value="netbeans.org"/>
21
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
23
24
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
25
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
26
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
27
17
28
    <target name="compile">
18
    <target name="compile">
29
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
19
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
(-)core/output/build.xml (-32 / +35 lines)
Lines 13-62 Link Here
13
-->
13
-->
14
14
15
<project name="core/output" default="netbeans" basedir=".">
15
<project name="core/output" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
17
18
    <target name="init" depends="default.init">
19
      <patternset id="core/output.files">
20
        <include name="${nb.modules/autoload.dir}/core-output.jar"/>
21
      </patternset>
22
      <path id="cp">
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- remove when parseException not needed -->
26
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
27
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
28
        <pathelement location="${core/term.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
29
      </path>
30
    </target>
16
31
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <property name="homepage.base" value="netbeans.org"/>
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
21
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
    
32
    
26
    <target name="compile">
33
    <target name="compile" depends="init">
27
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
28
            <classpath>
35
            <classpath refID="cp"/>
29
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
30
                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
31
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/> <!-- remove when parseException not needed -->
32
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
33
                <pathelement location="../netbeans/lib/core.jar"/>
34
                <pathelement location="../term/netbeans/modules/autoload/terminalemulator.jar"/>
35
            </classpath>
36
        </javac>
36
        </javac>
37
    </target>
37
    </target>
38
38
39
    <target name="jars" depends="compile">
39
    <target name="jars" depends="compile">
40
        <mkdir dir="netbeans/modules/autoload"/>
40
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <locjar jarfile="netbeans/modules/autoload/core-output.jar"
43
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-output.jar"
44
                basedir="src"
44
             basedir="src"
45
                manifest="manifest-subst.mf"
45
             manifest="manifest-subst.mf"
46
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
46
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
	        compress="false">
47
	     compress="false"/>
48
            <locale name="ja"/>
49
        </locjar>
50
    </target>
48
    </target>
51
49
52
    <target name="netbeans" depends="jars">
50
    <target name="netbeans" depends="init,jars">
53
        <genlist targetname="nbm" outputfiledir="netbeans"/>
51
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-output.jar">
52
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
          <patternset refID="core/output.files"/>
54
        </fileset>
55
      </genlist>
54
    </target>
56
    </target>
55
57
56
    <target name="nbm" depends="netbeans">
58
    <target name="nbm" depends="netbeans">
57
        <makenbm file="core-output.nbm"
59
        <makenbm file="core-output.nbm"
58
                 topdir="."
60
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
59
                 module="netbeans/modules/autoload/core-output.jar"
61
                 module="${nb.modules/autoload.dir}/core-output.jar"
60
                 homepage="http://core.${homepage.base}/"
62
                 homepage="http://core.${homepage.base}/"
61
                 distribution="http://${dist.base}/core-output.nbm">
63
                 distribution="http://${dist.base}/core-output.nbm">
62
            <license file="${license.file}"/>
64
            <license file="${license.file}"/>
Lines 64-78 Link Here
64
        </makenbm>
66
        </makenbm>
65
    </target>
67
    </target>
66
68
67
    <target name="clean">
69
    <target name="clean" depends="init">
68
        <delete>
70
        <delete>
69
            <fileset dir="src">
71
            <fileset dir="src">
70
                <include name="**/*.class"/>
72
                <include name="**/*.class"/>
71
            </fileset>
73
            </fileset>
74
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
                <patternset refID="core/output.files"/>
76
            </fileset>
72
        </delete>
77
        </delete>
73
        <delete dir="netbeans"/>
74
        <delete file="core-output.nbm"/>
78
        <delete file="core-output.nbm"/>
75
        <delete dir="Info"/>
76
        <delete file="manifest-subst.mf"/>
79
        <delete file="manifest-subst.mf"/>
77
    </target>
80
    </target>
78
81
(-)core/settings/build.xml (-30 / +29 lines)
Lines 13-62 Link Here
13
-->
13
-->
14
14
15
<project name="core/settings" default="netbeans" basedir=".">
15
<project name="core/settings" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
19
      <patternset id="core/settings.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
        <include name="${nb.modules/autoload.dir}/core-settings.jar"/>
20
    <property name="nb_all" value="../../"/>
21
      </patternset>
21
    <property name="license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
22
      <path id="cp">
22
23
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
24
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
25
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
26
    
27
    <path id="cp">
28
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
    </path>
26
      </path>
27
    </target>
32
28
33
    <target name="compile">
29
    <target name="compile" depends="init">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
            <classpath refid="cp"/>
31
            <classpath refid="cp"/>
36
        </javac>
32
        </javac>
37
    </target>
33
    </target>
38
34
39
    <target name="jars" depends="compile">
35
    <target name="jars" depends="compile">
40
        <mkdir dir="netbeans/modules/autoload"/>
36
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
38
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <locjar jarfile="netbeans/modules/autoload/core-settings.jar"
39
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-settings.jar"
44
                basedir="src"
40
             basedir="src"
45
                manifest="manifest-subst.mf"
41
             manifest="manifest-subst.mf"
46
                excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
42
             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
47
	        compress="false">
43
	     compress="false"/>
48
            <locale name="ja"/>
49
        </locjar>
50
    </target>
44
    </target>
51
45
52
    <target name="netbeans" depends="jars" description="Build everything.">
46
    <target name="netbeans" depends="jars" description="Build everything.">
53
        <genlist targetname="nbm" outputfiledir="netbeans"/>
47
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-settings.jar">
48
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
49
             <patternset refID="core/settings.files"/>
50
          </fileset>
51
        </genlist>
54
    </target>
52
    </target>
55
53
56
    <target name="nbm" depends="netbeans" description="Build NBM.">
54
    <target name="nbm" depends="netbeans" description="Build NBM.">
57
        <makenbm file="core-settings.nbm"
55
        <makenbm file="core-settings.nbm"
58
                 topdir="."
56
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
59
                 module="netbeans/modules/autoload/core-settings.jar"
57
                 module="${nb.modules/autoload.dir}/core-settings.jar"
60
                 homepage="http://core.${homepage.base}/"
58
                 homepage="http://core.${homepage.base}/"
61
                 distribution="http://${dist.base}/core-settings.nbm">
59
                 distribution="http://${dist.base}/core-settings.nbm">
62
                 <license file="${license.file}"/>
60
                 <license file="${license.file}"/>
Lines 64-79 Link Here
64
        </makenbm>
62
        </makenbm>
65
    </target>
63
    </target>
66
64
67
    <target name="clean" description="Clean build products.">
65
    <target name="clean" depends="init" description="Clean build products.">
68
      <delete>
66
      <delete>
69
        <fileset dir="src">
67
        <fileset dir="src">
70
          <include name="**/*.class"/>
68
          <include name="**/*.class"/>
71
        </fileset>
69
        </fileset>
70
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
71
          <patternset refID="core/settings.files"/>
72
        </fileset>
72
      </delete>
73
      </delete>
73
      <delete file="manifest-subst.mf"/>
74
      <delete file="manifest-subst.mf"/>
74
      <delete file="core-settings.nbm"/>
75
      <delete file="core-settings.nbm"/>
75
      <delete dir="netbeans"/>
76
      <delete dir="Info"/>
77
      <delete dir="javadoc"/>
76
      <delete dir="javadoc"/>
78
    </target>
77
    </target>
79
78
Lines 81-87 Link Here
81
        <delete dir="reload"/>
80
        <delete dir="reload"/>
82
    </target>
81
    </target>
83
82
84
    <target name="javadoc" description="Build Javadoc.">
83
    <target name="javadoc" depends="init" description="Build Javadoc.">
85
        <!-- Do this before so <checklinks> will find it and not report it as an error: -->
84
        <!-- Do this before so <checklinks> will find it and not report it as an error: -->
86
        <mkdir dir="javadoc/SettingsAPI/org/netbeans/spi/settings/doc-files"/>
85
        <mkdir dir="javadoc/SettingsAPI/org/netbeans/spi/settings/doc-files"/>
87
        <copy file="src/org/netbeans/modules/settings/resources/properties-1_0.dtd"
86
        <copy file="src/org/netbeans/modules/settings/resources/properties-1_0.dtd"
(-)core/term/build.xml (-24 / +27 lines)
Lines 13-43 Link Here
13
-->
13
-->
14
14
15
<project name="core/term" default="netbeans" basedir=".">
15
<project name="core/term" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
19
      <patternset id="core/term.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
        <include name="${nb.modules/autoload.dir}/terminalemulator.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
21
      </patternset>
21
22
      <path id="cp">
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
          <!-- empty -->
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
      </path>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
    </target>
25
26
  
26
    <path id="cp">
27
    <target name="compile" depends="init">
27
        <!-- empty -->
28
    </path>
29
    
30
    <target name="compile">
31
        <javac srcdir="../libsrc" destdir="../libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
        <javac srcdir="../libsrc" destdir="../libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
32
            <classpath refid="cp"/>
29
            <classpath refid="cp"/>
33
        </javac>
30
        </javac>
34
    </target>
31
    </target>
35
    
32
    
36
    <target name="jars" depends="compile">
33
    <target name="jars" depends="init,compile">
37
        <mkdir dir="netbeans/modules/autoload"/>
34
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
38
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
35
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
36
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
        <locjar jarfile="netbeans/modules/autoload/terminalemulator.jar"
37
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"
41
                manifest="manifest-subst.mf"
38
                manifest="manifest-subst.mf"
42
                basedir="../libsrc"
39
                basedir="../libsrc"
43
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
40
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
Lines 46-63 Link Here
46
            <exclude name="**/*.html"/>
43
            <exclude name="**/*.html"/>
47
            <exclude name="**/*.txt"/>
44
            <exclude name="**/*.txt"/>
48
            <exclude name="**/build.xml"/>
45
            <exclude name="**/build.xml"/>
49
            <locale name="ja"/>
46
        </jar>
50
        </locjar>
51
    </target>
47
    </target>
52
48
53
    <target name="netbeans" depends="jars">
49
    <target name="netbeans" depends="init,jars">
54
        <genlist targetname="nbm" outputfiledir="netbeans"/>
50
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/terminalemulator.jar">
51
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
52
          <patternset refID="core/term.files"/>
53
        </fileset>
54
      </genlist>
55
    </target>
55
    </target>
56
56
57
    <target name="nbm" depends="netbeans">
57
    <target name="nbm" depends="netbeans">
58
        <makenbm file="terminalemulator.nbm"
58
        <makenbm file="terminalemulator.nbm"
59
                 topdir="."
59
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
60
                 module="netbeans/modules/autoload/terminalemulator.jar"
60
                 module="${nb.modules/autoload.dir}/terminalemulator.jar"
61
                 homepage="http://core.${homepage.base}/"
61
                 homepage="http://core.${homepage.base}/"
62
                 distribution="http://${dist.base}/terminalemulator.nbm">
62
                 distribution="http://${dist.base}/terminalemulator.nbm">
63
            <license file="${license.file}"/>
63
            <license file="${license.file}"/>
Lines 78-87 Link Here
78
        </ant>
78
        </ant>
79
    </target>
79
    </target>
80
  
80
  
81
    <target name="clean">
81
    <target name="clean" depends="init">
82
        <delete>
82
        <delete>
83
            <fileset dir="../libsrc">
83
            <fileset dir="../libsrc">
84
                <include name="**/*.class"/>
84
                <include name="**/*.class"/>
85
            </fileset>
86
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
87
                <patternset refID="core/term.files"/>
85
            </fileset>
88
            </fileset>
86
        </delete>
89
        </delete>
87
        <delete dir="netbeans"/>
90
        <delete dir="netbeans"/>
(-)core/test/build-unit.xml (-93 / +39 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="Unit tests" basedir="." default="all">
15
<project name="Unit tests" basedir="." default="all">
16
    <import file="../../nbbuild/default-properties.xml"/>
16
17
17
    <!-- =================== -->
18
    <!-- =================== -->
18
    <!-- Setting classpathes -->
19
    <!-- Setting classpathes -->
Lines 126-134 Link Here
126
127
127
    <!-- this "switch" will decide how to create classpath -->
128
    <!-- this "switch" will decide how to create classpath -->
128
    <target name="which-classpath">
129
    <target name="which-classpath">
129
        <condition property="jarcode.classpath">
130
            <equals arg1="${xtest.source.location}" arg2="jar"/>
131
        </condition>
132
        <condition property="srccode.classpath">
130
        <condition property="srccode.classpath">
133
            <equals arg1="${xtest.source.location}" arg2="src"/>
131
            <equals arg1="${xtest.source.location}" arg2="src"/>
134
        </condition>
132
        </condition>
Lines 142-170 Link Here
142
    <!-- ========================= -->
140
    <!-- ========================= -->
143
    
141
    
144
    <target name="prepare-compile-classpath"
142
    <target name="prepare-compile-classpath"
145
         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
143
         depends="srccompile-classpath,idecompile-classpath"/>
146
    
144
    
147
    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
148
        <echo message="Using jars classpath for compilation."/>
149
    	<!-- this classpath will be used for compiling tests against jars -->
150
	<path id="compiletest.classpath">        
151
	    	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
152
	    	<pathelement location="../netbeans/lib/core.jar"/>
153
                <pathelement location="../term/netbeans/modules/autoload/terminalemulator.jar"/>
154
	    	<fileset dir="../../openide/netbeans/lib">
155
                    <include name="openide*.jar"/>
156
             	</fileset>
157
                <!-- XXX -->
158
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
159
                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
160
                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
161
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
162
163
             	<pathelement path="${junit.path}"/>
164
	    	<pathelement path="${xerces.path}"/>
165
	</path>
166
    </target>
167
        
168
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
145
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
169
        <echo message="Using srcs classpath for compilation."/>
146
        <echo message="Using srcs classpath for compilation."/>
170
    	<!-- this classpath will be used for compiling tests against sources -->
147
    	<!-- this classpath will be used for compiling tests against sources -->
Lines 175-188 Link Here
175
                <!-- XXX -->
152
                <!-- XXX -->
176
                <pathelement location="../bootstrap/src/"/>
153
                <pathelement location="../bootstrap/src/"/>
177
                
154
                
178
	        <fileset dir="../../openide/netbeans/lib">
155
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
179
                    <include name="openide*.jar"/>
180
                </fileset>
181
                <!-- XXX -->
156
                <!-- XXX -->
182
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
157
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
183
                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
158
                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
184
                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
159
                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
185
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
160
                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
186
161
187
	        <pathelement path="${junit.path}"/>
162
	        <pathelement path="${junit.path}"/>
188
		<pathelement path="${xerces.path}"/>
163
		<pathelement path="${xerces.path}"/>
Lines 194-210 Link Here
194
    	<!-- this classpath will be used for compiling tests against installed IDE -->
169
    	<!-- this classpath will be used for compiling tests against installed IDE -->
195
    	<path id="compiletest.classpath">        
170
    	<path id="compiletest.classpath">        
196
    		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
171
    		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
197
	        <pathelement location="${netbeans.home}/lib/core.jar"/>
172
	        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
198
		<pathelement location="${netbeans.home}/lib/ext/boot.jar"/>
173
		<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
199
	        <fileset dir="${netbeans.home}/lib">
174
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
200
                    <include name="openide*.jar"/>
175
                <!-- XXX -->
201
                </fileset>
176
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
202
                <!-- XXX -->
177
                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
203
                <fileset dir="${netbeans.home}/modules/autoload">
178
                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
204
                    <include name="openide-*.jar"/>
179
                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
205
                    <include name="core-*.jar"/>
180
		<pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
206
                    <include name="terminalemulator.jar"/>
207
                </fileset>
208
                
181
                
209
	        <pathelement path="${junit.path}"/>
182
	        <pathelement path="${junit.path}"/>
210
		<pathelement path="${xerces.path}"/>
183
		<pathelement path="${xerces.path}"/>
Lines 216-285 Link Here
216
    <!-- ================================== -->
189
    <!-- ================================== -->
217
    
190
    
218
    <target name="prepare-codetest-classpath" 
191
    <target name="prepare-codetest-classpath" 
219
            depends="jartest-classpath,srctest-classpath,idetest-classpath"/>
192
            depends="srctest-classpath,idetest-classpath"/>
220
    
193
    
221
    <target name="jartest-classpath" depends="which-classpath" if="jarcode.classpath">
222
        <echo message="Using jars classpath."/>
223
        <!-- this classpath will be used for executing tests against jars -->
224
	<path id="codetest.classpath">
225
        	<fileset dir="../netbeans/lib">
226
            		<include name="core.jar"/>
227
            		<include name="ext/*.jar"/>
228
        	</fileset>
229
        	<pathelement location="../../openide/netbeans/lib/openide.jar"/>
230
                <!-- XXX -->
231
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
232
                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
233
                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
234
                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
235
                <pathelement location="../output/netbeans/modules/autoload/core-output.jar"/>
236
                <pathelement location="../execution/netbeans/modules/autoload/core-execution.jar"/>
237
                <pathelement location="../compiler/netbeans/modules/autoload/core-compiler.jar"/>
238
                <pathelement location="../windows/netbeans/modules/core-windows.jar"/>
239
    	</path>
240
    </target>
241
        
242
    <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
194
    <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
243
        <echo message="Using srcs classpath."/>
195
        <echo message="Using srcs classpath."/>
244
        <!-- this classpath will be used for executing tests against sources -->
196
        <!-- this classpath will be used for executing tests against sources -->
245
    	<path id="codetest.classpath">
197
    	<path id="codetest.classpath">
246
        <!-- Working sources should take precedence over core.jar: -->
198
        <!-- Working sources should take precedence over core.jar: -->
247
           <pathelement location="../src"/>
199
           <pathelement location="../src"/>
248
        	<fileset dir="../netbeans/lib">
200
	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
249
              	    <!-- But loading core.jar means its manifest is available to module system: -->
201
           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
250
           	    <include name="core.jar"/>
202
           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
251
           	    <include name="ext/*.jar"/>
203
252
        	</fileset>
253
           <pathelement location="../../openide/netbeans/lib/openide.jar"/>
254
            <!-- XXX -->
204
            <!-- XXX -->
255
            <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
205
           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
256
            <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
206
           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
257
            <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
207
           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
258
            <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
208
           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
259
            <pathelement location="../output/src"/>
209
           <pathelement location="../output/src"/>
260
            <pathelement location="../execution/src"/>
210
           <pathelement location="../execution/src"/>
261
            <pathelement location="../compiler/src"/>
211
           <pathelement location="../compiler/src"/>
262
            <pathelement location="../windows/src"/>
212
           <pathelement location="../windows/src"/>
263
    	</path>
213
   	</path>
264
    </target>
214
    </target>
265
    
215
    
266
    <target name="idetest-classpath" depends="which-classpath" if="idecode.classpath">
216
    <target name="idetest-classpath" depends="which-classpath" if="idecode.classpath">
267
        <echo message="Using IDE classpath."/>
217
        <echo message="Using IDE classpath."/>
268
        <!-- this classpath will be used for executing tests against installed IDE -->
218
        <!-- this classpath will be used for executing tests against installed IDE -->
269
    	<path id="codetest.classpath">
219
    	<path id="codetest.classpath">
270
        	<fileset dir="${netbeans.home}/lib">
220
	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
271
            		<include name="core.jar"/>
221
           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
272
            		<include name="ext/*.jar"/>
222
           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
273
        	</fileset>
223
           <!-- XXX -->
274
        	<pathelement location="${netbeans.home}/lib/openide.jar"/>
224
           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
275
                <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>        
225
           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
276
                <!-- XXX -->
226
           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
277
                <fileset dir="${netbeans.home}/modules/autoload">
227
           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
278
                    <include name="openide-*.jar"/>
228
           <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
279
                    <include name="core-*.jar"/>
280
                    <include name="terminalemulator.jar"/>
281
                </fileset>
282
                
283
    	</path>
229
    	</path>
284
    </target>
230
    </target>
285
    
231
    
(-)core/test/unit/src/org/netbeans/core/modules/build.xml (-13 / +8 lines)
Lines 12-17 Link Here
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
<project name="modules test setup" basedir="." default="build">
14
<project name="modules test setup" basedir="." default="build">
15
    <import file="../../../../../../../../nbbuild/default-properties.xml"/>
15
16
16
    <property name="xtest.source.location" value="src"/>
17
    <property name="xtest.source.location" value="src"/>
17
18
Lines 32-61 Link Here
32
    
33
    
33
    <target name="jartest-classpath" if="jarcode.classpath">
34
    <target name="jartest-classpath" if="jarcode.classpath">
34
	<path id="openide">
35
	<path id="openide">
35
	    <pathelement location="../../../../../../../../openide/openide-13javac-workaround.jar"/>
36
	    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
36
            <fileset dir="../../../../../../../../openide/netbeans/lib">
37
            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
37
	            <include name="openide*.jar"/>
38
	    <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
38
            </fileset>
39
	    <pathelement location="../../../../../../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
40
        </path>
39
        </path>
41
    </target>
40
    </target>
42
        
41
        
43
    <target name="srctest-classpath" if="srccode.classpath">
42
    <target name="srctest-classpath" if="srccode.classpath">
44
	<path id="openide">
43
	<path id="openide">
45
	    <pathelement location="../../../../../../../../openide/openide-13javac-workaround.jar"/>
44
	    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
46
            <fileset dir="../../../../../../../../openide/netbeans/lib">
45
            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
47
	            <include name="openide*.jar"/>
46
	    <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
48
            </fileset>
49
            <pathelement location="../../../../../../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
50
        </path>
47
        </path>
51
    </target>
48
    </target>
52
    
49
    
53
    <target name="idetest-classpath" if="idecode.classpath">
50
    <target name="idetest-classpath" if="idecode.classpath">
54
    	<path id="openide">
51
    	<path id="openide">
55
	    <pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
52
	    <pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
56
            <fileset dir="${netbeans.home}/lib">
53
            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
57
	            <include name="openide*.jar"/>
58
            </fileset>
59
        </path>
54
        </path>
60
    </target>
55
    </target>
61
    
56
    
(-)core/ui/build.xml (-29 / +29 lines)
Lines 13-61 Link Here
13
-->
13
-->
14
14
15
<project name="core/ui" default="netbeans" basedir=".">
15
<project name="core/ui" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
19
      <patternset id="core/ui.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
        <include name="${nb.modules.dir}/core-ui.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
21
      </patternset>
21
22
      <path id="cp">
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar" />
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
26
      </path>
27
    </target>
25
28
26
    <target name="compile">
29
    <target name="compile" depends="init">
27
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
            <classpath>
31
            <classpath refID="cp"/>
29
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
30
                <pathelement location="../src/" />
31
                <fileset dir="../../openide/netbeans/lib">
32
                    <include name="openide*.jar" />
33
                </fileset>
34
            </classpath>
35
        </javac>
32
        </javac>
36
    </target>
33
    </target>
37
34
38
    <target name="jars" depends="compile">
35
    <target name="jars" depends="init,compile">
39
        <mkdir dir="netbeans/modules"/>
36
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
40
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
38
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <locjar jarfile="netbeans/modules/core-ui.jar"
39
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-ui.jar"
43
                basedir="src"
40
                basedir="src"
44
                manifest="manifest-subst.mf"
41
                manifest="manifest-subst.mf"
45
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
42
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
46
	        compress="false">
43
	        compress="false"/>
47
            <locale name="ja"/>
48
        </locjar>
49
    </target>
44
    </target>
50
45
51
    <target name="netbeans" depends="jars">
46
    <target name="netbeans" depends="init,jars">
52
        <genlist targetname="nbm" outputfiledir="netbeans"/>
47
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-ui.jar">
48
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
49
          <patternset refID="core/ui.files"/>
50
        </fileset>
51
      </genlist>
53
    </target>
52
    </target>
54
53
55
    <target name="nbm" depends="netbeans">
54
    <target name="nbm" depends="netbeans">
56
        <makenbm file="core-ui.nbm"
55
        <makenbm file="core-ui.nbm"
57
                 topdir="."
56
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
58
                 module="netbeans/modules/core-ui.jar"
57
                 module="${nb.modules.dir}/core-ui.jar"
59
                 homepage="http://core.${homepage.base}/"
58
                 homepage="http://core.${homepage.base}/"
60
                 distribution="http://${dist.base}/core-ui.nbm">
59
                 distribution="http://${dist.base}/core-ui.nbm">
61
            <license file="${license.file}"/>
60
            <license file="${license.file}"/>
Lines 63-77 Link Here
63
        </makenbm>
62
        </makenbm>
64
    </target>
63
    </target>
65
64
66
    <target name="clean">
65
    <target name="clean" depends="init">
67
        <delete>
66
        <delete>
68
            <fileset dir="src">
67
            <fileset dir="src">
69
                <include name="**/*.class"/>
68
                <include name="**/*.class"/>
70
            </fileset>
69
            </fileset>
70
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
71
                <patternset refID="core/ui.files"/>
72
            </fileset>
71
        </delete>
73
        </delete>
72
        <delete dir="netbeans"/>
73
        <delete file="core-ui.nbm"/>
74
        <delete file="core-ui.nbm"/>
74
        <delete dir="Info"/>
75
        <delete file="manifest-subst.mf"/>
75
        <delete file="manifest-subst.mf"/>
76
    </target>
76
    </target>
77
77
(-)core/windows/build.xml (-32 / +33 lines)
Lines 13-61 Link Here
13
-->
13
-->
14
14
15
<project name="core/windows" default="netbeans" basedir=".">
15
<project name="core/windows" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nbm_alias" value="nb_ide"/>
18
    <target name="init" depends="default.init">
18
    <property name="homepage.base" value="netbeans.org"/>
19
      <patternset id="core/windows.files">
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
        <include name="${nb.modules.dir}/core-windows.jar"/>
20
    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
21
      </patternset>
21
22
      <path id="cp">
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
25
26
         <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
27
      </path>
28
    </target>
26
29
27
    <target name="compile">
30
    <target name="compile" depends="init">
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
31
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
29
            <classpath>
32
            <classpath refID="cp"/>
30
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
31
                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
32
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
33
                <pathelement location="../netbeans/lib/core.jar"/>
34
            </classpath>
35
        </javac>
33
        </javac>
36
    </target>
34
    </target>
37
35
38
    <target name="jars" depends="compile">
36
    <target name="jars" depends="init,compile">
39
        <mkdir dir="netbeans/modules"/>
37
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
40
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
38
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
39
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <locjar jarfile="netbeans/modules/core-windows.jar"
40
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-windows.jar"
43
                basedir="src"
41
             basedir="src"
44
                manifest="manifest-subst.mf"
42
             manifest="manifest-subst.mf"
45
                excludesfile="../../nbbuild/standard-jar-excludes.txt"
43
             excludesfile="../../nbbuild/standard-jar-excludes.txt"
46
	        compress="false">
44
	     compress="false"/>
47
            <locale name="ja"/>
48
        </locjar>
49
    </target>
45
    </target>
50
46
51
    <target name="netbeans" depends="jars">
47
    <target name="netbeans" depends="init,jars">
52
        <genlist targetname="nbm" outputfiledir="netbeans"/>
48
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-windows.jar">
49
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
50
          <patternset refID="core/windows.files"/>
51
        </fileset>
52
      </genlist>
53
    </target>
53
    </target>
54
54
55
    <target name="nbm" depends="netbeans">
55
    <target name="nbm" depends="netbeans">
56
        <makenbm file="core-windows.nbm"
56
        <makenbm file="core-windows.nbm"
57
                 topdir="."
57
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
58
                 module="netbeans/modules/core-windows.jar"
58
                 module="${nb.modules.dir}/core-windows.jar"
59
                 homepage="http://core.${homepage.base}/"
59
                 homepage="http://core.${homepage.base}/"
60
                 distribution="http://${dist.base}/core-windows.nbm">
60
                 distribution="http://${dist.base}/core-windows.nbm">
61
            <license file="${license.file}"/>
61
            <license file="${license.file}"/>
Lines 63-77 Link Here
63
        </makenbm>
63
        </makenbm>
64
    </target>
64
    </target>
65
65
66
    <target name="clean">
66
    <target name="clean" depends="init">
67
        <delete>
67
        <delete>
68
            <fileset dir="src">
68
            <fileset dir="src">
69
                <include name="**/*.class"/>
69
                <include name="**/*.class"/>
70
            </fileset>
70
            </fileset>
71
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
72
                <patternset refID="core/windows.files"/>
73
            </fileset>
71
        </delete>
74
        </delete>
72
        <delete dir="netbeans"/>
73
        <delete file="core-windows.nbm"/>
75
        <delete file="core-windows.nbm"/>
74
        <delete dir="Info"/>
75
        <delete file="manifest-subst.mf"/>
76
        <delete file="manifest-subst.mf"/>
76
    </target>
77
    </target>
77
78
(-)core/windows/test/build-unit.xml (-85 / +48 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="Unit tests" basedir="." default="all">
15
<project name="Unit tests" basedir="." default="all">
16
    <import file="../../../nbbuild/default-properties.xml"/>
16
17
17
    <!-- =================== -->
18
    <!-- =================== -->
18
    <!-- Setting classpathes -->
19
    <!-- Setting classpathes -->
Lines 127-135 Link Here
127
128
128
    <!-- this "switch" will decide how to create classpath -->
129
    <!-- this "switch" will decide how to create classpath -->
129
    <target name="which-classpath">
130
    <target name="which-classpath">
130
        <condition property="jarcode.classpath">
131
            <equals arg1="${xtest.source.location}" arg2="jar"/>
132
        </condition>
133
        <condition property="srccode.classpath">
131
        <condition property="srccode.classpath">
134
            <equals arg1="${xtest.source.location}" arg2="src"/>
132
            <equals arg1="${xtest.source.location}" arg2="src"/>
135
        </condition>
133
        </condition>
Lines 143-190 Link Here
143
    <!-- ========================= -->
141
    <!-- ========================= -->
144
    
142
    
145
    <target name="prepare-compile-classpath"
143
    <target name="prepare-compile-classpath"
146
         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
144
         depends="srccompile-classpath,idecompile-classpath"/>
147
    
145
    
148
    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
149
        <echo message="Using jars classpath for compilation."/>
150
    	<!-- this classpath will be used for compiling tests against jars -->
151
	<path id="compiletest.classpath">        
152
	    	<pathelement location="../../../openide/openide-13javac-workaround.jar"/>
153
	    	<pathelement location="../../netbeans/lib/core.jar"/>
154
                <pathelement location="../../term/netbeans/modules/autoload/terminalemulator.jar"/>
155
	    	<fileset dir="../../../openide/netbeans/lib">
156
                    <include name="openide*.jar"/>
157
             	</fileset>
158
                <!-- XXX -->
159
                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
160
                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
161
                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
162
                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
163
164
             	<pathelement path="${junit.path}"/>
165
	    	<pathelement path="${xerces.path}"/>
166
	</path>
167
    </target>
168
        
169
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
146
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
170
        <echo message="Using srcs classpath for compilation."/>
147
        <echo message="Using srcs classpath for compilation."/>
171
    	<!-- this classpath will be used for compiling tests against sources -->
148
    	<!-- this classpath will be used for compiling tests against sources -->
172
    	<path id="compiletest.classpath">        
149
    	<path id="compiletest.classpath">        
173
	        <pathelement location="../../../openide/openide-13javac-workaround.jar"/>
150
	        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
174
	        <pathelement location="../../src"/>
151
	        <pathelement location="../../src"/>
175
                <pathelement location="../src"/>
152
                <pathelement location="../src"/>
176
                <pathelement location="../../libsrc"/>
153
                <pathelement location="../../libsrc"/>
177
                <!-- XXX -->
154
                <!-- XXX -->
178
                <pathelement location="../../bootstrap/src/"/>
155
                <pathelement location="../../bootstrap/src/"/>
179
                
156
                
180
	        <fileset dir="../../../openide/netbeans/lib">
157
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
181
                    <include name="openide*.jar"/>
182
                </fileset>
183
                <!-- XXX -->
158
                <!-- XXX -->
184
                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
159
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
185
                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
160
                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
186
                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
161
                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
187
                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
162
                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
188
163
189
	        <pathelement path="${junit.path}"/>
164
	        <pathelement path="${junit.path}"/>
190
		<pathelement path="${xerces.path}"/>
165
		<pathelement path="${xerces.path}"/>
Lines 196-213 Link Here
196
    	<!-- this classpath will be used for compiling tests against installed IDE -->
171
    	<!-- this classpath will be used for compiling tests against installed IDE -->
197
    	<path id="compiletest.classpath">        
172
    	<path id="compiletest.classpath">        
198
    		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
173
    		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
199
	        <pathelement location="${netbeans.home}/lib/core.jar"/>
174
	        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
200
                <pathelement location="${netbeans.home}/modules/core-windows.jar"/>
175
		<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
201
		<pathelement location="${netbeans.home}/lib/ext/boot.jar"/>
176
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
202
	        <fileset dir="${netbeans.home}/lib">
177
                <!-- XXX -->
203
                    <include name="openide*.jar"/>
178
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
204
                </fileset>
179
                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
205
                <!-- XXX -->
180
                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
206
                <fileset dir="${netbeans.home}/modules/autoload">
181
                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
207
                    <include name="openide-*.jar"/>
182
		<pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
208
                    <include name="core-*.jar"/>
209
                    <include name="terminalemulator.jar"/>
210
                </fileset>
211
                
183
                
212
	        <pathelement path="${junit.path}"/>
184
	        <pathelement path="${junit.path}"/>
213
		<pathelement path="${xerces.path}"/>
185
		<pathelement path="${xerces.path}"/>
Lines 225-244 Link Here
225
        <echo message="Using jars classpath."/>
197
        <echo message="Using jars classpath."/>
226
        <!-- this classpath will be used for executing tests against jars -->
198
        <!-- this classpath will be used for executing tests against jars -->
227
	<path id="codetest.classpath">
199
	<path id="codetest.classpath">
228
        	<fileset dir="../../netbeans/lib">
200
	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
229
            		<include name="core.jar"/>
201
           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
230
            		<include name="ext/*.jar"/>
202
           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
231
        	</fileset>
203
232
        	<pathelement location="../../../openide/netbeans/lib/openide.jar"/>
204
            <!-- XXX -->
233
                <pathelement location="../netbeans/modules/core-windows.jar"/>
205
           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
234
                <!-- XXX -->
206
           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
235
                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
207
           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
236
                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
208
           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
237
                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
209
           <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
238
                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
239
                <pathelement location="../../output/netbeans/modules/autoload/core-output.jar"/>
240
                <pathelement location="../../execution/netbeans/modules/autoload/core-execution.jar"/>
241
                <pathelement location="../../compiler/netbeans/modules/autoload/core-compiler.jar"/>
242
    	</path>
210
    	</path>
243
    </target>
211
    </target>
244
        
212
        
Lines 248-267 Link Here
248
    	<path id="codetest.classpath">
216
    	<path id="codetest.classpath">
249
        <!-- Working sources should take precedence over core.jar: -->
217
        <!-- Working sources should take precedence over core.jar: -->
250
           <pathelement location="../../src"/>
218
           <pathelement location="../../src"/>
251
        	<fileset dir="../../netbeans/lib">
219
	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
252
              	    <!-- But loading core.jar means its manifest is available to module system: -->
220
           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
253
           	    <include name="core.jar"/>
221
           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
254
           	    <include name="ext/*.jar"/>
222
255
        	</fileset>
256
           <pathelement location="../../../openide/netbeans/lib/openide.jar"/>
257
            <!-- XXX -->
223
            <!-- XXX -->
258
            <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
224
           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
259
            <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
225
           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
260
            <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
226
           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
261
            <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
227
           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
262
            <pathelement location="../../output/src"/>
228
           <pathelement location="../../output/src"/>
263
            <pathelement location="../../execution/src"/>
229
           <pathelement location="../../execution/src"/>
264
            <pathelement location="../../compiler/src"/>
230
           <pathelement location="../../compiler/src"/>
265
    	</path>
231
    	</path>
266
    </target>
232
    </target>
267
    
233
    
Lines 269-287 Link Here
269
        <echo message="Using IDE classpath."/>
235
        <echo message="Using IDE classpath."/>
270
        <!-- this classpath will be used for executing tests against installed IDE -->
236
        <!-- this classpath will be used for executing tests against installed IDE -->
271
    	<path id="codetest.classpath">
237
    	<path id="codetest.classpath">
272
        	<fileset dir="${netbeans.home}/lib">
238
	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
273
            		<include name="core.jar"/>
239
           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
274
            		<include name="ext/*.jar"/>
240
           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
275
        	</fileset>
241
276
        	<pathelement location="${netbeans.home}/lib/openide.jar"/>
242
            <!-- XXX -->
277
                <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>        
243
           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
278
                <!-- XXX -->
244
           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
279
                <fileset dir="${netbeans.home}/modules/autoload">
245
           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
280
                    <include name="openide-*.jar"/>
246
           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
281
                    <include name="core-*.jar"/>
247
           <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
282
                    <include name="terminalemulator.jar"/>
283
                </fileset>
284
                
285
    	</path>
248
    	</path>
286
    </target>
249
    </target>
287
    
250
    
(-)db/build.xml (-46 / +40 lines)
Lines 14-78 Link Here
14
14
15
15
16
<project name="db" default="netbeans" basedir=".">
16
<project name="db" default="netbeans" basedir=".">
17
  <import file="../nbbuild/default.xml"/> 
17
18
18
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
19
  <target name="init" depends="default.init">
19
  <property name="homepage.base" value="netbeans.org"/>
20
    <patternset id="db.files">
20
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21
      <include name="${nb.modules.dir}/db.jar"/>
21
22
      <include name="${nb.modules.dir}/ext/ddl.jar"/>
22
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
23
      <include name="${nb.modules/docs.dir}/db.jar"/>
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
24
    </patternset>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
    <path id="cp">
25
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
26
  <target name="init">
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
30
      <pathelement location="${openidex.dir}/${nb.modules.dir}/openidex.jar"/>
31
    </path>
27
    <tstamp/>
32
    <tstamp/>
28
    <property name="buildnumber" value="${DSTAMP}-${TSTAMP}"/>
33
    <property name="buildnumber" value="${DSTAMP}-${TSTAMP}"/>
29
    <echo message="buildnumber = ${buildnumber}"/>
34
    <echo message="buildnumber = ${buildnumber}"/>
30
  </target>
35
  </target>
31
36
32
  <target name="precompile">
37
  <target name="precompile" depends="init">
33
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
38
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34
      <classpath>
39
      <classpath refId="cp"/>
35
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
36
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
37
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
38
      </classpath>
39
    </javac>
40
    </javac>
40
  </target>
41
  </target>
41
42
42
  <target name="compile" depends="precompile">
43
  <target name="compile" depends="init,precompile">
43
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
      <classpath>
45
      <classpath>
46
        <path refID="cp"/>
45
        <pathelement path="libsrc"/>
47
        <pathelement path="libsrc"/>
46
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
47
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
48
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
49
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
50
        <pathelement location="../openidex/netbeans/modules/openidex.jar"/>
51
      </classpath>
48
      </classpath>
52
    </javac>
49
    </javac>
53
  </target>
50
  </target>
54
51
55
  <target name="jars" depends="init,compile">
52
  <target name="jars" depends="init,compile">
56
    <mkdir dir="netbeans/modules"/>
53
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
57
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
54
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
58
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
55
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
59
    <locjar jarfile="netbeans/modules/db.jar"
56
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/db.jar"
60
         manifest="manifest-subst.mf"
57
         manifest="manifest-subst.mf"
61
         basedir="src"
58
         basedir="src"
62
         excludesfile="../nbbuild/standard-jar-excludes.txt"
59
         excludesfile="../nbbuild/standard-jar-excludes.txt"
63
         compress="false">
60
         compress="false"/>
64
      <locale name="ja"/>
61
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
65
    </locjar>
62
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/ddl.jar"
66
    <mkdir dir="netbeans/modules/ext"/>
67
    <locjar jarfile="netbeans/modules/ext/ddl.jar"
68
         basedir="libsrc"
63
         basedir="libsrc"
69
         excludesfile="../nbbuild/standard-jar-excludes.txt"
64
         excludesfile="../nbbuild/standard-jar-excludes.txt"
70
         compress="false">
65
         compress="false"/>
71
      <locale name="ja"/>
72
    </locjar>
73
  </target>
66
  </target>
74
67
75
  <target name="javahelp">
68
  <target name="javahelp" depends="init"> 
76
    <mkdir dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2"/>
69
    <mkdir dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2"/>
77
    <jhindexer basedir="javahelp/org/netbeans/modules/db/docs/"
70
    <jhindexer basedir="javahelp/org/netbeans/modules/db/docs/"
78
               db="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2">
71
               db="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2">
Lines 88-110 Link Here
88
    </jhindexer>
81
    </jhindexer>
89
    <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
82
    <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
90
    <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
83
    <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
91
    <mkdir dir="netbeans/modules/docs"/>
84
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
92
    <locjar jarfile="netbeans/modules/docs/db.jar"
85
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/db.jar"
93
            compress="true">
86
         compress="true">
94
      <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
87
      <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
95
      <locale name="ja"/>
88
    </jar>
96
    </locjar>
97
  </target>
89
  </target>
98
90
99
  <target name="netbeans" depends="jars,javahelp">
91
  <target name="netbeans" depends="jars,javahelp">
100
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
92
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/db.jar">
101
    <genlist targetname="nbm" outputfiledir="netbeans"/>
93
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
94
         <patternset refID="db.files"/>
95
       </fileset>
96
    </genlist>
102
  </target>
97
  </target>
103
98
104
  <target name="nbm" depends="netbeans">
99
  <target name="nbm" depends="netbeans">
105
    <makenbm file="db.nbm"
100
    <makenbm file="db.nbm"
106
             topdir="."
101
             productdir="${netbeans.dest.dir}/${cluster.dir}"
107
             module="netbeans/modules/db.jar"
102
             module="${nb.modules.dir}/db.jar"
108
    	     homepage="http://db.${homepage.base}/"
103
    	     homepage="http://db.${homepage.base}/"
109
             distribution="http://${dist.base}/db.nbm">
104
             distribution="http://${dist.base}/db.nbm">
110
      <license file="${license.file}"/>
105
      <license file="${license.file}"/>
Lines 112-133 Link Here
112
    </makenbm>
107
    </makenbm>
113
  </target>
108
  </target>
114
109
115
  <target name="clean">
110
  <target name="clean" depends="init">
116
    <delete>
111
    <delete>
117
      <fileset dir="src">
112
      <fileset dir="src">
118
        <include name="**/*.class"/>
113
        <include name="**/*.class"/>
119
        <include name="**/*.jar"/>
114
        <include name="**/*.jar"/>
120
      </fileset>
115
      </fileset>
121
    </delete>
122
    <delete>
123
      <fileset dir="libsrc">
116
      <fileset dir="libsrc">
124
        <include name="**/*.class"/>
117
        <include name="**/*.class"/>
125
      </fileset>
118
      </fileset>
119
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
120
        <patternset refID="db.files"/>
121
      </fileset>
126
    </delete>
122
    </delete>
127
    <delete file="manifest-subst.mf"/>
123
    <delete file="manifest-subst.mf"/>
128
    <delete file="db.nbm"/>
124
    <delete file="db.nbm"/>
129
    <delete dir="netbeans"/>
130
    <delete dir="Info"/>
131
    <delete dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch"/>
125
    <delete dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch"/>
132
    <delete dir="javahelp/org/netbeans/modules/usersguide"/>
126
    <delete dir="javahelp/org/netbeans/modules/usersguide"/>
133
  </target>
127
  </target>
(-)debuggercore/build.xml (-60 / +40 lines)
Lines 13-82 Link Here
13
-->
13
-->
14
14
15
<project name="debuggercore" default="netbeans" basedir=".">
15
<project name="debuggercore" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="debuggercore.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules/autoload.dir}/debuggerCore.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
22
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
    <path id="cp">
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
25
      <pathelement location="${jdkhome}/lib/tools.jar"/>
25
  <target name="setup-jdkhome-1">
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
    <!-- Note: user-configured -Djavahome=... will always override this: -->
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
    <property name="javahome" location="${java.home}"/>
28
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
28
    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
29
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
29
  </target>
30
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
30
  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
31
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
31
    <property name="jdkhome" value="${javahome}"/>
32
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
32
    <property name="jdkhome-valid" value="true"/>
33
    </path>
33
  </target>
34
  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
35
    <property name="jdkhome" location="${javahome}/.."/>
36
    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
37
  </target>
34
  </target>
38
  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
35
39
    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
36
  <target name="compile" depends="init">
40
  </target>
41
  
42
  <target name="compile" depends="setup-jdkhome">
43
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
      <classpath>
38
      <classpath refID="cp"/>
45
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
46
        <pathelement location="${jdkhome}/lib/tools.jar"/>
47
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
48
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
49
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
50
        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
51
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
52
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
53
        <pathelement location="oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
54
      </classpath>
55
    </javac>
39
    </javac>
56
  </target>
40
  </target>
41
57
  <target name="jars" depends="compile">
42
  <target name="jars" depends="compile">
58
    <mkdir dir="netbeans/modules/autoload"/>
43
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
59
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
60
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
61
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
46
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"
62
    <locjar jarfile="netbeans/modules/autoload/debuggerCore.jar"
47
         manifest="manifest-subst.mf"
63
            manifest="manifest-subst.mf"
48
         basedir="src"
64
            basedir="src"
49
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
65
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
50
	 compress="false"/>
66
	    compress="false">
67
      <locale name="ja"/>
68
    </locjar>
69
  </target>
51
  </target>
70
52
71
   
53
   
72
  <target name="netbeans" depends="jars" description="Build everything.">
54
  <target name="netbeans" depends="jars" description="Build everything.">
73
    <genlist targetname="nbm" outputfiledir="netbeans"/>
55
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/debuggerCore.jar">
56
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
57
        <patternset refID="debuggercore.files"/>
58
      </fileset>
59
    </genlist>
74
  </target>
60
  </target>
75
61
76
  <target name="nbm" depends="netbeans" description="Build NBM.">
62
  <target name="nbm" depends="netbeans" description="Build NBM.">
77
    <makenbm file="debuggercore.nbm"
63
    <makenbm file="debuggercore.nbm"
78
             topdir="."
64
             productdir="${netbeans.dest.dir}/${cluster.dir}"
79
             module="netbeans/modules/autoload/debuggerCore.jar"
65
             module="${nb.modules/autoload.dir}/debuggerCore.jar"
80
	     homepage="http://debuggercore.${homepage.base}/"
66
	     homepage="http://debuggercore.${homepage.base}/"
81
	     distribution="http://${dist.base}/debuggercore.nbm">
67
	     distribution="http://${dist.base}/debuggercore.nbm">
82
      <license file="${license.file}"/>
68
      <license file="${license.file}"/>
Lines 84-103 Link Here
84
    </makenbm>
70
    </makenbm>
85
  </target>
71
  </target>
86
  
72
  
87
  <target name="clean" description="Clean everything.">
73
  <target name="clean" depends="init" description="Clean everything.">
88
    <delete>
74
    <delete>
89
      <fileset dir="src">
75
      <fileset dir="src">
90
        <include name="**/*.class"/>
76
        <include name="**/*.class"/>
91
      </fileset>
77
      </fileset>
78
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
79
        <patternset refID="debuggercore.files"/>
80
      </fileset>
92
    </delete>
81
    </delete>
93
    <delete file="manifest-subst.mf"/>
82
    <delete file="manifest-subst.mf"/>
94
    <delete file="debuggercore.nbm"/>
83
    <delete file="debuggercore.nbm"/>
95
    <delete dir="netbeans"/>
96
    <delete dir="javadoc"/>
84
    <delete dir="javadoc"/>
97
    <delete dir="Info"/>
85
    <delete dir="Info"/>
98
  </target>
86
  </target>
99
87
100
  <target name="javadoc" depends="setup-jdkhome" description="Build debuggercore module API documentation.">
88
  <target name="javadoc" depends="init" description="Build debuggercore module API documentation.">
101
    <tstamp/>
89
    <tstamp/>
102
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
90
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
103
    <echo message="Build debuggercore module API documentation..."/>
91
    <echo message="Build debuggercore module API documentation..."/>
Lines 116-130 Link Here
116
      <sourcepath>
104
      <sourcepath>
117
        <pathelement location="src"/>
105
        <pathelement location="src"/>
118
      </sourcepath>
106
      </sourcepath>
119
      <classpath>
107
      <classpath refID="cp"/>
120
        <!-- this classpath probably should be the same as for compilation -->
121
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
122
        <pathelement location="${jdkhome}/lib/tools.jar"/>
123
        <fileset dir="../openide/netbeans/lib">
124
          <include name="openide*.jar" />
125
        </fileset>
126
	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
127
      </classpath>
128
    </javadoc>    
108
    </javadoc>    
129
  </target>
109
  </target>
130
110
(-)debuggercore/oldapi/build.xml (-35 / +33 lines)
Lines 13-68 Link Here
13
-->
13
-->
14
14
15
<project name="debuggercore/oldapi" default="netbeans" basedir=".">
15
<project name="debuggercore/oldapi" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="debuggercore/oldapi.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.modules/autoload.dir}/openide-debugger.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
26
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
33
        <pathelement location="${nb_all}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
27
        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
34
        <pathelement location="${nb_all}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
28
        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
35
        <!-- ServiceTypeEditor: -->
29
        <!-- ServiceTypeEditor: -->
36
        <pathelement location="${nb_all}/core/netbeans/lib/core.jar"/>
30
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
37
    </path>
31
      </path>
32
    </target>
38
  
33
  
39
    <target name="compile">
34
    <target name="compile" depends="init">
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath refid="cp"/>
36
            <classpath refid="cp"/>
42
        </javac>
37
        </javac>
43
    </target>
38
    </target>
44
39
45
    <target name="jars" depends="compile">
40
    <target name="jars" depends="compile">
46
        <mkdir dir="netbeans/modules/autoload"/>
41
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
47
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
        <locjar jarfile="netbeans/modules/autoload/openide-debugger.jar"
44
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"
50
                manifest="manifest-subst.mf"
45
             manifest="manifest-subst.mf"
51
                basedir="src"
46
             basedir="src"
52
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
47
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
53
	        compress="false">
48
	     compress="false"/>
54
            <locale name="ja"/>
55
        </locjar>
56
    </target>
49
    </target>
57
50
58
    <target name="netbeans" depends="jars">
51
    <target name="netbeans" depends="jars">
59
        <genlist targetname="nbm" outputfiledir="netbeans"/>
52
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-debugger.jar">
53
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
             <patternset refID="debuggercore/oldapi.files"/>
55
          </fileset>
56
        </genlist>
60
    </target>
57
    </target>
61
58
62
    <target name="nbm" depends="netbeans">
59
    <target name="nbm" depends="netbeans">
63
        <makenbm file="openide-debugger.nbm"
60
        <makenbm file="openide-debugger.nbm"
64
                 topdir="."
61
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
65
                 module="netbeans/modules/autoload/openide-debugger.jar"
62
                 module="${nb.modules/autoload.dir}/openide-debugger.jar"
66
                 homepage="http://debuggercore.${homepage.base}/"
63
                 homepage="http://debuggercore.${homepage.base}/"
67
                 distribution="http://${dist.base}/openide-debugger.nbm">
64
                 distribution="http://${dist.base}/openide-debugger.nbm">
68
            <license file="${license.file}"/>
65
            <license file="${license.file}"/>
Lines 70-76 Link Here
70
        </makenbm>
67
        </makenbm>
71
    </target>
68
    </target>
72
  
69
  
73
    <target name="javadoc" description="Build Javadoc.">
70
    <target name="javadoc" depends="init" description="Build Javadoc.">
74
        <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
71
        <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
75
            <property name="javadoc.base" location="."/>
72
            <property name="javadoc.base" location="."/>
76
            <property name="javadoc.name" value="DebuggerAPI"/>
73
            <property name="javadoc.name" value="DebuggerAPI"/>
Lines 83-98 Link Here
83
        </ant>
80
        </ant>
84
    </target>
81
    </target>
85
  
82
  
86
    <target name="clean">
83
    <target name="clean" depends="init">
87
        <delete>
84
        <delete>
88
            <fileset dir="src">
85
            <fileset dir="src">
89
                <include name="**/*.class"/>
86
                <include name="**/*.class"/>
90
            </fileset>
87
            </fileset>
88
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
89
              <patternset refID="debuggercore/oldapi.files"/>
90
            </fileset>
91
        </delete>
91
        </delete>
92
        <delete file="manifest-subst.mf"/>
92
        <delete file="manifest-subst.mf"/>
93
        <delete file="openide-debugger.nbm"/>
93
        <delete file="openide-debugger.nbm"/>
94
        <delete dir="netbeans"/>
95
        <delete dir="Info"/>
96
        <delete dir="javadoc"/>
94
        <delete dir="javadoc"/>
97
    </target>
95
    </target>
98
  
96
  
(-)debuggerjpda/build.xml (-48 / +31 lines)
Lines 13-56 Link Here
13
-->
13
-->
14
14
15
<project name="debuggerjpda" default="netbeans" basedir=".">
15
<project name="debuggerjpda" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="debuggerjpda.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/jpdaDebugger.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
25
  <target name="setup-jdkhome-1">
26
    <!-- Note: user-configured -Djavahome=... will always override this: -->
27
    <property name="javahome" location="${java.home}"/>
28
    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
29
  </target>
30
  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
31
    <property name="jdkhome" value="${javahome}"/>
32
    <property name="jdkhome-valid" value="true"/>
33
  </target>
34
  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
35
    <property name="jdkhome" location="${javahome}/.."/>
36
    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
37
  </target>
38
  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
39
    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
40
  </target>
41
22
42
  <target name="init" depends="setup-jdkhome">
43
    <path id="cp">
23
    <path id="cp">
44
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
45
      <pathelement location="${jdkhome}/lib/tools.jar"/>
25
      <pathelement location="${jdkhome}/lib/tools.jar"/>
46
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
47
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
48
      <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
28
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
49
      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
29
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
50
      <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
30
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
51
      <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
31
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
52
      <pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
32
      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
53
      <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
33
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
54
    </path>
34
    </path>
55
  </target>
35
  </target>
56
36
Lines 61-87 Link Here
61
  </target>
41
  </target>
62
42
63
  <target name="jars" depends="compile">
43
  <target name="jars" depends="compile">
64
    <mkdir dir="netbeans/modules"/>
44
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
65
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
45
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
66
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
46
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
67
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
47
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
68
    <locjar jarfile="netbeans/modules/jpdaDebugger.jar"
48
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jpdaDebugger.jar"
69
            manifest="manifest-subst.mf"
49
         manifest="manifest-subst.mf"
70
            basedir="src"
50
         basedir="src"
71
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
51
         excludesfile="../nbbuild/standard-jar-excludes.txt"
72
	    compress="false">
52
	 compress="false"/>
73
      <locale name="ja"/>
74
    </locjar>
75
  </target>
53
  </target>
76
54
77
  <target name="netbeans" depends="jars">
55
  <target name="netbeans" depends="jars">
78
    <genlist targetname="nbm" outputfiledir="netbeans"/>
56
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jpdaDebugger.jar">
57
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
58
        <patternset refID="debuggerjpda.files"/>
59
      </fileset>
60
    </genlist>
79
  </target>
61
  </target>
80
62
81
  <target name="nbm" depends="netbeans">
63
  <target name="nbm" depends="netbeans">
82
    <makenbm file="debuggerjpda.nbm"
64
    <makenbm file="debuggerjpda.nbm"
83
             topdir="."
65
             productdir="${netbeans.dest.dir}/${cluster.dir}"
84
             module="netbeans/modules/jpdaDebugger.jar"
66
             module="${nb.modules.dir}/jpdaDebugger.jar"
85
	     homepage="http://debuggerjpda.${homepage.base}/"
67
	     homepage="http://debuggerjpda.${homepage.base}/"
86
	     distribution="http://${dist.base}/debuggerjpda.nbm">
68
	     distribution="http://${dist.base}/debuggerjpda.nbm">
87
      <license file="${license.file}"/>
69
      <license file="${license.file}"/>
Lines 89-105 Link Here
89
    </makenbm>
71
    </makenbm>
90
  </target>
72
  </target>
91
73
92
  <target name="clean">
74
  <target name="clean" depends="init">
93
    <delete>
75
    <delete>
94
      <fileset dir="src">
76
      <fileset dir="src">
95
        <include name="**/*.class"/>
77
        <include name="**/*.class"/>
96
      </fileset>
78
      </fileset>
79
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
80
        <patternset refID="debuggerjpda.files"/>
81
      </fileset>
97
    </delete>
82
    </delete>
98
    <delete file="manifest-subst.mf"/>
83
    <delete file="manifest-subst.mf"/>
99
    <delete file="debuggerjpda.nbm"/>
84
    <delete file="debuggerjpda.nbm"/>
100
    <delete dir="netbeans"/>
101
    <delete dir="javadoc"/>
85
    <delete dir="javadoc"/>
102
    <delete dir="Info"/>
103
  </target>
86
  </target>
104
87
105
  <target name="javadoc" depends="init" description="Build debuggerjpda module API documentation.">
88
  <target name="javadoc" depends="init" description="Build debuggerjpda module API documentation.">
(-)diff/build.xml (-32 / +29 lines)
Lines 15-41 Link Here
15
<!-- Special targets: diff-apis -->
15
<!-- Special targets: diff-apis -->
16
16
17
<project name="diff" default="netbeans" basedir=".">
17
<project name="diff" default="netbeans" basedir=".">
18
  <import file="../nbbuild/default.xml"/> 
18
19
19
  <property name="nbroot" value=".."/>
20
  <target name="init" depends="default.init">
20
  <property name="nbext" value="${nbroot}/nbbuild"/>
21
    <patternset id="diff.files">
21
  <property name="nbm_alias" value="nb_ide"/>
22
      <include name="${nb.modules.dir}/diff.jar"/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
    </patternset>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
    <path id="cp">
24
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
25
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
26
      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
26
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
29
    </path>
29
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
30
  </target>
30
31
  <path id="cp">
32
    <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
33
    <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
34
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
35
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
36
  </path>
37
31
38
  <target name="compile">
32
  <target name="compile" depends="init">
39
    <javac srcdir="src" 
33
    <javac srcdir="src" 
40
        deprecation="${build.compiler.deprecation}" 
34
        deprecation="${build.compiler.deprecation}" 
41
        debug="${build.compiler.debug}"
35
        debug="${build.compiler.debug}"
Lines 45-70 Link Here
45
  </target>
39
  </target>
46
40
47
  <target name="jars" depends="compile">
41
  <target name="jars" depends="compile">
48
    <mkdir dir="netbeans/modules"/>
42
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
49
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
50
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
51
    <locjar jarfile="netbeans/modules/diff.jar"
45
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/diff.jar"
52
         manifest="manifest-subst.mf"
46
         manifest="manifest-subst.mf"
53
         basedir="src"
47
         basedir="src"
54
         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
48
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
55
         compress="false">
49
         compress="false"/>
56
      <locale name="ja"/>
57
    </locjar>
58
  </target>
50
  </target>
59
51
60
  <target name="netbeans" depends="jars">
52
  <target name="netbeans" depends="jars">
61
    <genlist targetname="nbm" outputfiledir="netbeans"/>
53
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/diff.jar">
54
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
55
         <patternset refID="diff.files"/>
56
       </fileset>
57
    </genlist>
62
  </target>
58
  </target>
63
59
64
  <target name="nbm" depends="netbeans">
60
  <target name="nbm" depends="netbeans">
65
    <makenbm file="diff.nbm"
61
    <makenbm file="diff.nbm"
66
             topdir="."
62
             productdir="${netbeans.dest.dir}/${cluster.dir}"
67
	     module="netbeans/modules/diff.jar"
63
	     module="${nb.modules.dir}/diff.jar"
68
	     homepage="http://diff.${homepage.base}/"
64
	     homepage="http://diff.${homepage.base}/"
69
	     distribution="http://${dist.base}/diff.nbm">
65
	     distribution="http://${dist.base}/diff.nbm">
70
      <license file="${license.file}"/>
66
      <license file="${license.file}"/>
Lines 72-78 Link Here
72
    </makenbm>
68
    </makenbm>
73
  </target>
69
  </target>
74
70
75
  <target name="javadoc">
71
  <target name="javadoc" depends="init">
76
    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
72
    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
77
      <property name="javadoc.base" location="."/>
73
      <property name="javadoc.base" location="."/>
78
      <property name="javadoc.name" value="DiffAPI"/>
74
      <property name="javadoc.name" value="DiffAPI"/>
Lines 85-102 Link Here
85
    </ant>
81
    </ant>
86
  </target>
82
  </target>
87
83
88
  <target name="clean">
84
  <target name="clean" depends="init">
89
    <delete dir="javadoc"/>
85
    <delete dir="javadoc"/>
90
    <delete>
86
    <delete>
91
      <fileset dir="src">
87
      <fileset dir="src">
92
        <include name="**/*.class"/>
88
        <include name="**/*.class"/>
93
        <include name="**/*.jar"/>
89
        <include name="**/*.jar"/>
94
      </fileset>
90
      </fileset>
91
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
92
        <patternset refID="diff.files"/>
93
      </fileset>
95
    </delete>
94
    </delete>
96
    <delete file="manifest-subst.mf"/>
95
    <delete file="manifest-subst.mf"/>
97
    <delete file="diff.nbm"/>
96
    <delete file="diff.nbm"/>
98
    <delete dir="netbeans"/>
99
    <delete dir="Info"/>
100
  </target>
97
  </target>
101
98
102
</project>
99
</project>
(-)editor/build.xml (-55 / +52 lines)
Lines 13-84 Link Here
13
-->
13
-->
14
14
15
<project name="editor" default="netbeans" basedir=".">
15
<project name="editor" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="editor.files">
20
      <include name="${nb.modules.dir}/editor.jar"/>
21
      <include name="${nb.modules.dir}/ext/nb-editor.jar"/>
22
      <include name="${nb.system.dir}/ParserDB/jdk14.jcb"/>
23
      <include name="${nb.system.dir}/ParserDB/jdk14.jcs"/>
24
    </patternset>
25
    <path id="cp">
26
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <!-- XXX illegal dependency on core! -->
29
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
30
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
32
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
33
      <pathelement location="libsrc"/>
34
    </path>
35
    <path id="libcp">
36
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
37
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
38
    </path>
39
  </target>
16
40
17
  <property name="nbm_alias" value="nb_ide"/>
41
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
25
  <target name="compile">
26
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
42
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27
      <!-- We need Openide-util library. Namely RequestProcessor. -->
43
      <!-- We need Openide-util library. Namely RequestProcessor. -->
28
      <classpath>
44
      <classpath refID="libcp"/>
29
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
30
      </classpath>
31
    </javac>
45
    </javac>
32
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
46
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
33
      <classpath>
47
      <classpath refID="cp"/>
34
       <!-- XXX illegal dependency on core! -->
35
       <pathelement location="../core/netbeans/lib/core.jar"/>
36
       <pathelement location="libsrc"/>
37
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
38
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
39
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
40
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
41
        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
42
      </classpath>
43
    </javac>
48
    </javac>
44
  </target>
49
  </target>
45
50
46
  <target name="jars" depends="compile">
51
  <target name="jars" depends="compile">
47
    <mkdir dir="netbeans/modules"/>
52
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
48
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
53
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
49
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
54
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
50
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
55
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/editor.jar"
51
    <locjar jarfile="netbeans/modules/editor.jar"
56
         manifest="manifest-subst.mf"
52
            manifest="manifest-subst.mf"
57
         basedir="src"
53
            basedir="src"
58
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
54
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
59
	 compress="false"/>
55
	    compress="false">
60
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
56
      <locale name="ja"/>
61
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/nb-editor.jar"
57
    </locjar>
62
         basedir="libsrc"
58
    <mkdir dir="netbeans/modules/ext"/>
63
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
59
    <locjar jarfile="netbeans/modules/ext/nb-editor.jar"
64
	 compress="false"/>
60
            basedir="libsrc"
61
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
62
	    compress="false">
63
      <locale name="ja"/>
64
    </locjar>
65
  </target>
65
  </target>
66
66
67
  <target name="release">
67
  <target name="release" depends="init">
68
    <copy todir="netbeans" 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
    </copy>
70
    </copy>
71
  </target>
71
  </target>
72
72
73
  <target name="netbeans" depends="jars,release">
73
  <target name="netbeans" depends="jars,release">
74
    <genlist targetname="nbm" outputfiledir="netbeans"/>
74
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/editor.jar">
75
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
76
        <patternset refID="editor.files"/>
77
      </fileset>
78
    </genlist>
75
  </target>
79
  </target>
76
80
77
81
78
  <target name="nbm" depends="netbeans">
82
  <target name="nbm" depends="netbeans">
79
    <makenbm file="editor.nbm"
83
    <makenbm file="editor.nbm"
80
             topdir="."
84
             productdir="${netbeans.dest.dir}/${cluster.dir}"
81
             module="netbeans/modules/editor.jar"
85
             module="${nb.modules.dir}/editor.jar"
82
	     homepage="http://editor.${homepage.base}/"
86
	     homepage="http://editor.${homepage.base}/"
83
	     distribution="http://${dist.base}/editor.nbm">
87
	     distribution="http://${dist.base}/editor.nbm">
84
      <license file="${license.file}"/>
88
      <license file="${license.file}"/>
Lines 86-92 Link Here
86
    </makenbm>
90
    </makenbm>
87
  </target>
91
  </target>
88
92
89
  <target name="clean">
93
  <target name="clean" depends="init">
90
    <delete>
94
    <delete>
91
      <fileset dir="src">
95
      <fileset dir="src">
92
        <include name="**/*.class"/>
96
        <include name="**/*.class"/>
Lines 96-118 Link Here
96
      <fileset dir="libsrc">
100
      <fileset dir="libsrc">
97
        <include name="**/*.class"/>
101
        <include name="**/*.class"/>
98
      </fileset>
102
      </fileset>
103
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
104
        <patternset refID="editor.files"/>
105
      </fileset>
99
    </delete>
106
    </delete>
100
    <delete file="manifest-subst.mf"/>
107
    <delete file="manifest-subst.mf"/>
101
    <delete file="editor.nbm"/>
108
    <delete file="editor.nbm"/>
102
    <delete dir="netbeans"/>
103
    <delete dir="javadoc"/>
109
    <delete dir="javadoc"/>
104
    <delete dir="Info"/>
105
  </target>
110
  </target>
106
111
107
  <path id="cp">
112
  <target name="javadoc" depends="init" description="Build editor module API documentation.">
108
    <pathelement location="src" />
109
    <pathelement location="libsrc"/>
110
    <pathelement location="../openide/openide-13javac-workaround.jar"/>
111
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
112
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
113
  </path>
114
115
  <target name="javadoc" description="Build editor module API documentation.">
116
     <selector id="editor_javadoc_files" >
113
     <selector id="editor_javadoc_files" >
117
       <or>
114
       <or>
118
         <filename name="src/**/*.java" />
115
         <filename name="src/**/*.java" />
(-)extbrowser/build.xml (-37 / +33 lines)
Lines 13-69 Link Here
13
-->
13
-->
14
14
15
<project name="extbrowser" default="netbeans" basedir=".">
15
<project name="extbrowser" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="extbrowser.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/extbrowser.jar"/>
20
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
21
      <include name="${nb.modules.dir}/bin/extbrowser.dll"/>
21
22
    </patternset>
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
    <path id="cp">
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
27
    </path>
28
  </target>
25
29
26
  <target name="compile">
30
  <target name="compile" depends="init">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
31
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <include name="org/netbeans/modules/extbrowser/"/>
32
      <include name="org/netbeans/modules/extbrowser/"/>
29
      <classpath>
33
      <classpath refID="cp"/>
30
        <!--<pathelement location="patches"/>-->
31
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
32
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
33
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
34
      </classpath>
35
    </javac>
34
    </javac>
36
  </target>
35
  </target>
37
36
38
  <target name="jars" depends="compile">
37
  <target name="jars" depends="compile">
39
    <mkdir dir="netbeans/modules"/>
38
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
40
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <locjar jarfile="netbeans/modules/extbrowser.jar"
41
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/extbrowser.jar"
43
         manifest="manifest-subst.mf"
42
         manifest="manifest-subst.mf"
44
         basedir="src"
43
         basedir="src"
45
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
44
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
46
	 compress="false">
45
	 compress="false"/>
47
      <locale name="ja"/>
48
    </locjar>
49
  </target>
46
  </target>
50
47
51
  <target name="release">
48
  <target name="release" depends="init">
52
    <copy todir="netbeans">
49
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}">
53
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
50
      <fileset dir="release/modules" excludesfile="../nbbuild/standard-jar-excludes.txt">
54
        <exclude name="**/sources/*"/>
51
        <exclude name="**/sources/*"/>
55
      </fileset>
52
      </fileset>
56
    </copy>
53
    </copy>
57
  </target>
54
  </target>
58
55
59
  <target name="netbeans" depends="jars,release">
56
  <target name="netbeans" depends="jars,release">
60
    <genlist targetname="nbm" outputfiledir="netbeans"/>
57
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/extbrowser.jar">
58
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
59
         <patternset refID="extbrowser.files"/>
60
       </fileset>
61
    </genlist>
61
  </target>
62
  </target>
62
63
63
  <target name="nbm" depends="netbeans">
64
  <target name="nbm" depends="netbeans">
64
    <makenbm file="extbrowser.nbm"
65
    <makenbm file="extbrowser.nbm"
65
             topdir="."
66
             productdir="${netbeans.dest.dir}/${cluster.dir}"
66
             module="netbeans/modules/extbrowser.jar"
67
             module="${nb.modules.dir}/extbrowser.jar"
67
	     homepage="http://extbrowser.${homepage.base}/"
68
	     homepage="http://extbrowser.${homepage.base}/"
68
	     distribution="http://${dist.base}/extbrowser.nbm">
69
	     distribution="http://${dist.base}/extbrowser.nbm">
69
      <license file="${license.file}"/>
70
      <license file="${license.file}"/>
Lines 71-87 Link Here
71
    </makenbm>
72
    </makenbm>
72
  </target>
73
  </target>
73
74
74
  <target name="clean">
75
  <target name="clean" depends="init">
75
    <delete>
76
    <delete>
76
      <fileset dir="src">
77
      <fileset dir="src">
77
        <include name="org/netbeans/modules/extbrowser/*.class"/>
78
        <include name="org/netbeans/modules/extbrowser/*.class"/>
78
      </fileset>
79
      </fileset>
80
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
81
        <patternset refID="extbrowser.files"/>
82
      </fileset>
79
    </delete>
83
    </delete>
80
    <delete file="manifest-subst.mf"/>
84
    <delete file="manifest-subst.mf"/>
81
    <delete file="extbrowser.nbm"/>
85
    <delete file="extbrowser.nbm"/>
82
    <delete dir="netbeans"/>
83
    <delete dir="javadoc"/>
86
    <delete dir="javadoc"/>
84
    <delete dir="Info"/>
85
  </target>
87
  </target>
86
88
87
  <!-- This target will only work *inside* the IDE! -->
89
  <!-- This target will only work *inside* the IDE! -->
Lines 89-95 Link Here
89
    <nbinstaller action="reinstall" module="netbeans/modules/extbrowser.jar"/>
91
    <nbinstaller action="reinstall" module="netbeans/modules/extbrowser.jar"/>
90
  </target>
92
  </target>
91
93
92
  <target name="javadoc" description="Build extbrowser module API documentation.">
94
  <target name="javadoc" depends="init" description="Build extbrowser module API documentation.">
93
    <tstamp/>
95
    <tstamp/>
94
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
96
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
95
    <echo message="Build extbrowser module API documentation..."/>
97
    <echo message="Build extbrowser module API documentation..."/>
Lines 108-120 Link Here
108
      <sourcepath>
110
      <sourcepath>
109
        <pathelement location="src"/>
111
        <pathelement location="src"/>
110
      </sourcepath>
112
      </sourcepath>
111
      <classpath>
113
      <classpath refID="cp"/>
112
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
113
        <fileset dir="../openide/netbeans/lib">
114
          <include name="openide*.jar" />
115
        </fileset>
116
        <pathelement location="../httpserver/netbeans/modules/httpserver.jar"/>
117
      </classpath>
118
    </javadoc>    
114
    </javadoc>    
119
  </target>
115
  </target>
120
116
(-)form/build.xml (-51 / +53 lines)
Lines 13-44 Link Here
13
-->
13
-->
14
14
15
<project name="form" default="netbeans" basedir=".">
15
<project name="form" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="form.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/form.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
      <include name="${nb.modules.dir}/ext/AbsoluteLayout.jar"/>
21
22
      <include name="${nb.sources.dir}/readme.txt"/>
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
      <include name="${nb.sources.dir}/org/netbeans/lib/awtextra/AbsoluteConstraints.java"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
      <include name="${nb.sources.dir}/org/netbeans/lib/awtextra/AbsoluteLayout.java"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
    </patternset>
26
27
    <path id="cp">
28
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
32
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
33
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
34
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
35
      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
36
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
37
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
38
      <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
39
      <pathelement location="tmp"/>
40
    </path>
41
  </target>
25
42
26
  <target name="compile" depends="hack13">
43
  <target name="compile" depends="hack13,init">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
45
      <classpath refID="cp"/>
29
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
31
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
32
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
33
        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
34
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
35
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
36
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
37
        <pathelement location="../java/api/netbeans/modules/autoload/java-api.jar"/>
38
        <pathelement location="../java/netbeans/modules/java.jar"/>
39
        <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
40
        <pathelement location="tmp"/>
41
      </classpath>
42
    </javac>
46
    </javac>
43
  </target>
47
  </target>
44
48
Lines 61-92 Link Here
61
  </target>
65
  </target>
62
66
63
  <target name="jars" depends="compile">
67
  <target name="jars" depends="compile">
64
    <mkdir dir="netbeans/modules"/>
68
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
65
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
69
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
66
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
70
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
67
    <locjar jarfile="netbeans/modules/form.jar"
71
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/form.jar"
68
            manifest="manifest-subst.mf"
72
         manifest="manifest-subst.mf"
69
            basedir="src"
73
         basedir="src"
70
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
74
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
71
	    compress="false">
75
	 compress="false"/>
72
      <locale name="ja"/>
73
    </locjar>
74
  </target>
76
  </target>
75
77
76
  <target name="release">
78
  <target name="release" depends="init">
77
    <copy todir="netbeans">
79
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}">
78
      <fileset dir="release"/>
80
      <fileset dir="release/modules"/>
81
    </copy>
82
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.sources.dir}">
83
      <fileset dir="release/sources"/>
79
    </copy>
84
    </copy>
80
  </target>
85
  </target>
81
86
82
  <target name="netbeans" depends="jars,release">
87
  <target name="netbeans" depends="jars,release">
83
    <genlist targetname="nbm" outputfiledir="netbeans"/>
88
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/form.jar">
89
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
90
        <patternset refID="form.files"/>
91
      </fileset>
92
    </genlist>
84
  </target>
93
  </target>
85
94
86
  <target name="nbm" depends="netbeans">
95
  <target name="nbm" depends="netbeans">
87
    <makenbm file="form.nbm"
96
    <makenbm file="form.nbm"
88
             topdir="."
97
             productdir="${netbeans.dest.dir}/${cluster.dir}"
89
             module="netbeans/modules/form.jar"
98
             module="${nb.modules.dir}/form.jar"
90
	     homepage="http://form.${homepage.base}/"
99
	     homepage="http://form.${homepage.base}/"
91
	     distribution="http://${dist.base}/form.nbm">
100
	     distribution="http://${dist.base}/form.nbm">
92
      <license file="${license.file}"/>
101
      <license file="${license.file}"/>
Lines 94-115 Link Here
94
    </makenbm>
103
    </makenbm>
95
  </target>
104
  </target>
96
105
97
  <target name="clean">
106
  <target name="clean" depends="init">
98
    <delete>
107
    <delete>
99
      <fileset dir="src">
108
      <fileset dir="src">
100
        <include name="**/*.class"/>
109
        <include name="**/*.class"/>
101
        <include name="**/*.jar"/>
110
        <include name="**/*.jar"/>
102
      </fileset>
111
      </fileset>
112
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
113
        <patternset refID="form.files"/>
114
      </fileset>
103
    </delete>
115
    </delete>
104
    <delete file="manifest-subst.mf"/>
116
    <delete file="manifest-subst.mf"/>
105
    <delete file="form.nbm"/>
117
    <delete file="form.nbm"/>
106
    <delete dir="netbeans"/>
107
    <delete dir="javadoc"/>
118
    <delete dir="javadoc"/>
108
    <delete dir="Info"/>
109
    <delete dir="tmp" />
119
    <delete dir="tmp" />
110
  </target>
120
  </target>
111
121
112
  <target name="javadoc" depends="compile" description="Build form module API documentation.">
122
  <target name="javadoc" depends="init,compile" description="Build form module API documentation.">
113
    <tstamp/>
123
    <tstamp/>
114
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
124
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
115
    <echo message="Build form module API documentation..."/>
125
    <echo message="Build form module API documentation..."/>
Lines 128-143 Link Here
128
      <sourcepath>
138
      <sourcepath>
129
        <pathelement location="src"/>
139
        <pathelement location="src"/>
130
      </sourcepath>
140
      </sourcepath>
131
      <classpath>
141
      <classpath refID="cp"/>
132
        <pathelement location="../openide/openide-13javac-workaround.jar"/>
142
   </javadoc>
133
        <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
134
        <fileset dir="../openide/netbeans/lib">
135
          <include name="openide*.jar" />
136
        </fileset>
137
        <pathelement location="../java/netbeans/modules/java.jar"/>
138
        <pathelement location="tmp"/>
139
      </classpath>
140
    </javadoc>
141
  </target>
143
  </target>
142
144
143
</project>
145
</project>
(-)html/build.xml (-37 / +34 lines)
Lines 13-59 Link Here
13
-->
13
-->
14
14
15
<project name="html" default="netbeans" basedir=".">
15
<project name="html" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="html.files">
20
      <include name="${nb.modules.dir}/html.jar"/>
21
    </patternset>
22
    <path id="cp">
23
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
27
    </path>
28
  </target>
16
29
17
  <property name="nbm_alias" value="nb_ide"/>
30
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
26
  <target name="compile">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
31
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
32
      <classpath refID="cp"/>
29
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
31
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
      </classpath>
33
    </javac>
33
    </javac>
34
  </target>
34
  </target>
35
35
36
  <target name="jars" depends="compile">
36
  <target name="jars" depends="compile">
37
    <mkdir dir="netbeans/modules"/>
37
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <locjar jarfile="netbeans/modules/html.jar"
40
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/html.jar"
41
            manifest="manifest-subst.mf"
41
         manifest="manifest-subst.mf"
42
            basedir="src"
42
         basedir="src"
43
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
43
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
44
	    compress="false">
44
	 compress="false"/>
45
      <locale name="ja"/>
46
    </locjar>
47
  </target>
45
  </target>
48
46
49
  <target name="netbeans" depends="jars">
47
  <target name="netbeans" depends="jars">
50
    <genlist targetname="nbm" outputfiledir="netbeans"/>
48
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/html.jar">
49
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
50
        <patternset refID="html.files"/>
51
      </fileset>
52
    </genlist>
51
  </target>
53
  </target>
52
54
53
  <target name="nbm" depends="netbeans">
55
  <target name="nbm" depends="netbeans">
54
    <makenbm file="html.nbm"
56
    <makenbm file="html.nbm"
55
             topdir="."
57
             productdir="${netbeans.dest.dir}/${cluster.dir}"
56
             module="netbeans/modules/html.jar"
58
             module="${nb.modules.dir}/html.jar"
57
	     homepage="http://html.${homepage.base}/"
59
	     homepage="http://html.${homepage.base}/"
58
	     distribution="http://${dist.base}/html.nbm">
60
	     distribution="http://${dist.base}/html.nbm">
59
      <license file="${license.file}"/>
61
      <license file="${license.file}"/>
Lines 61-77 Link Here
61
    </makenbm>
63
    </makenbm>
62
  </target>
64
  </target>
63
65
64
  <target name="clean">
66
  <target name="clean" depends="init">
65
    <delete>
67
    <delete>
66
      <fileset dir="src">
68
      <fileset dir="src">
67
        <include name="**/*.class"/>
69
        <include name="**/*.class"/>
68
      </fileset>
70
      </fileset>
71
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
72
        <patternset refID="html.files"/>
73
      </fileset>
69
    </delete>
74
    </delete>
70
    <delete file="manifest-subst.mf"/>
75
    <delete file="manifest-subst.mf"/>
71
    <delete file="html.nbm"/>
76
    <delete file="html.nbm"/>
72
    <delete dir="netbeans"/>
73
    <delete dir="javadoc"/>
77
    <delete dir="javadoc"/>
74
    <delete dir="Info"/>
75
  </target>
78
  </target>
76
79
77
  <!-- This target will only work *inside* the IDE! -->
80
  <!-- This target will only work *inside* the IDE! -->
Lines 79-85 Link Here
79
    <nbinstaller action="reinstall" module="netbeans/modules/html.jar"/>
82
    <nbinstaller action="reinstall" module="netbeans/modules/html.jar"/>
80
  </target>
83
  </target>
81
  
84
  
82
  <target name="javadoc" description="Build html module API documentation.">
85
  <target name="javadoc" depends="init" description="Build html module API documentation.">
83
    <tstamp/>
86
    <tstamp/>
84
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
87
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
85
    <echo message="Build html module API documentation..."/>
88
    <echo message="Build html module API documentation..."/>
Lines 98-110 Link Here
98
      <sourcepath>
101
      <sourcepath>
99
        <pathelement location="src"/>
102
        <pathelement location="src"/>
100
      </sourcepath>
103
      </sourcepath>
101
      <classpath>
104
      <classpath refID="cp"/>
102
        <!-- this classpath probably should be the same as for compilation -->
103
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
104
        <fileset dir="../openide/netbeans/lib">
105
          <include name="openide*.jar" />
106
        </fileset>
107
      </classpath>
108
    </javadoc>    
105
    </javadoc>    
109
  </target>
106
  </target>
110
107
(-)httpserver/build.xml (-33 / +37 lines)
Lines 13-34 Link Here
13
-->
13
-->
14
14
15
<project name="httpserver" default="netbeans" basedir=".">
15
<project name="httpserver" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="httpserver.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/httpserver.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
      <include name="${nb.modules.dir}/ext/webserver*.jar"/>
21
22
    </patternset>
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
23
26
  <target name="init">
27
    <ant dir="external" target="unscramble"/>
24
    <ant dir="external" target="unscramble"/>
28
    <path id="httpserver-cp">
25
29
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
26
    <path id="cp">
30
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
27
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
28
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
29
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
      <fileset dir="external">
30
      <fileset dir="external">
33
        <include name="webserver*.jar"/>
31
        <include name="webserver*.jar"/>
34
        <include name="servlet-2.2.jar"/>
32
        <include name="servlet-2.2.jar"/>
Lines 38-71 Link Here
38
36
39
  <target name="compile" depends="init">
37
  <target name="compile" depends="init">
40
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
38
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
      <classpath refid="httpserver-cp"/>
39
      <classpath refid="cp"/>
42
    </javac>
40
    </javac>
43
  </target>
41
  </target>
44
42
45
  <target name="jars" depends="compile">
43
  <target name="jars" depends="compile">
46
    <mkdir dir="netbeans/modules"/>
44
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
47
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
45
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
46
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
    <locjar jarfile="netbeans/modules/httpserver.jar"
47
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/httpserver.jar"
50
            manifest="manifest-subst.mf"
48
         manifest="manifest-subst.mf"
51
            basedir="src"
49
         basedir="src"
52
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
50
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
53
	    compress="false">
51
	 compress="false"/>
54
      <locale name="ja"/>
55
    </locjar>
56
  </target>
52
  </target>
57
53
58
  <target name="netbeans" depends="jars,release">
54
  <target name="netbeans" depends="jars,release">
59
    <genlist targetname="nbm" outputfiledir="netbeans"/>
55
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/httpserver.jar">
56
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
57
        <patternset refID="httpserver.files"/>
58
      </fileset>
59
    </genlist>
60
  </target>
60
  </target>
61
61
62
  <target name="release" depends="init">
62
  <target name="release" depends="init">
63
<!-- Doesn't make sense to me to create directory and then copy the files from it.
64
    It can be probably used for developers to add files to build, but then they should add
65
    those file to httpserver.files patternset, so I'm commenting this out for now
63
    <mkdir dir="release"/>
66
    <mkdir dir="release"/>
64
    <copy todir="netbeans" includeEmptyDirs="false">
67
    <copy todir="netbeans" includeEmptyDirs="false">
65
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
68
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
66
    </copy>
69
    </copy>-->
67
    <mkdir dir="netbeans/modules/ext"/>
70
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
68
    <copy todir="netbeans/modules/ext">
71
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
69
      <fileset dir="external">
72
      <fileset dir="external">
70
        <include name="webserver*.jar"/>
73
        <include name="webserver*.jar"/>
71
      </fileset>
74
      </fileset>
Lines 74-81 Link Here
74
77
75
  <target name="nbm" depends="netbeans">
78
  <target name="nbm" depends="netbeans">
76
    <makenbm file="httpserver.nbm"
79
    <makenbm file="httpserver.nbm"
77
             topdir="."
80
             productdir="${netbeans.dest.dir}/${cluster.dir}"
78
             module="netbeans/modules/httpserver.jar"
81
             module="${nb.modules.dir}/httpserver.jar"
79
	     homepage="http://httpserver.${homepage.base}/"
82
	     homepage="http://httpserver.${homepage.base}/"
80
	     distribution="http://${dist.base}/httpserver.nbm">
83
	     distribution="http://${dist.base}/httpserver.nbm">
81
      <license name="httpserver-module-license.txt">
84
      <license name="httpserver-module-license.txt">
Lines 88-104 Link Here
88
    </makenbm>
91
    </makenbm>
89
  </target>
92
  </target>
90
93
91
  <target name="clean">
94
  <target name="clean" depends="init">
92
    <delete>
95
    <delete>
93
      <fileset dir="src">
96
      <fileset dir="src">
94
        <include name="**/*.class"/>
97
        <include name="**/*.class"/>
95
      </fileset>
98
      </fileset>
99
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
100
        <patternset refID="httpserver.files"/>
101
      </fileset>
96
    </delete>
102
    </delete>
97
    <delete file="manifest-subst.mf"/>
103
    <delete file="manifest-subst.mf"/>
98
    <delete file="httpserver.nbm"/>
104
    <delete file="httpserver.nbm"/>
99
    <delete dir="netbeans"/>
100
    <delete dir="javadoc"/>
105
    <delete dir="javadoc"/>
101
    <delete dir="Info"/>
102
  </target>
106
  </target>
103
107
104
  <!-- This target will only work *inside* the IDE! -->
108
  <!-- This target will only work *inside* the IDE! -->
Lines 106-112 Link Here
106
    <nbinstaller action="reinstall" module="netbeans/modules/httpserver.jar"/>
110
    <nbinstaller action="reinstall" module="netbeans/modules/httpserver.jar"/>
107
  </target>
111
  </target>
108
112
109
  <target name="javadoc" description="Build httpserver module API documentation.">
113
  <target name="javadoc" depends="init" description="Build httpserver module API documentation.">
110
    <tstamp/>
114
    <tstamp/>
111
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
115
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
112
    <echo message="Build httpserver module API documentation..."/>
116
    <echo message="Build httpserver module API documentation..."/>
Lines 125-131 Link Here
125
      <sourcepath>
129
      <sourcepath>
126
        <pathelement location="src"/>
130
        <pathelement location="src"/>
127
      </sourcepath>
131
      </sourcepath>
128
      <classpath refid="httpserver-cp"/>
132
      <classpath refid="cp"/>
129
    </javadoc>    
133
    </javadoc>    
130
  </target>
134
  </target>
131
135
(-)httpserver/servletapi/build.xml (-30 / +31 lines)
Lines 13-63 Link Here
13
-->
13
-->
14
14
15
<project name="servletapi" basedir="." default="netbeans">
15
<project name="servletapi" basedir="." default="netbeans">
16
  <import file="../../nbbuild/default.xml"/>
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
    <patternset id="httpserver/servletapi.files">
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
      <include name="${nb.modules/autoload.dir}/servletapi.jar"/>
20
21
      <include name="${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
21
  <property name="nb_root" location="../.."/>
22
    </patternset>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
27
  <target name="init">
28
    <ant dir="../external" target="unscramble"/>
23
    <ant dir="../external" target="unscramble"/>
24
    <path id="cp">
25
    </path>
29
  </target>
26
  </target>
30
27
31
  <target name="jars">
28
  <target name="jars" depends="init">
32
    <mkdir dir="netbeans/modules/autoload"/>
29
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
33
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
30
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
34
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
31
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
35
    <locjar jarfile="netbeans/modules/autoload/servletapi.jar"
32
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi.jar"
36
            manifest="manifest-subst.mf"
33
         manifest="manifest-subst.mf"
37
            basedir="src"
34
         basedir="src"
38
            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
35
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
39
            compress="false">
36
         compress="false">
40
      <include name="org/netbeans/modules/servletapi/"/>
37
      <include name="org/netbeans/modules/servletapi/"/>
41
      <locale name="ja"/>
38
    </jar>
42
    </locjar>
43
  </target>
39
  </target>
44
40
45
  <target name="release" depends="init">
41
  <target name="release" depends="init">
46
    <mkdir dir="netbeans/modules/autoload/ext"/>
42
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
47
    <copy file="../external/servlet-2.2.jar"
43
    <copy file="../external/servlet-2.2.jar"
48
          tofile="netbeans/modules/autoload/ext/servlet-2.2.jar"/>
44
          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
49
  </target>
45
  </target>
50
46
51
  <target name="netbeans" depends="jars,release" description="Builds the module">
47
  <target name="netbeans" depends="jars,release" description="Builds the module">
52
    <genlist targetname="nbm" outputfiledir="netbeans"/>
48
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi.jar">
49
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
50
        <patternset refID="httpserver/servletapi.files"/>
51
      </fileset>
52
    </genlist>
53
  </target>
53
  </target>
54
54
55
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
55
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
56
    <makenbm file="servletapi.nbm"
56
    <makenbm file="servletapi.nbm"
57
             topdir="."
57
             productdir="${netbeans.dest.dir}/${cluster.dir}"
58
           module="netbeans/modules/autoload/servletapi.jar"
58
             module="${nb.modules/autoload.dir}/servletapi.jar"
59
           homepage="http://httpserver.${homepage.base}/"
59
             homepage="http://httpserver.${homepage.base}/"
60
           distribution="http://${dist.base}/servletapi.nbm">
60
             distribution="http://${dist.base}/servletapi.nbm">
61
      <license name="servletapi-license.txt">
61
      <license name="servletapi-license.txt">
62
        <text>For the integration module:</text>
62
        <text>For the integration module:</text>
63
        <file location="${license.file}"/>
63
        <file location="${license.file}"/>
Lines 68-82 Link Here
68
    </makenbm>
68
    </makenbm>
69
  </target>
69
  </target>
70
70
71
  <target name="clean" description="Clean all build products.">
71
  <target name="clean" depends="init" description="Clean all build products.">
72
        <delete>
72
        <delete>
73
            <fileset dir="../src">
73
            <fileset dir="../src">
74
                <include name="org/netbeans/modules/servletapi/**/*.class"/>
74
                <include name="org/netbeans/modules/servletapi/**/*.class"/>
75
            </fileset>
75
            </fileset>
76
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
77
                <patternset refID="httpserver/servletapi.files"/>
78
            </fileset>
76
        </delete>
79
        </delete>
77
        <delete file="manifest-subst.mf"/>
80
        <delete file="manifest-subst.mf"/>
78
        <delete dir="netbeans"/>
79
        <delete dir="Info"/>
80
        <delete file="servletapi.nbm"/>
81
        <delete file="servletapi.nbm"/>
81
  </target>
82
  </target>
82
83
(-)i18n/build.xml (-47 / +62 lines)
Lines 13-24 Link Here
13
-->
13
-->
14
14
15
<project name="i18n" default="netbeans" basedir=".">
15
<project name="i18n" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
  <property name="build.compiler.debug" value="on"/>
22
  <property name="javadoc.private" value="false"/>
18
  <property name="javadoc.private" value="false"/>
23
  <property name="docs.location.jdk"
19
  <property name="docs.location.jdk"
24
            value="http://java.sun.com/j2se/1.4.2/docs/api"/>
20
            value="http://java.sun.com/j2se/1.4.2/docs/api"/>
Lines 27-54 Link Here
27
  <property name="docs.location.openide-deprecated"
23
  <property name="docs.location.openide-deprecated"
28
            value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
24
            value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
29
25
30
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
26
  <target name="init" depends="default.init">
31
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
27
    <patternset id="i18n.files">
32
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
28
      <include name="${nb.modules.dir}/i18n.jar"/>
33
29
    </patternset>
34
  <target name="init">
30
    <patternset id="i18n-form.files">
31
      <include name="${nb.modules/eager.dir}/i18n.jar"/>
32
    </patternset>
35
    <path id="i18n-noform-cp">
33
    <path id="i18n-noform-cp">
36
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
34
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
37
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
35
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
38
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
36
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
39
      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
37
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
40
      <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
38
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
41
      <pathelement location="../core/netbeans/lib/core.jar"/>
39
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
42
      <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
40
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
43
      <pathelement location="../properties/netbeans/modules/properties.jar"/>
41
      <pathelement location="${properties.dir}/${nb.modules.dir}/properties.jar"/>
44
    </path>
42
    </path>
45
    <path id="i18n-form-cp">
43
    <path id="i18n-form-cp">
46
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
44
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
47
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
45
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
48
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
46
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
49
      <pathelement location="../properties/netbeans/modules/properties.jar"/>
47
      <pathelement location="${properties.dir}/${nb.modules.dir}/properties.jar"/>
50
      <pathelement location="../form/netbeans/modules/form.jar"/>
48
      <pathelement location="${form.dir}/${nb.modules.dir}/form.jar"/>
51
      <pathelement location="../java/netbeans/modules/java.jar"/>
49
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
52
      <pathelement location="src" /> <!-- makes AspectJ compiler (ajc) happy -->
50
      <pathelement location="src" /> <!-- makes AspectJ compiler (ajc) happy -->
53
    </path>
51
    </path>
54
    <path id="i18n-cp">
52
    <path id="i18n-cp">
Lines 69-108 Link Here
69
  </target>
67
  </target>
70
68
71
  <target name="jars" depends="compile">
69
  <target name="jars" depends="compile">
72
    <mkdir dir="netbeans/modules/eager"/>
70
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
73
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
71
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
74
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
72
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
75
    <locjar jarfile="netbeans/modules/i18n.jar"
73
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/i18n.jar"
76
            manifest="manifest-subst.mf"
74
         manifest="manifest-subst.mf"
77
            basedir="src"
75
         basedir="src"
78
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
76
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
79
	    compress="false">
77
	 compress="false">
80
      <exclude name="org/netbeans/modules/i18n/form/"/>
78
      <exclude name="org/netbeans/modules/i18n/form/"/>
81
      <exclude name="META-INF/netbeans/"/>
79
      <exclude name="META-INF/netbeans/"/>
82
      <locale name="ja"/>
80
    </jar>
83
    </locjar>
84
    <copy file="manifest-form.mf" tofile="manifest-form-subst.mf" filtering="on"/>
81
    <copy file="manifest-form.mf" tofile="manifest-form-subst.mf" filtering="on"/>
85
    <locjar jarfile="netbeans/modules/eager/i18n-form.jar"
82
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/i18n-form.jar"
86
            manifest="manifest-form-subst.mf"
83
         manifest="manifest-form-subst.mf"
87
            basedir="src"
84
         basedir="src"
88
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
85
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
89
	    compress="false">
86
	 compress="false">
90
      <include name="org/netbeans/modules/i18n/form/"/>
87
      <include name="org/netbeans/modules/i18n/form/"/>
91
      <include name="META-INF/netbeans/"/>
88
      <include name="META-INF/netbeans/"/>
92
      <locale name="ja"/>
89
    </jar>
93
    </locjar>
94
95
  </target>
90
  </target>
96
91
97
  <target name="netbeans" depends="jars">
92
  <target name="netbeans" depends="jars">
98
    <genlist targetname="nbm" outputfiledir="netbeans"/>
93
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/i18n.jar">
94
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
95
         <patternset refID="i18n.files"/>
96
       </fileset>
97
    </genlist>
98
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/i18n-form.jar">
99
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
100
         <patternset refID="i18n-form.files"/>
101
       </fileset>
102
    </genlist>
99
  </target>
103
  </target>
100
104
101
  <target name="nbm" depends="netbeans">
105
  <target name="nbm" depends="netbeans">
102
    <!-- XXX i18n-form.jar should have its own NBM -->
103
    <makenbm file="i18n.nbm"
106
    <makenbm file="i18n.nbm"
104
             topdir="."
107
             productdir="${netbeans.dest.dir}/${cluster.dir}"
105
             module="netbeans/modules/i18n.jar"
108
             module="${nb.modules.dir}/i18n.jar"
109
	     homepage="http://i18n.${homepage.base}/"
110
	     distribution="http://${dist.base}/i18n.nbm">
111
      <license file="${license.file}"/>
112
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
113
    </makenbm>
114
    <makenbm file="i18n-form.nbm"
115
             productdir="${netbeans.dest.dir}/${cluster.dir}"
116
             module="${nb.modules/eager.dir}/i18n-form.jar"
106
	     homepage="http://i18n.${homepage.base}/"
117
	     homepage="http://i18n.${homepage.base}/"
107
	     distribution="http://${dist.base}/i18n.nbm">
118
	     distribution="http://${dist.base}/i18n.nbm">
108
      <license file="${license.file}"/>
119
      <license file="${license.file}"/>
Lines 110-127 Link Here
110
    </makenbm>
121
    </makenbm>
111
  </target>
122
  </target>
112
123
113
  <target name="clean">
124
  <target name="clean" depends="init">
114
    <delete>
125
    <delete>
115
      <fileset dir="src">
126
      <fileset dir="src">
116
        <include name="**/*.class"/>
127
        <include name="**/*.class"/>
117
      </fileset>
128
      </fileset>
129
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
130
        <patternset refID="i18n.files"/>
131
      </fileset>
132
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
133
        <patternset refID="i18n-form.files"/>
134
      </fileset>
118
    </delete>
135
    </delete>
119
    <delete file="manifest-subst.mf"/>
136
    <delete file="manifest-subst.mf"/>
120
    <delete file="manifest-form-subst.mf"/>
137
    <delete file="manifest-form-subst.mf"/>
121
    <delete file="i18n.nbm"/>
138
    <delete file="i18n.nbm"/>
122
    <delete dir="netbeans"/>
123
    <delete dir="javadoc"/>
139
    <delete dir="javadoc"/>
124
    <delete dir="Info"/>
125
  </target>
140
  </target>
126
141
127
  <target name="javadoc" depends="init" description="Build i18n module API documentation.">
142
  <target name="javadoc" depends="init" description="Build i18n module API documentation.">
(-)ide/test/build-qa-functional.xml (-1 / +2 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="QA functional tests compilers and executors" basedir="." default="all">
15
<project name="QA functional tests compilers and executors" basedir="." default="all">
16
    <import file="../../nbbuild/default-properties.xml"/>
16
17
17
    <!-- =================== -->
18
    <!-- =================== -->
18
    <!-- Setting classpathes -->
19
    <!-- Setting classpathes -->
Lines 167-173 Link Here
167
	         If you need e.g. your tested module, write this:
168
	         If you need e.g. your tested module, write this:
168
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
169
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
169
 	      -->
170
 	      -->
170
 	    <pathelement location="${netbeans.home}/lib/openide.jar"/>
171
 	    <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
171
   	</path>
172
   	</path>
172
    </target>
173
    </target>
173
    
174
    
(-)image/build.xml (-36 / +33 lines)
Lines 13-59 Link Here
13
-->
13
-->
14
14
15
<project name="image" default="netbeans" basedir=".">
15
<project name="image" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="image.files">
20
      <include name="${nb.modules.dir}/image.jar"/>
21
    </patternset>
22
    <path id="cp">
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
    </path>
27
  </target>
16
28
17
  <property name="nbm_alias" value="nb_ide"/>
29
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
26
  <target name="compile">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
31
      <classpath refID="cp"/>
29
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
31
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
      </classpath>
33
    </javac>
32
    </javac>
34
  </target>
33
  </target>
35
34
36
  <target name="jars" depends="compile">
35
  <target name="jars" depends="compile">
37
    <mkdir dir="netbeans/modules"/>
36
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
38
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <locjar jarfile="netbeans/modules/image.jar"
39
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/image.jar"
41
            manifest="manifest-subst.mf"
40
         manifest="manifest-subst.mf"
42
            basedir="src"
41
         basedir="src"
43
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
42
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
44
	    compress="false">
43
	 compress="false"/>
45
      <locale name="ja"/>
46
    </locjar>
47
  </target>
44
  </target>
48
45
49
  <target name="netbeans" depends="jars">
46
  <target name="netbeans" depends="jars">
50
    <genlist targetname="nbm" outputfiledir="netbeans"/>
47
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/image.jar">
48
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
49
        <patternset refID="image.files"/>
50
      </fileset>
51
    </genlist>
51
  </target>
52
  </target>
52
53
53
  <target name="nbm" depends="netbeans">
54
  <target name="nbm" depends="netbeans">
54
    <makenbm file="image.nbm"
55
    <makenbm file="image.nbm"
55
             topdir="."
56
             productdir="${netbeans.dest.dir}/${cluster.dir}"
56
             module="netbeans/modules/image.jar"
57
             module="${nb.modules.dir}/image.jar"
57
	     homepage="http://image.${homepage.base}/"
58
	     homepage="http://image.${homepage.base}/"
58
	     distribution="http://${dist.base}/image.nbm">
59
	     distribution="http://${dist.base}/image.nbm">
59
      <license file="${license.file}"/>
60
      <license file="${license.file}"/>
Lines 73-95 Link Here
73
    <nbinstaller module="test/image.jar" action="reinstall"/>
74
    <nbinstaller module="test/image.jar" action="reinstall"/>
74
  </target>
75
  </target>
75
76
76
  <target name="clean">
77
  <target name="clean" depends="init">
77
    <delete>
78
    <delete>
78
      <fileset dir="src">
79
      <fileset dir="src">
79
        <include name="**/*.class"/>
80
        <include name="**/*.class"/>
80
      </fileset>
81
      </fileset>
82
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
83
        <patternset refID="image.files"/>
84
      </fileset>
81
    </delete>
85
    </delete>
82
    <delete file="manifest-subst.mf"/>
86
    <delete file="manifest-subst.mf"/>
83
    <delete file="image.nbm"/>
87
    <delete file="image.nbm"/>
84
    <delete dir="netbeans"/>
85
    <delete dir="Info"/>
86
  </target>
88
  </target>
87
89
88
  <target name="real-clean" depends="clean">
90
  <target name="real-clean" depends="clean">
89
    <delete dir="test"/>
91
    <delete dir="test"/>
90
  </target>
92
  </target>
91
93
92
  <target name="javadoc" description="Build image module API documentation.">
94
  <target name="javadoc" depends="init" description="Build image module API documentation.">
93
    <tstamp/>
95
    <tstamp/>
94
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
96
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
95
    <echo message="Build image module API documentation..."/>
97
    <echo message="Build image module API documentation..."/>
Lines 108-119 Link Here
108
      <sourcepath>
110
      <sourcepath>
109
        <pathelement location="src"/>
111
        <pathelement location="src"/>
110
      </sourcepath>
112
      </sourcepath>
111
      <classpath>
113
      <classpath refID="cp"/>
112
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
113
        <fileset dir="../openide/netbeans/lib">
114
          <include name="openide*.jar" />
115
        </fileset>
116
      </classpath>
117
    </javadoc>    
114
    </javadoc>    
118
  </target>
115
  </target>
119
116
(-)j2eeserver/build.xml (-83 / +64 lines)
Lines 13-59 Link Here
13
-->
13
-->
14
14
15
<project basedir="." default="netbeans" name="j2eeserver">
15
<project basedir="." default="netbeans" name="j2eeserver">
16
16
  <import file="../nbbuild/default.xml"/> 
17
  <property name="nbm_alias" value="nb_ide"/>
17
 
18
  <property name="nbroot" value=".."/>
18
  <target name="init" depends="default.init">
19
  <property name="f4jroot" value="../../f4j_all"/>
19
    <patternset id="j2eeserver.files">
20
  <property name="nbext" value="${nbroot}/nbbuild"/>
20
      <include name="${nb.modules/autoload.dir}/j2eeserver.jar"/>
21
  <property name="homepage.base" value="netbeans.org"/>
21
    </patternset>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
    <path id="cp">
23
  <property name="license.file" value="${nbext}/standard-nbm-license.txt"/>
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
  
24
      <pathelement location="${debuggercore/api.dir}/${nb.modules/autoload.dir}/debugger-api.jar"/>
25
  <path id="cp">
25
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
26
    <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
    <pathelement location="${nbroot}/debuggercore/api/netbeans/modules/autoload/debugger-api.jar"/>
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
    <pathelement location="${nbroot}/core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
28
      <pathelement location="${nb_all}/libs/external/j2eeeditor-1.0.jar"/>
29
    <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
29
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/> <!-- XXX -->
30
    <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/> <!-- XXX -->
31
    <pathelement location="${nbroot}/libs/external/j2eeeditor-1.0.jar"/>
31
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/> <!-- XXX -->
32
    <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/> <!-- XXX -->
32
      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/> <!-- XXX -->
33
    <pathelement location="${nbroot}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/> <!-- XXX -->
33
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
34
    <pathelement location="${nbroot}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
34
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
35
    <pathelement location="${nbroot}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/> <!-- XXX -->
35
      <pathelement location="${core/settings.dir}/${nb.modules/autoload.dir}/core-settings.jar"/>
36
    <pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
36
      <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar" />
37
    <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/> 
37
      <fileset dir="external">
38
    <pathelement location="${nbroot}/core/settings/netbeans/modules/autoload/core-settings.jar"/>
38
          <include name="*.jar"/>
39
    <pathelement location="${nbroot}/xml/api/netbeans/modules/autoload/xml-api.jar" />
39
      </fileset>
40
    <fileset dir="external">
40
      <!-- PENDING required by debugger type, perhaps could be
41
        <include name="*.jar"/>
41
      removed -->
42
    </fileset>
42
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/> 
43
    <!-- PENDING required by debugger type, perhaps could be
43
    </path>
44
    removed -->
44
  </target>
45
    <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/> 
46
  </path>
47
  
45
  
48
  <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar" name="locjar"/>
46
  <target name="s2binit" depends="init">
49
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
50
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
51
  <target name="s2binit">
52
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
47
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
53
	  <classpath>
48
	  <classpath>
54
		<pathelement path="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
49
		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
55
		<pathelement path="${nbroot}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
50
		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
56
		<pathelement path="${nbroot}/schema2beans/anttask/s2banttask.jar"/>
51
		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
57
	  </classpath>
52
	  </classpath>
58
	</taskdef>
53
	</taskdef>
59
  </target>
54
  </target>
Lines 61-132 Link Here
61
  <!-- These are the primary targets. -->
56
  <!-- These are the primary targets. -->
62
57
63
  <target depends="jars" name="netbeans">
58
  <target depends="jars" name="netbeans">
64
    <genlist targetname="nbm" outputfiledir="netbeans"/>
59
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeserver.jar">
65
  </target>
60
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
66
61
         <patternset refID="j2eeserver.files"/>
67
  <target name="external">
62
       </fileset>
68
      <ant dir="external" target="unscramble"/>
63
    </genlist>
69
      <copy todir="netbeans/modules/autoload/ext">
70
          <fileset dir="external/">
71
		  	<include name="*.jar"/>
72
          </fileset>
73
      </copy>
74
  </target>
64
  </target>
75
65
76
  <target name="nbm" depends="netbeans">
66
  <target name="nbm" depends="netbeans">
77
    <makenbm file="j2eeserver.nbm"
67
    <makenbm file="j2eeserver.nbm"
78
             topdir="."
68
             productdir="${netbeans.dest.dir}/${cluster.dir}"
79
             module="netbeans/modules/autoload/j2eeserver.jar"
69
             module="${nb.modules/autoload.dir}/j2eeserver.jar"
80
             homepage="http://j2eeserver.${homepage.base}/"
70
             homepage="http://j2eeserver.${homepage.base}/"
81
             distribution="${dist.base}/j2eeserver.nbm">
71
             distribution="${dist.base}/j2eeserver.nbm">
82
      <license file="${license.file}" />
72
      <license file="${license.file}" />
83
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
73
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
84
      <exclude name="**/nondist/**" />
85
    </makenbm>
74
    </makenbm>
86
  </target>
75
  </target>
87
76
88
  <target name="clean">
77
  <target name="clean" depends="init">
89
    <delete>
78
    <delete>
90
      <fileset dir="src">
79
      <fileset dir="src">
91
        <include name="**/*.class"/>
80
        <include name="**/*.class"/>
92
        <include name="**/*.jar"/>
81
        <include name="**/*.jar"/>
93
      </fileset>
82
      </fileset>
83
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
84
        <patternset refID="j2eeserver.files"/>
85
      </fileset>
94
    </delete>
86
    </delete>
95
    <delete dir="src/org/netbeans/modules/j2ee/deployment/impl/gen"/>
87
    <delete dir="src/org/netbeans/modules/j2ee/deployment/impl/gen"/>
96
    <delete dir="netbeans"/>
97
    <delete dir="Info"/>
98
    <delete file="j2eeserver.nbm"/>
88
    <delete file="j2eeserver.nbm"/>
99
    <delete file="manifest-subst.mf"/>
89
    <delete file="manifest-subst.mf"/>
100
    <delete dir="javadoc"/>
90
    <delete dir="javadoc"/>
101
  </target>
91
  </target>
102
92
103
  <!-- These are the secondary targets. -->
104
105
  <target name="release">
106
  </target>
107
93
108
  <target depends="compile,release" name="jars">
94
  <target depends="compile" name="jars">
109
    <mkdir dir="netbeans/modules/autoload"/>
95
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
110
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
96
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
111
    <copy file="manifest.mf" tofile="manifest-subst.mf"
97
    <copy file="manifest.mf" tofile="manifest-subst.mf"
112
          filtering="on"/>
98
          filtering="on"/>
113
99
    <jar compress="false" 
114
    <locjar compress="false" jarfile="netbeans/modules/autoload/j2eeserver.jar" manifest="manifest-subst.mf">
100
         jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeserver.jar" 
115
      <locale name="ja"/>
101
         manifest="manifest-subst.mf"
116
      <fileset dir="src" excludesfile="${nbext}/standard-jar-excludes.txt">
102
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
117
          <include name="org/**"/>
103
         basedir="src"/>
118
      </fileset>
119
    </locjar>
120
  </target>
104
  </target>
121
105
122
  <target name="compile" depends="external,privatedtds">
106
  <target name="compile" depends="init,privatedtds">
123
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
107
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
124
      <patternset>
108
      <patternset>
125
          <include name="org/"/>
109
          <include name="org/"/>
126
          <exclude name="**/tests/**"/>
110
          <exclude name="**/tests/**"/>
127
          <exclude name="**/J2eeNoProjectEnvironment.java"/>
111
          <exclude name="**/J2eeNoProjectEnvironment.java"/>
128
      </patternset>
112
      </patternset>
129
130
      <classpath refid="cp"/>
113
      <classpath refid="cp"/>
131
    </javac>
114
    </javac>
132
  </target>
115
  </target>
Lines 175-197 Link Here
175
        </uptodate> 
158
        </uptodate> 
176
  </target>
159
  </target>
177
160
178
  <target name="ddgen" depends="ddinit" if="dd.generation">
161
  <target name="ddgen" depends="init,ddinit" if="dd.generation">
179
     <echo message="Generated schema2beans from ${dtdfile}"/>
162
     <echo message="Generated schema2beans from ${dtdfile}"/>
180
     <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="yes">
163
     <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="yes">
181
       <classpath>
164
       <classpath>
182
          <pathelement path="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
165
          <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
183
          <pathelement path="${nbroot}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
166
          <pathelement location="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
184
          <fileset dir = "${nbroot}/openide">
167
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
185
                <include name="netbeans/lib/openide*.jar"/>
168
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
186
                <include name="loaders/netbeans/lib/openide-loaders.jar"/>
169
       </classpath>
187
          </fileset>
170
       <arg line= "-f ${dtdfile}" />
188
        </classpath>
171
       <arg line= "-p ${dtdpackage}" />
189
        <arg line= "-f ${dtdfile}" />
172
       <arg line= "-r src" />
190
        <arg line= "-p ${dtdpackage}" />
173
       <arg line="-javaBeans"/>
191
        <arg line= "-r src" />
174
       <arg line="-commonInterface"/>
192
	    <arg line="-javaBeans"/>
175
       <arg line="-extendBaseBean"/>
193
	    <arg line="-commonInterface"/>
194
	    <arg line="-extendBaseBean"/>
195
     </java>
176
     </java>
196
  </target> 
177
  </target> 
197
178
(-)j2eeserver/j2eeapis/build.xml (-30 / +34 lines)
Lines 13-50 Link Here
13
-->
13
-->
14
14
15
<project name="j2eeapis" basedir="." default="netbeans">
15
<project name="j2eeapis" basedir="." default="netbeans">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
27
  <target name="init">
28
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
20
    <patternset id="j2eeserver/j2eeapis.files">
21
      <include name="${nb.modules/autoload.dir}/j2eeapis.jar"/>
22
      <include name="${nb.modules/autoload.dir}/ext/ejb20.jar"/>
23
      <include name="${nb.modules/autoload.dir}/ext/javax77.jar"/>
24
      <include name="${nb.modules/autoload.dir}/ext/jmxri.jar"/>
25
      <include name="${nb.modules/autoload.dir}/ext/jsr88javax.jar"/>
26
    </patternset>
29
  </target>
27
  </target>
30
28
31
  <target name="jars">
29
  <target name="jars" depends="init">
32
    <mkdir dir="netbeans/modules/autoload"/>
30
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
33
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
31
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
34
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
32
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
35
    <locjar jarfile="netbeans/modules/autoload/j2eeapis.jar"
33
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeapis.jar"
36
            manifest="manifest-subst.mf"
34
         manifest="manifest-subst.mf"
37
            basedir="src"
35
         basedir="src"
38
            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
36
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
39
            compress="false">
37
         compress="false">
40
      <include name="org/netbeans/modules/j2eeapis/"/>
38
      <include name="org/netbeans/modules/j2eeapis/"/>
41
      <locale name="ja"/>
39
    </jar>
42
    </locjar>
43
  </target>
40
  </target>
44
41
45
  <target name="release" depends="init">
42
  <target name="release" depends="init">
46
    <mkdir dir="netbeans/modules/autoload/ext"/>
43
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
47
    <copy todir="netbeans/modules/autoload/ext/">
44
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
48
      <fileset dir="../external"> 
45
      <fileset dir="../external"> 
49
        <include name="*.jar"/>
46
        <include name="*.jar"/>
50
      </fileset>
47
      </fileset>
Lines 52-64 Link Here
52
  </target>
49
  </target>
53
50
54
  <target name="netbeans" depends="jars,release" description="Builds the module">
51
  <target name="netbeans" depends="jars,release" description="Builds the module">
55
    <genlist targetname="nbm" outputfiledir="netbeans"/>
52
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeapis.jar">
53
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
         <patternset refID="j2eeserver/j2eeapis.files"/>
55
       </fileset>
56
    </genlist>
56
  </target>
57
  </target>
57
58
58
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
59
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
59
    <makenbm file="j2eeapis.nbm"
60
    <makenbm file="j2eeapis.nbm"
60
             topdir="."
61
           productdir="${netbeans.dest.dir}/${cluster.dir}"
61
           module="netbeans/modules/autoload/j2eeapis.jar"
62
           module="${nb.modules/autoload.dir}/j2eeapis.jar"
62
           homepage="http://web.${homepage.base}/"
63
           homepage="http://web.${homepage.base}/"
63
           distribution="http://${dist.base}/j2eeapis.nbm">
64
           distribution="http://${dist.base}/j2eeapis.nbm">
64
      <license file="${license.file}"/>
65
      <license file="${license.file}"/>
Lines 78-88 Link Here
78
    </makenbm>
79
    </makenbm>
79
  </target>
80
  </target>
80
81
81
  <target name="clean" description="Clean all build products.">
82
  <target name="clean" depends="init" description="Clean all build products.">
82
        <delete file="manifest-subst.mf"/>
83
    <delete file="manifest-subst.mf"/>
83
        <delete dir="netbeans"/>
84
    <delete file="j2eeapis.nbm"/>
84
        <delete dir="Info"/>
85
    <delete>
85
        <delete file="j2eeapis.nbm"/>
86
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
87
        <patternset refID="j2eeserver/j2eeapis.files"/>
88
      </fileset>
89
    </delete>
86
  </target>
90
  </target>
87
91
88
  <target name="javadoc">
92
  <target name="javadoc">
(-)jarpackager/build.xml (-32 / +29 lines)
Lines 13-38 Link Here
13
-->
13
-->
14
14
15
<project name="jarpackager" default="netbeans" basedir=".">
15
<project name="jarpackager" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="jarpackager.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/j2eeapis.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
26
  <target name="init">
27
    <path id="jarpackager-cp">
22
    <path id="jarpackager-cp">
28
      <pathelement location="../openide/openide-13javac-workaround.jar" />
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar" />
29
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
<!--        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> --><!-- XXX -->
26
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
32
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
27
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
33
        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
28
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
34
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
29
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
35
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
36
    </path>
30
    </path>
37
  </target>
31
  </target>
38
32
Lines 43-62 Link Here
43
  </target>
37
  </target>
44
38
45
  <target name="jars" depends="compile">
39
  <target name="jars" depends="compile">
46
    <mkdir dir="netbeans/modules"/>
40
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
47
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
    <locjar jarfile="netbeans/modules/jarpackager.jar"
43
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jarpackager.jar"
50
            manifest="manifest-subst.mf"
44
         manifest="manifest-subst.mf"
51
            basedir="src"
45
         basedir="src"
52
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
46
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
53
	    compress="false">
47
	 compress="false"/>
54
      <locale name="ja"/>
55
    </locjar>
56
  </target>
48
  </target>
57
49
58
  <target name="netbeans" depends="jars">
50
  <target name="netbeans" depends="jars">
59
    <genlist targetname="nbm" outputfiledir="netbeans"/>
51
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jarpackager.jar">
52
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
         <patternset refID="jarpackager.files"/>
54
       </fileset>
55
    </genlist>
60
  </target>
56
  </target>
61
57
62
  <target name="deploy" depends="netbeans">
58
  <target name="deploy" depends="netbeans">
Lines 65-72 Link Here
65
61
66
  <target name="nbm" depends="netbeans">
62
  <target name="nbm" depends="netbeans">
67
    <makenbm file="jarpackager.nbm"
63
    <makenbm file="jarpackager.nbm"
68
             topdir="."
64
             productdir="${netbeans.dest.dir}/${cluster.dir}"
69
             module="netbeans/modules/jarpackager.jar"
65
             module="${nb.modules.dir}/jarpackager.jar"
70
	     homepage="http://jarpackager.${homepage.base}/"
66
	     homepage="http://jarpackager.${homepage.base}/"
71
	     distribution="http://${dist.base}/jarpackager.nbm">
67
	     distribution="http://${dist.base}/jarpackager.nbm">
72
      <license file="${license.file}"/>
68
      <license file="${license.file}"/>
Lines 74-91 Link Here
74
    </makenbm>
70
    </makenbm>
75
  </target>
71
  </target>
76
72
77
  <target name="clean">
73
  <target name="clean" depends="init">
78
    <delete>
74
    <delete>
79
      <fileset dir="src">
75
      <fileset dir="src">
80
        <include name="**/*.class"/>
76
        <include name="**/*.class"/>
81
        <include name="**/*.jar"/>
77
        <include name="**/*.jar"/>
82
      </fileset>
78
      </fileset>
79
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
80
        <patternset refID="jarpackager.files"/>
81
      </fileset>
83
    </delete>
82
    </delete>
84
    <delete file="manifest-subst.mf"/>
83
    <delete file="manifest-subst.mf"/>
85
    <delete file="jarpackager.nbm"/>
84
    <delete file="jarpackager.nbm"/>
86
    <delete dir="netbeans"/>
87
    <delete dir="javadoc"/>
85
    <delete dir="javadoc"/>
88
    <delete dir="Info"/>
89
  </target>
86
  </target>
90
87
91
  <target name="javadoc" description="Build jarpackager module API documentation." depends="init">
88
  <target name="javadoc" description="Build jarpackager module API documentation." depends="init">
(-)java/build.xml (-45 / +42 lines)
Lines 13-76 Link Here
13
-->
13
-->
14
14
15
<project name="java" default="netbeans" basedir=".">
15
<project name="java" default="netbeans" basedir=".">
16
16
  <import file="../nbbuild/default.xml"/>
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
17
  
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
19
    <patternset id="java.files">
20
20
      <include name="${nb.modules.dir}/java.jar"/>
21
  <property name="nbm_alias" value="nb_ide"/>
21
      <include name="${nb.modules.dir}/ext/javac.jar"/>
22
  <property name="homepage.base" value="netbeans.org"/>
22
      <include name="${nb.modules.dir}/ext/java-gj.jar"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
      <include name="${nb.modules.dir}/ext/javamake*.jar"/>
24
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
24
    </patternset>
25
26
  <target name="init">
27
    <ant dir="external" target="unscramble"/>
25
    <ant dir="external" target="unscramble"/>
28
    <path id="java-cp">
26
    <path id="cp">
29
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
30
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
28
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
29
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
      <fileset dir="external">
30
      <fileset dir="external">
33
        <include name="javamake*.jar"/>
31
        <include name="javamake*.jar"/>
34
      </fileset>
32
      </fileset>
35
      <pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
33
      <pathelement location="${classfile.dir}/${nb.modules/autoload.dir}/classfile.jar"/>
36
      <!-- Java API -->
34
      <!-- Java API -->
37
      <pathelement location="api/netbeans/modules/autoload/java-api.jar"/>
35
      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
38
      <pathelement location="srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
36
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
39
      <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
37
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
40
      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
38
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
41
      <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
39
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
42
    </path>
40
    </path>
43
    <condition property="s1s">
41
    <condition property="s1s">
44
	<equals arg1="${nbm_alias}" arg2="f4j_ide"/>
42
	<equals arg1="${nbm_alias}" arg2="f4j_ide"/>
45
    </condition>
43
    </condition>
46
  </target>
44
  </target>
47
45
48
  <target name="compile-module" depends="init">
46
  <target name="compile" depends="init">
49
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
47
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
50
      <classpath refid="java-cp"/>
48
      <classpath refid="cp"/>
51
    </javac>
49
    </javac>
52
  </target>
50
  </target>
53
  
51
 
54
  <target name="compile" depends="compile-module">
55
  </target>
56
  
57
  <target name="jars" depends="compile">
52
  <target name="jars" depends="compile">
58
      <mkdir dir="netbeans/modules"/>
53
      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
59
      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
54
      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
60
      <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
55
      <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
61
      <locjar jarfile="netbeans/modules/java.jar"
56
      <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/java.jar"
62
              manifest="manifest-subst.mf"
57
           manifest="manifest-subst.mf"
63
          compress="false">
58
           compress="false">
64
          <fileset dir="src"
59
         <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
65
          excludesfile="../nbbuild/standard-jar-excludes.txt"
60
      </jar>
66
      />
67
      <locale name="ja"/>
68
      </locjar>
69
  </target>
61
  </target>
70
  
62
  
71
  <target name="release" depends="init">
63
  <target name="release" depends="init">
72
    <mkdir dir="netbeans/modules/ext"/>
64
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
73
    <copy todir="netbeans/modules/ext">
65
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
74
      <fileset dir="external">
66
      <fileset dir="external">
75
        <include name="javac.jar"/>
67
        <include name="javac.jar"/>
76
        <include name="java-gj.jar"/>
68
        <include name="java-gj.jar"/>
Lines 80-92 Link Here
80
  </target>
72
  </target>
81
73
82
  <target name="netbeans" depends="jars,release">
74
  <target name="netbeans" depends="jars,release">
83
    <genlist targetname="nbm" outputfiledir="netbeans"/>
75
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/java.jar">
76
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
77
        <patternset refID="java.files"/>
78
      </fileset>
79
    </genlist>
84
  </target>
80
  </target>
85
81
86
  <target name="nbm" depends="netbeans" description="Build NBM.">
82
  <target name="nbm" depends="netbeans" description="Build NBM.">
87
    <makenbm file="java.nbm"
83
    <makenbm file="java.nbm"
88
             topdir="."
84
             productdir="${netbeans.dest.dir}/${cluster.dir}"
89
             module="netbeans/modules/java.jar"
85
             module="${nb.modules.dir}/java.jar"
90
	     homepage="http://java.${homepage.base}/"
86
	     homepage="http://java.${homepage.base}/"
91
	     distribution="http://${dist.base}/java.nbm">
87
	     distribution="http://${dist.base}/java.nbm">
92
      <license name="java-license.txt">
88
      <license name="java-license.txt">
Lines 109-124 Link Here
109
    <delete dir="javadoc"/>
105
    <delete dir="javadoc"/>
110
  </target>
106
  </target>
111
107
112
  <target name="clean" description="Clean build products.">
108
  <target name="clean" depends="init" description="Clean build products.">
113
    <delete>
109
    <delete>
114
      <fileset dir="src">
110
      <fileset dir="src">
115
        <include name="**/*.class"/>
111
        <include name="**/*.class"/>
116
      </fileset>
112
      </fileset>
113
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
114
        <patternset refID="java.files"/>
115
      </fileset>
117
    </delete>
116
    </delete>
118
    <delete file="manifest-subst.mf"/>
117
    <delete file="manifest-subst.mf"/>
119
    <delete file="java.nbm"/>
118
    <delete file="java.nbm"/>
120
    <delete dir="netbeans"/>
121
    <delete dir="Info"/>
122
  </target>
119
  </target>
123
120
124
  <target name="javadoc" depends="clean-javadoc,java-module-apis">
121
  <target name="javadoc" depends="clean-javadoc,java-module-apis">
Lines 130-136 Link Here
130
    </copy>
127
    </copy>
131
  </target>
128
  </target>
132
129
133
  <target name="java-module-apis" description="Build java module API documentation.">
130
  <target name="java-module-apis" depends="init" description="Build java module API documentation.">
134
    <tstamp/>
131
    <tstamp/>
135
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
132
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
136
    <echo message="Build java module API documentation..."/>
133
    <echo message="Build java module API documentation..."/>
Lines 151-157 Link Here
151
        <pathelement location="src"/>
148
        <pathelement location="src"/>
152
        <pathelement location="api/src"/>
149
        <pathelement location="api/src"/>
153
      </sourcepath>
150
      </sourcepath>
154
      <classpath refid="java-cp"/>
151
      <classpath refid="cp"/>
155
    </javadoc>
152
    </javadoc>
156
    <zip zipfile="JavaAPIs.zip" basedir="JavaAPIs"/>
153
    <zip zipfile="JavaAPIs.zip" basedir="JavaAPIs"/>
157
  </target>
154
  </target>
(-)java/api/build.xml (-36 / +33 lines)
Lines 13-71 Link Here
13
-->
13
-->
14
14
15
<project name="java" default="netbeans" basedir=".">
15
<project name="java" default="netbeans" basedir=".">
16
16
  <import file="../../nbbuild/default.xml"/>
17
  <property name="nb_all" value="../.."/>
17
  
18
18
  <target name="init" depends="default.init">
19
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
19
    <patternset id="java/api.files">
20
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
      <include name="${nb.modules/autoload.dir}/java-api.jar"/>
21
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    </patternset>
22
22
    <path id="cp">
23
  <property name="nbm_alias" value="nb_ide"/>
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
  <property name="homepage.base" value="netbeans.org"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
  <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
26
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
27
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
28
    </path>
29
  </target>
27
  
30
  
28
  <!-- External documentation referenced from the API -->
31
  <!-- External documentation referenced from the API -->
29
  <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
32
  <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
30
  <property name="openide-docs-location" value="http://www.netbeans.org/download/apis"/>
33
  <property name="openide-docs-location" value="http://www.netbeans.org/download/apis"/>
31
  <property name="openide.package-list.loc" location="doc/external/openide"/>
34
  <property name="openide.package-list.loc" location="doc/external/openide"/>
32
  
33
  <path id="cp">
34
    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
35
    <fileset dir="${nb_all}/openide/netbeans/lib">
36
        <include name="openide*.jar" />
37
    </fileset>
38
    <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
39
    <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
40
  </path>
41
35
42
  <target name="compile">
36
  <target name="compile" depends="init">
43
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
      <classpath refid="cp"/>
38
      <classpath refid="cp"/>
45
    </javac>
39
    </javac>
46
  </target>
40
  </target>
47
41
48
  <target name="jars" depends="compile">
42
  <target name="jars" depends="compile">
49
    <mkdir dir="netbeans/modules/autoload"/>
43
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
50
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
51
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
52
    <locjar jarfile="netbeans/modules/autoload/java-api.jar"
46
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/java-api.jar"
53
            manifest="manifest-subst.mf"
47
         manifest="manifest-subst.mf"
54
            basedir="src"
48
         basedir="src"
55
	    excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
49
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
56
	    compress="false">
50
	 compress="false"/>
57
      <locale name="ja"/>
58
    </locjar>
59
  </target>
51
  </target>
60
52
61
  <target name="netbeans" depends="jars">
53
  <target name="netbeans" depends="jars">
62
    <genlist targetname="nbm" outputfiledir="netbeans"/>
54
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/java-api.jar">
55
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
56
        <patternset refID="java/api.files"/>
57
      </fileset>
58
    </genlist>
63
  </target>
59
  </target>
64
60
65
  <target name="nbm" depends="netbeans">
61
  <target name="nbm" depends="netbeans">
66
    <makenbm file="java-api.nbm"
62
    <makenbm file="java-api.nbm"
67
             topdir="."
63
             productdir="${netbeans.dest.dir}/${cluster.dir}"
68
             module="netbeans/modules/autoload/java-api.jar"
64
             module="${nb.modules/autoload.dir}/java-api.jar"
69
	     homepage="http://java.${homepage.base}/"
65
	     homepage="http://java.${homepage.base}/"
70
	     distribution="http://${dist.base}/java-api.nbm">
66
	     distribution="http://${dist.base}/java-api.nbm">
71
      <license file="${license.file}"/>
67
      <license file="${license.file}"/>
Lines 73-79 Link Here
73
    </makenbm>
69
    </makenbm>
74
  </target>
70
  </target>
75
  
71
  
76
  <target name="javadoc">
72
  <target name="javadoc" depends="init">
77
    <property name="_cp" refid="cp"/>
73
    <property name="_cp" refid="cp"/>
78
    <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
74
    <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
79
	<property name="javadoc.base" location="."/>
75
	<property name="javadoc.base" location="."/>
Lines 89-104 Link Here
89
    </ant>
85
    </ant>
90
  </target>
86
  </target>
91
87
92
  <target name="clean">
88
  <target name="clean" depends="init">
93
    <delete>
89
    <delete>
94
      <fileset dir="src">
90
      <fileset dir="src">
95
        <include name="**/*.class"/>
91
        <include name="**/*.class"/>
96
      </fileset>
92
      </fileset>
93
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
94
        <patternset refID="java/api.files"/>
95
      </fileset>
97
    </delete>
96
    </delete>
98
    <delete file="manifest-subst.mf"/>
97
    <delete file="manifest-subst.mf"/>
99
    <delete file="java-api.nbm"/>
98
    <delete file="java-api.nbm"/>
100
    <delete dir="netbeans"/>
101
    <delete dir="Info"/>
102
    <delete dir="javadoc"/>
99
    <delete dir="javadoc"/>
103
  </target>
100
  </target>
104
  
101
  
(-)java/srcmodel/build.xml (-31 / +29 lines)
Lines 13-63 Link Here
13
-->
13
-->
14
14
15
<project name="java/srcmodel" default="netbeans" basedir=".">
15
<project name="java/srcmodel" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="java/srcmodel.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.modules/autoload.dir}/java-src-model.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
    
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
    </path>
26
      </path>
27
    </target>
33
  
28
  
34
    <target name="compile">
29
    <target name="compile" depends="init">
35
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
36
            <classpath refid="cp"/>
31
            <classpath refid="cp"/>
37
        </javac>
32
        </javac>
38
    </target>
33
    </target>
39
34
40
    <target name="jars" depends="compile">
35
    <target name="jars" depends="compile">
41
        <mkdir dir="netbeans/modules/autoload"/>
36
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
42
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
38
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <locjar jarfile="netbeans/modules/autoload/java-src-model.jar"
39
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/java-src-model.jar"
45
                manifest="manifest-subst.mf"
40
             manifest="manifest-subst.mf"
46
                basedir="src"
41
             basedir="src"
47
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
42
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
48
	        compress="false">
43
	     compress="false"/>
49
            <locale name="ja"/>
50
        </locjar>
51
    </target>
44
    </target>
52
45
53
    <target name="netbeans" depends="jars">
46
    <target name="netbeans" depends="jars">
54
        <genlist targetname="nbm" outputfiledir="netbeans"/>
47
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/java-src-model.jar">
48
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
49
             <patternset refID="java/srcmodel.files"/>
50
          </fileset>
51
        </genlist>
55
    </target>
52
    </target>
56
53
57
    <target name="nbm" depends="netbeans">
54
    <target name="nbm" depends="netbeans">
58
        <makenbm file="java-src-model.nbm"
55
        <makenbm file="java-src-model.nbm"
59
                 topdir="."
56
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
60
                 module="netbeans/modules/autoload/java-src-model.jar"
57
                 module="${nb.modules/autoload.dir}/java-src-model.jar"
61
                 homepage="http://java.${homepage.base}/"
58
                 homepage="http://java.${homepage.base}/"
62
                 distribution="http://${dist.base}/java-src-model.nbm">
59
                 distribution="http://${dist.base}/java-src-model.nbm">
63
            <license file="${license.file}"/>
60
            <license file="${license.file}"/>
Lines 65-71 Link Here
65
        </makenbm>
62
        </makenbm>
66
    </target>
63
    </target>
67
  
64
  
68
    <target name="javadoc" description="Build Javadoc.">
65
    <target name="javadoc" depends="init" description="Build Javadoc.">
69
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
66
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
70
            <property name="javadoc.base" location="."/>
67
            <property name="javadoc.base" location="."/>
71
            <property name="javadoc.name" value="JavaHierarchyAPI"/>
68
            <property name="javadoc.name" value="JavaHierarchyAPI"/>
Lines 78-93 Link Here
78
        </ant>
75
        </ant>
79
    </target>
76
    </target>
80
    
77
    
81
    <target name="clean">
78
    <target name="clean" depends="init">
82
        <delete>
79
        <delete>
83
            <fileset dir="src">
80
            <fileset dir="src">
84
                <include name="**/*.class"/>
81
                <include name="**/*.class"/>
85
            </fileset>
82
            </fileset>
83
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
84
              <patternset refID="java/srcmodel.files"/>
85
            </fileset>
86
        </delete>
86
        </delete>
87
        <delete file="manifest-subst.mf"/>
87
        <delete file="manifest-subst.mf"/>
88
        <delete file="java-src-model.nbm"/>
88
        <delete file="java-src-model.nbm"/>
89
        <delete dir="netbeans"/>
90
        <delete dir="Info"/>
91
        <delete dir="javadoc"/>
89
        <delete dir="javadoc"/>
92
    </target>
90
    </target>
93
  
91
  
(-)javacvs/compat/build.xml (-39 / +34 lines)
Lines 13-61 Link Here
13
-->
13
-->
14
14
15
<project name="javacvs_compat" default="netbeans" basedir=".">
15
<project name="javacvs_compat" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/>
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="javacvs/compat.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/javacvscompat.jar"/>
20
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
22
    <path id="cp">
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
27
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
28
    </path>
29
  </target>
25
30
26
  <target name="compile">
31
  <target name="compile" depends="init">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
32
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
33
      <classpath refID="cp"/>
29
        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
30
        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
31
	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
32
        <fileset dir="../../openide/netbeans/lib">
33
          <include name="openide*.jar" />
34
        </fileset>
35
      </classpath>
36
    </javac>
34
    </javac>
37
  </target>
35
  </target>
38
36
39
  <target name="jars" depends="compile">
37
  <target name="jars" depends="compile">
40
    <mkdir dir="netbeans/modules"/>
38
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
41
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
    <locjar jarfile="netbeans/modules/javacvscompat.jar"
41
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/javacvscompat.jar"
44
            manifest="manifest-subst.mf"
42
         manifest="manifest-subst.mf"
45
            basedir="src"
43
         basedir="src"
46
	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
44
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
	    compress="false">
45
	 compress="false"/>
48
    </locjar>
49
  </target>
46
  </target>
50
47
51
  <target name="netbeans" depends="jars">
48
  <target name="netbeans" depends="jars">
52
    <genlist targetname="nbm" outputfiledir="netbeans"/>
49
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/javacvscompat.jar">
50
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
51
        <patternset refID="javacvs/compat.files"/>
52
      </fileset>
53
    </genlist>
53
  </target>
54
  </target>
54
55
55
  <target name="nbm" depends="netbeans">
56
  <target name="nbm" depends="netbeans">
56
    <makenbm file="javacvscompat.nbm"
57
    <makenbm file="javacvscompat.nbm"
57
             topdir="."
58
             productdir="${netbeans.dest.dir}/${cluster.dir}"
58
             module="netbeans/modules/javacvscompat.jar"
59
             module="${nb.modules.dir}/javacvscompat.jar"
59
	     homepage="http://javacvs.${homepage.base}/"
60
	     homepage="http://javacvs.${homepage.base}/"
60
	     distribution="http://${dist.base}/javacvscompat.nbm">
61
	     distribution="http://${dist.base}/javacvscompat.nbm">
61
      <license file="${license.file}"/>
62
      <license file="${license.file}"/>
Lines 63-81 Link Here
63
    </makenbm>
64
    </makenbm>
64
  </target>
65
  </target>
65
66
66
  <target name="clean">
67
  <target name="clean" depends="init">
67
    <delete>
68
    <delete>
68
      <fileset dir="src">
69
      <fileset dir="src">
69
        <include name="**/*.class"/>
70
        <include name="**/*.class"/>
70
      </fileset>
71
      </fileset>
72
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
73
        <patternset refID="javacvs/compat.files"/>
74
      </fileset>
71
    </delete>
75
    </delete>
72
    <delete file="manifest-subst.mf"/>
76
    <delete file="manifest-subst.mf"/>
73
    <delete file="javacvscompat.nbm"/>
77
    <delete file="javacvscompat.nbm"/>
74
    <delete dir="netbeans"/>
75
    <delete dir="Info"/>
76
  </target>
78
  </target>
77
79
78
  <target name="javadoc" description="Build javacvs compat module API documentation.">
80
  <target name="javadoc" depends="init" description="Build javacvs compat module API documentation.">
79
    <tstamp/>
81
    <tstamp/>
80
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
82
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
81
    <echo message="Build javacvs compat module API documentation..."/>
83
    <echo message="Build javacvs compat module API documentation..."/>
Lines 94-107 Link Here
94
      <sourcepath>
96
      <sourcepath>
95
        <pathelement location="src"/>
97
        <pathelement location="src"/>
96
      </sourcepath>
98
      </sourcepath>
97
      <classpath>
99
      <classpath refID="cp"/>
98
        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
99
        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
100
	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
101
        <fileset dir="../../openide/netbeans/lib">
102
          <include name="openide*.jar" />
103
        </fileset>
104
      </classpath>
105
    </javadoc>    
100
    </javadoc>    
106
  </target>
101
  </target>
107
102
(-)javacvs/libmodule/build.xml (-16 / +27 lines)
Lines 12-61 Link Here
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
<project basedir="." default="netbeans" name="javacvs/libmodule">
14
<project basedir="." default="netbeans" name="javacvs/libmodule">
15
  <import file="../../nbbuild/default.xml"/> 
15
16
16
  <property name="nbm_alias" value="nb_ide"/>
17
  <target name="init" depends="default.init">
17
  <property name="homepage.base" value="netbeans.org"/>
18
    <patternset id="javacvs/libmodule.files">
18
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19
      <include name="${nb.modules/autoload.dir}/cvslib.jar"/>
19
  <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
20
    </patternset>
20
21
  </target>
21
  <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar" name="makenbm"/>
22
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
23
22
24
  <target name="compile">
23
  <target name="compile" depends="init"> 
25
    <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="../libsrc" srcdir="../libsrc"/>
24
    <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="../libsrc" srcdir="../libsrc"/>
26
  </target>
25
  </target>
27
26
28
  <target depends="compile" name="jars">
27
  <target depends="compile" name="jars">
29
    <mkdir dir="netbeans/modules/autoload"/>
28
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
30
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
29
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
31
    <copy file="manifest.mf" filtering="on" tofile="manifest-subst.mf"/>
30
    <copy file="manifest.mf" filtering="on" tofile="manifest-subst.mf"/>
32
    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar" name="locjar"/>
31
    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar" name="locjar"/>
33
    <locjar basedir="../libsrc" compress="false" excludesfile="../../nbbuild/standard-jar-excludes.txt" jarfile="netbeans/modules/autoload/cvslib.jar" manifest="manifest-subst.mf">
32
    <jar basedir="../libsrc" 
34
    </locjar>
33
         compress="false" 
34
         excludesfile="../../nbbuild/standard-jar-excludes.txt" 
35
         jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/cvslib.jar" 
36
         manifest="manifest-subst.mf"/>
35
  </target>
37
  </target>
36
38
37
  <target depends="jars" name="netbeans">
39
  <target depends="jars" name="netbeans">
38
    <genlist targetname="nbm" outputfiledir="netbeans"/>
40
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/cvslib.jar">
41
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
42
         <patternset refID="javacvs/libmodule.files"/>
43
       </fileset>
44
    </genlist>
39
  </target>
45
  </target>
40
46
41
  <target depends="netbeans" name="nbm">
47
  <target depends="netbeans" name="nbm">
42
    <makenbm distribution="http://${dist.base}/cvslib.nbm" file="cvslib.nbm" homepage="http://javacvs.${homepage.base}/" module="netbeans/modules/autoload/cvslib.jar" topdir=".">
48
    <makenbm distribution="http://${dist.base}/cvslib.nbm" 
49
             productdir="${netbeans.dest.dir}/${cluster.dir}"
50
             file="cvslib.nbm" 
51
             homepage="http://javacvs.${homepage.base}/" 
52
             module="${nb.modules/autoload.dir}/cvslib.jar">
43
      <license file="${license.file}"/>
53
      <license file="${license.file}"/>
44
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
54
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
45
    </makenbm>
55
    </makenbm>
46
  </target>
56
  </target>
47
57
48
  <target name="clean">
58
  <target name="clean" depends="init">
49
    <delete>
59
    <delete>
50
      <fileset dir="../libsrc">
60
      <fileset dir="../libsrc">
51
        <include name="**/*.class"/>
61
        <include name="**/*.class"/>
52
      </fileset>
62
      </fileset>
63
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
64
        <patternset refID="javacvs/libmodule.files"/>
65
      </fileset>
53
    </delete>
66
    </delete>
54
    <delete file="manifest-subst.mf"/>
67
    <delete file="manifest-subst.mf"/>
55
    <delete file="cvslib.nbm"/>
68
    <delete file="cvslib.nbm"/>
56
    <delete dir="netbeans"/>
57
    <delete dir="javadoc"/>
69
    <delete dir="javadoc"/>
58
    <delete dir="Info"/>
59
  </target>
70
  </target>
60
71
61
  <target name="javadoc" description="Build cvs library module API documentation.">
72
  <target name="javadoc" description="Build cvs library module API documentation.">
(-)javadoc/build.xml (-45 / +37 lines)
Lines 13-58 Link Here
13
-->
13
-->
14
14
15
<project name="javadoc" default="netbeans" basedir=".">
15
<project name="javadoc" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="javadoc.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/javadoc.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
  <property name="nb_all" location=".."/>
22
    <path id="cp">
22
  <property name="build.compiler.debug" value="on"/>
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
  
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
26
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
26
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
27
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
27
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
28
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
29
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
30
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
31
    </path>
32
  </target>
28
33
29
  <target name="compile">
34
  <target name="compile" depends="init">
30
    <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="src" srcdir="src" source="1.4">
35
    <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="src" srcdir="src" source="1.4">
31
      <classpath>
36
      <classpath refID="cp"/>
32
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
33
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
34
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
35
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
36
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
37
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
38
        <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
39
        <pathelement location="../java/netbeans/modules/java.jar"/>
40
        <!--pathelement location="../openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/-->        
41
      </classpath>
42
    </javac>
37
    </javac>
43
  </target>
38
  </target>
44
39
45
  <target name="jars" depends="compile">
40
  <target name="jars" depends="compile">
46
    <mkdir dir="netbeans/modules"/>
41
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
47
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
    <locjar jarfile="netbeans/modules/javadoc.jar"
44
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/javadoc.jar"
50
            manifest="manifest-subst.mf"
45
         manifest="manifest-subst.mf"
51
            basedir="src"
46
         basedir="src"
52
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
47
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
53
	    compress="false">
48
	 compress="false"/>
54
      <locale name="ja"/>
55
    </locjar>
56
  </target>
49
  </target>
57
50
58
    <!-- I call this target from IDE directly, while debugging module. -->
51
    <!-- I call this target from IDE directly, while debugging module. -->
Lines 65-77 Link Here
65
  
58
  
66
  
59
  
67
  <target name="netbeans" depends="jars">
60
  <target name="netbeans" depends="jars">
68
    <genlist targetname="nbm" outputfiledir="netbeans"/>
61
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/javadoc.jar">
62
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
63
        <patternset refID="javadoc.files"/>
64
      </fileset>
65
    </genlist>
69
  </target>
66
  </target>
70
67
71
  <target name="nbm" depends="netbeans">
68
  <target name="nbm" depends="netbeans">
72
    <makenbm file="javadoc.nbm"
69
    <makenbm file="javadoc.nbm"
73
             topdir="."
70
             productdir="${netbeans.dest.dir}/${cluster.dir}"
74
             module="netbeans/modules/javadoc.jar"
71
             module="${nb.modules.dir}/javadoc.jar"
75
	     homepage="http://javadoc.${homepage.base}/"
72
	     homepage="http://javadoc.${homepage.base}/"
76
	     distribution="http://${dist.base}/javadoc.nbm">
73
	     distribution="http://${dist.base}/javadoc.nbm">
77
      <license file="${license.file}"/>
74
      <license file="${license.file}"/>
Lines 79-98 Link Here
79
    </makenbm>
76
    </makenbm>
80
  </target>
77
  </target>
81
78
82
  <target name="clean">
79
  <target name="clean" depends="init">
83
    <delete>
80
    <delete>
84
      <fileset dir="src">
81
      <fileset dir="src">
85
        <include name="**/*.class"/>
82
        <include name="**/*.class"/>
86
      </fileset>
83
      </fileset>
84
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
85
        <patternset refID="javadoc.files"/>
86
      </fileset>
87
    </delete>
87
    </delete>
88
    <delete file="manifest-subst.mf"/>
88
    <delete file="manifest-subst.mf"/>
89
    <delete file="javadoc.nbm"/>
89
    <delete file="javadoc.nbm"/>
90
    <delete dir="netbeans"/>
91
    <delete dir="javadoc"/>
90
    <delete dir="javadoc"/>
92
    <delete dir="Info"/>
93
  </target>
91
  </target>
94
92
95
  <target name="javadoc" description="Build javadoc module API documentation.">
93
  <target name="javadoc" depends="init" description="Build javadoc module API documentation.">
96
    <tstamp/>
94
    <tstamp/>
97
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
95
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
98
    <echo message="Build javadoc module API documentation..."/>
96
    <echo message="Build javadoc module API documentation..."/>
Lines 111-123 Link Here
111
      <sourcepath>
109
      <sourcepath>
112
        <pathelement location="src"/>
110
        <pathelement location="src"/>
113
      </sourcepath>
111
      </sourcepath>
114
      <classpath>
112
      <classpath refID="cp"/>
115
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
116
        <fileset dir="../openide/netbeans/lib">
117
          <include name="openide*.jar" />
118
        </fileset>
119
        <pathelement location="../java/netbeans/modules/java.jar"/>
120
      </classpath>
121
    </javadoc>    
113
    </javadoc>    
122
  </target>
114
  </target>
123
115
(-)junit/build.xml (-62 / +62 lines)
Lines 13-34 Link Here
13
-->
13
-->
14
14
15
<project name="junit" default="netbeans" basedir=".">
15
<project name="junit" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <property name="module.license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
21
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
22
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
24
  
25
  <property name="build.compiler.deprecation" value="off"/>
26
  <property name="build.compiler.debug" value="off"/>  
27
28
  <property name="module.license.file" location="../nbbuild/standard-nbm-license.txt"/>
29
19
30
  <target name="init">
20
  <target name="init" depends="default.init">
31
    <ant dir="external" target="unscramble"/>
21
    <ant dir="external" target="unscramble"/>
22
    <patternset id="junit.files">
23
      <include name="${nb.modules.dir}/junit.jar"/>
24
      <include name="${nb.modules.dir}/ext/juni-testrunnert.jar"/>
25
      <include name="${nb.modules/docs.dir}/junit-module-help.jar"/>
26
      <include name="${nb.docs.dir}/junit-3.8.1-api.zip"/>
27
      <include name="${nb.modules.dir}/ext/junit*.jar"/>
28
      <include name="${nb.system.dir}/ParserDB/JUnit-*.jc?"/>
29
    </patternset>
30
    <path id="cp">
31
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
32
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
33
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
34
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
35
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
36
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
37
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
38
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
39
      <fileset dir="external">
40
        <include name="junit*.jar"/>
41
      </fileset>
42
    </path>
32
  </target>
43
  </target>
33
  
44
  
34
45
Lines 38-81 Link Here
38
           debug="${build.compiler.debug}"
49
           debug="${build.compiler.debug}"
39
           source="1.4">
50
           source="1.4">
40
      <exclude name="org/netbeans/junit/**"/>
51
      <exclude name="org/netbeans/junit/**"/>
41
      <classpath>
52
      <classpath refID="cp"/>
42
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
43
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
44
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
46
        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
47
        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
48
        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
49
        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
50
        <fileset dir="external">
51
          <include name="junit*.jar"/>
52
        </fileset>
53
      </classpath>
54
    </javac>
53
    </javac>
55
  </target>
54
  </target>
56
55
57
  <target name="jars" depends="compile">
56
  <target name="jars" depends="compile">
58
    <mkdir dir="netbeans/modules"/>
57
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
59
    <mkdir dir="netbeans/modules/ext"/>
60
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
58
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
61
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
59
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
62
    <locjar jarfile="netbeans/modules/junit.jar"
60
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/junit.jar"
63
            manifest="manifest-subst.mf"
61
         manifest="manifest-subst.mf"
64
            basedir="src"
62
         basedir="src"
65
            excludesfile="../nbbuild/standard-jar-excludes.txt"
63
         excludesfile="../nbbuild/standard-jar-excludes.txt"
66
            compress="false"
64
         compress="false"
67
	    includes="org/netbeans/modules/junit/**"
65
	 includes="org/netbeans/modules/junit/**"
68
            excludes="org/netbeans/modules/junit/testrunner/**">
66
         excludes="org/netbeans/modules/junit/testrunner/**"/>
69
    </locjar>
67
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/junit-testrunner.jar"
70
    <locjar jarfile="netbeans/modules/ext/junit-testrunner.jar"
68
         basedir="src"
71
            basedir="src"
69
         excludesfile="../nbbuild/standard-jar-excludes.txt"
72
            excludesfile="../nbbuild/standard-jar-excludes.txt"
70
         compress="false"
73
            compress="false"
71
	 includes="org/netbeans/modules/junit/testrunner/**"/>
74
	    includes="org/netbeans/modules/junit/testrunner/**">            
75
    </locjar>
76
  </target>
72
  </target>
77
73
78
  <target name="javahelp">
74
  <target name="javahelp" depends="init">
79
    <!-- XXX consider running jhindexer too -->
75
    <!-- XXX consider running jhindexer too -->
80
    <mkdir dir="javahelp/org/netbeans/modules/junit/docs/JavaHelpSearch"/>
76
    <mkdir dir="javahelp/org/netbeans/modules/junit/docs/JavaHelpSearch"/>
81
    <jhindexer basedir="javahelp/org/netbeans/modules/junit/docs/"
77
    <jhindexer basedir="javahelp/org/netbeans/modules/junit/docs/"
Lines 90-114 Link Here
90
    </jhindexer>
86
    </jhindexer>
91
    <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
87
    <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
92
    <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
88
    <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
93
    <mkdir dir="netbeans/modules/docs"/>    
89
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>    
94
    <locjar jarfile="netbeans/modules/docs/junit-module-help.jar" compress="true">
90
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/junit-module-help.jar" compress="true">
95
    	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
91
    	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
96
    </locjar>
92
    </jar>
97
    
93
    
98
  </target>
94
  </target>
99
  
95
  
100
  <target name="parserdb">
96
  <target name="parserdb" depends="init">
101
  	<mkdir dir="netbeans/system/ParserDB"/>
97
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/ParserDB"/>
102
  	<copy toDir="netbeans/system/ParserDB">
98
    <copy toDir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/ParserDB">
103
  		<fileset dir="parserdb"/>
99
      <fileset dir="parserdb"/>
104
  	</copy>
100
    </copy>
105
  </target>
101
  </target>
106
102
107
  <target name="release" depends="init">
103
  <target name="release" depends="init">
108
    <mkdir dir="netbeans/docs"/>
104
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
109
    <copy file="external/junit-3.8.1-api.zip" todir="netbeans/docs"/>
105
    <copy file="external/junit-3.8.1-api.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
110
    <mkdir dir="netbeans/modules/ext"/>
106
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
111
    <copy todir="netbeans/modules/ext">
107
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
112
      <fileset dir="external">
108
      <fileset dir="external">
113
        <include name="junit*.jar"/>
109
        <include name="junit*.jar"/>
114
      </fileset>
110
      </fileset>
Lines 116-129 Link Here
116
  </target>
112
  </target>
117
113
118
  <target name="netbeans" depends="jars,javahelp,parserdb,release">
114
  <target name="netbeans" depends="jars,javahelp,parserdb,release">
119
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
115
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/junit.jar">
120
    <genlist targetname="nbm" outputfiledir="netbeans"/>
116
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
117
         <patternset refID="junit.files"/>
118
       </fileset>
119
    </genlist>
121
  </target>
120
  </target>
122
121
123
  <target name="nbm" depends="netbeans">
122
  <target name="nbm" depends="netbeans">
124
    <makenbm file="junit.nbm"
123
    <makenbm file="junit.nbm"
125
             topdir="."
124
             productdir="${netbeans.dest.dir}/${cluster.dir}"
126
             module="netbeans/modules/junit.jar"
125
             module="${nb.modules.dir}/junit.jar"
127
	     homepage="http://junit.${homepage.base}/"
126
	     homepage="http://junit.${homepage.base}/"
128
	     distribution="http://${dist.base}/junit.nbm">
127
	     distribution="http://${dist.base}/junit.nbm">
129
      <license name="junit-license.txt">
128
      <license name="junit-license.txt">
Lines 136-151 Link Here
136
    </makenbm>
135
    </makenbm>
137
  </target>
136
  </target>
138
137
139
  <target name="clean">
138
  <target name="clean" depends="init">
140
    <delete>
139
    <delete>
141
      <fileset dir="src">
140
      <fileset dir="src">
142
        <include name="**/*.class"/>
141
        <include name="**/*.class"/>
143
      </fileset>
142
      </fileset>
143
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
144
        <patternset refID="junit.files"/>
145
      </fileset>
144
    </delete>
146
    </delete>
145
    <delete file="manifest-subst.mf"/>
147
    <delete file="manifest-subst.mf"/>
146
    <delete dir="netbeans"/>
147
    <delete file="junit.nbm"/>
148
    <delete file="junit.nbm"/>
148
    <delete dir="Info"/>
149
    <delete dir="javahelp/org/netbeans/modules/junit/docs/JavaHelpSearch"/>	
149
    <delete dir="javahelp/org/netbeans/modules/junit/docs/JavaHelpSearch"/>	
150
    <delete dir="javahelp/org/netbeans/modules/usersguide"/>
150
    <delete dir="javahelp/org/netbeans/modules/usersguide"/>
151
  </target>
151
  </target>
(-)libs/j2eeeditor/build.xml (-29 / +28 lines)
Lines 13-55 Link Here
13
-->
13
-->
14
14
15
<project name="libs/j2eeeditor" default="netbeans" basedir=".">
15
<project name="libs/j2eeeditor" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="libs_root" location=".."/>
18
    <property name="libs_root" location=".."/>
18
19
19
    <property name="nbroot" location="${libs_root}/.."/>
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
22
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
23
    <property name="j2eeeditor-license.file" location="${libs_root}/external/j2eeeditor-license.html"/>
20
    <property name="j2eeeditor-license.file" location="${libs_root}/external/j2eeeditor-license.html"/>
24
    <property name="homepage.base" value="libs.netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="nbm_alias" value="nb_ide"/>
27
28
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
29
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
30
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
31
21
32
    <target name="init">
22
    <target name="init" depends="default.init">
33
        <property file="${libs_root}/public.properties"/>
23
        <property file="${libs_root}/public.properties"/>
34
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
24
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
35
        <ant dir="../external" target="unscramble"/>
25
        <ant dir="../external" target="unscramble"/>
26
        <patternset id="libs/j2eeeditor.files">
27
          <include name="${nb.modules/autoload.dir}/j2eeeditor.jar"/>
28
          <include name="${nb.modules/autoload.dir}/ext/j2eeeditor*.jar"/>
29
        </patternset>
36
    </target>
30
    </target>
37
31
38
    <target name="jars" depends="init">
32
    <target name="jars" depends="init">
39
        <mkdir dir="netbeans/modules"/>
33
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
40
34
41
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
35
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
        <locjar jarfile="netbeans/modules/autoload/j2eeeditor.jar"
36
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeeditor.jar"
43
                manifest="manifest-subst.mf"
37
             manifest="manifest-subst.mf"
44
                compress="false">
38
             compress="false">
45
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
39
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
46
            <locale name="ja"/>
40
        </jar>    
47
        </locjar>    
48
    </target>
41
    </target>
49
42
50
    <target name="release" depends="init">
43
    <target name="release" depends="init">
51
        <mkdir dir="netbeans/modules/autoload/ext"/>
44
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
52
        <copy todir="netbeans/modules/autoload/ext">
45
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
53
            <fileset dir="../external">
46
            <fileset dir="../external">
54
                <include name="j2eeeditor*.jar"/>
47
                <include name="j2eeeditor*.jar"/>
55
            </fileset>
48
            </fileset>
Lines 57-70 Link Here
57
    </target>
50
    </target>
58
51
59
    <target name="netbeans" depends="jars, release">
52
    <target name="netbeans" depends="jars, release">
60
        <genlist targetname="nbm" outputfiledir="netbeans"/>
53
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeeditor.jar">
54
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
55
             <patternset refID="libs/j2eeeditor.files"/>
56
          </fileset>
57
       </genlist>
61
    </target>
58
    </target>
62
59
63
    <target name="nbm" depends="netbeans">
60
    <target name="nbm" depends="netbeans">
64
        <delete dir="Info"/>
61
        <makenbm file="j2eeeditor.nbm"
65
        <makenbm file="${libs_root}/j2eeeditor.nbm"
62
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
66
                 topdir="."
63
                 module="${nb.modules/autoload.dir}/j2eeeditor.jar"
67
                 module="netbeans/modules/autoload/j2eeeditor.jar"
68
                 homepage="http://${homepage.base}/#j2eeeditor"
64
                 homepage="http://${homepage.base}/#j2eeeditor"
69
                 distribution="http://${dist.base}/j2eeeditor.nbm">
65
                 distribution="http://${dist.base}/j2eeeditor.nbm">
70
            <license name="j2eeeditor-license.html">
66
            <license name="j2eeeditor-license.html">
Lines 77-87 Link Here
77
        </makenbm>
73
        </makenbm>
78
    </target>
74
    </target>
79
75
80
    <target name="clean">
76
    <target name="clean" depends="init">
81
        <delete file="manifest-subst.mf"/>
77
        <delete file="manifest-subst.mf"/>
82
        <delete file="${libs_root}/j2eeeditor.nbm"/>
78
        <delete file="${libs_root}/j2eeeditor.nbm"/>
83
        <delete dir="netbeans"/>
79
        <delete>
84
        <delete dir="Info"/>
80
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
81
              <patternset refID="libs/j2eeeditor.files"/>
82
            </fileset>
83
        </delete>
85
    </target>
84
    </target>
86
85
87
    <target name="all" depends="clean, nbm"/>
86
    <target name="all" depends="clean, nbm"/>
(-)libs/jaxp/build.xml (-34 / +27 lines)
Lines 13-65 Link Here
13
-->
13
-->
14
14
15
<project name="libs/jaxp" default="netbeans" basedir=".">
15
<project name="libs/jaxp" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="libs_root" location=".."/>
18
    <property name="libs_root" location=".."/>
18
19
19
    <property name="nbroot" location="${libs_root}/.."/>
20
    <target name="init" depends="default.init">
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
22
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
23
    <property name="homepage.base" value="libs.netbeans.org"/>
24
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
25
    <property name="nbm_alias" value="nb_ide"/>
26
27
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
28
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
29
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
30
31
32
    <target name="init">
33
        <property file="${libs_root}/public.properties"/>
21
        <property file="${libs_root}/public.properties"/>
34
        <filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
22
        <filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
35
        <filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
23
        <filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
36
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
24
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
25
        <patternset id="libs/jaxp.files">
26
          <include name="${nb.modules/autoload.dir}/jaxp.jar"/>
27
        </patternset>
37
    </target>
28
    </target>
38
29
39
    <target name="jars" depends="init">
30
    <target name="jars" depends="init">
40
        <mkdir dir="netbeans/modules"/>
31
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
41
32
42
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
33
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <locjar jarfile="netbeans/modules/autoload/jaxp.jar"
34
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jaxp.jar"
44
                manifest="manifest-subst.mf"
35
             manifest="manifest-subst.mf"
45
                compress="false">
36
             compress="false">
46
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
37
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
47
            <locale name="ja"/>
38
        </jar>    
48
        </locjar>    
49
    </target>
50
51
    <target name="release">
52
    </target>
39
    </target>
53
40
54
    <target name="netbeans" depends="jars, release">
41
    <target name="netbeans" depends="jars">
55
        <genlist targetname="nbm" outputfiledir="netbeans"/>
42
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jaxp.jar">
43
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
44
             <patternset refID="libs/jaxp.files"/>
45
          </fileset>
46
       </genlist>
56
    </target>
47
    </target>
57
48
58
    <target name="nbm" depends="netbeans">
49
    <target name="nbm" depends="netbeans">
59
        <delete dir="Info"/>
50
        <makenbm file="jaxp.nbm"
60
        <makenbm file="${libs_root}/jaxp.nbm"
51
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
61
                 topdir="."
52
                 module="${nb.modules/autoload.dir}/jaxp.jar"
62
                 module="netbeans/modules/autoload/jaxp.jar"
63
                 homepage="http://${homepage.base}/#jaxp"
53
                 homepage="http://${homepage.base}/#jaxp"
64
                 distribution="http://${dist.base}/jaxp.nbm">
54
                 distribution="http://${dist.base}/jaxp.nbm">
65
            <license file="${license.file}"/>
55
            <license file="${license.file}"/>
Lines 67-77 Link Here
67
        </makenbm>
57
        </makenbm>
68
    </target>
58
    </target>
69
59
70
    <target name="clean">
60
    <target name="clean" depends="init">
71
        <delete file="manifest-subst.mf"/>
61
        <delete file="manifest-subst.mf"/>
72
        <delete file="${libs_root}/jaxp.nbm"/>
62
        <delete file="jaxp.nbm"/>
73
        <delete dir="netbeans"/>
63
        <delete>
74
        <delete dir="Info"/>
64
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
65
              <patternset refID="libs/jaxp.files"/>
66
            </fileset>
67
        </delete>
75
    </target>
68
    </target>
76
69
77
    <target name="all" depends="clean, nbm"/>
70
    <target name="all" depends="clean, nbm"/>
(-)libs/regexp/build.xml (-38 / +35 lines)
Lines 13-57 Link Here
13
-->
13
-->
14
14
15
<project name="libs/regexp" default="netbeans" basedir=".">
15
<project name="libs/regexp" default="netbeans" basedir=".">
16
17
    <property name="libs_root" location=".."/>
16
    <property name="libs_root" location=".."/>
17
    <import file="../../nbbuild/default.xml"/>
18
18
19
    <property name="nbroot" location="${libs_root}/.."/>
19
    <target name="init" depends="default.init">
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
20
      <patternset id="libs/regexp.files">
21
21
        <include name="${nb.modules/autoload.dir}/ext/regexp*.jar"/>
22
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
22
        <include name="${nb.modules/autoload.dir}/nb-regexp-wrapper.jar"/>
23
    <property name="homepage.base" value="libs.netbeans.org"/>
23
      </patternset>
24
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
      <property file="${libs_root}/public.properties"/>
25
    <property name="nbm_alias" value="nb_ide"/>
25
      <filter token="REGEXP_SPEC_VERS_SUBST" value="${libs.regexp.specification.version}"/>
26
26
      <filter token="REGEXP_IMPL_VERS_SUBST" value="${libs.regexp.implementation.version}"/>
27
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
27
      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
28
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
28
      <ant dir="${libs_root}/external" target="unscramble"/>
29
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
30
31
32
    <target name="init">
33
        <property file="${libs_root}/public.properties"/>
34
        <filter token="REGEXP_SPEC_VERS_SUBST" value="${libs.regexp.specification.version}"/>
35
        <filter token="REGEXP_IMPL_VERS_SUBST" value="${libs.regexp.implementation.version}"/>
36
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
        <ant dir="${libs_root}/external" target="unscramble"/>
38
    </target>
29
    </target>
39
30
40
    <target name="jars" depends="init">
31
    <target name="jars" depends="init">
41
        <mkdir dir="netbeans/modules"/>
32
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
42
33
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
34
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <locjar jarfile="netbeans/modules/autoload/nb-regexp-wrapper.jar"
35
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-regexp-wrapper.jar"
45
                manifest="manifest-subst.mf"
36
             manifest="manifest-subst.mf"
46
                compress="false">
37
             compress="false">
47
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
38
          <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
48
            <locale name="ja"/>
39
        </jar>   
49
        </locjar>    
50
    </target>
40
    </target>
51
41
52
    <target name="release" depends="init">
42
    <target name="release" depends="init">
53
        <mkdir dir="netbeans/modules/autoload/ext"/>
43
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
54
        <copy todir="netbeans/modules/autoload/ext">
44
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
55
            <fileset dir="${libs_root}/external">
45
            <fileset dir="${libs_root}/external">
56
                <include name="regexp*.jar"/>
46
                <include name="regexp*.jar"/>
57
            </fileset>
47
            </fileset>
Lines 59-89 Link Here
59
    </target>
49
    </target>
60
50
61
    <target name="netbeans" depends="jars, release">
51
    <target name="netbeans" depends="jars, release">
62
        <genlist targetname="nbm" outputfiledir="netbeans"/>
52
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-regexp-wrapper.jar">
53
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
          <patternset refID="libs/regexp.files"/>
55
        </fileset>
56
      </genlist>
63
    </target>
57
    </target>
64
58
65
    <target name="nbm" depends="netbeans">
59
    <target name="nbm" depends="netbeans">
66
        <delete dir="Info"/>
60
        <delete dir="Info"/>
67
        <makenbm file="${libs_root}/regexp.nbm"
61
        <makenbm file="regexp.nbm"
68
                 topdir="."
62
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
69
                 module="netbeans/modules/autoload/nb-regexp-wrapper.jar"
63
                 module="${nb.modules/autoload.dir}/nb-regexp-wrapper.jar"
70
                 homepage="http://${homepage.base}/#regexp"
64
                 homepage="http://${homepage.base}/#regexp"
71
                 distribution="http://${dist.base}/regexp.nbm">
65
                 distribution="http://${dist.base}/regexp.nbm">
72
            <license name="regexp-license.txt">
66
            <license name="regexp-license.txt">
73
                <text>For the integration module:</text>
67
                <text>For the integration module:</text>
74
                <file location="${license.file}"/>
68
                <file location="${license.file}"/>
75
                <text>For the Apache Regexp library:</text>
69
                <text>For the Apache Regexp library:</text>
76
                <file location="${nbroot}/nbbuild/external/apache-license.txt"/>
70
                <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
77
            </license>
71
            </license>
78
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
72
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
79
        </makenbm>
73
        </makenbm>
80
    </target>
74
    </target>
81
75
82
    <target name="clean">
76
    <target name="clean" depends="init">
83
        <delete file="manifest-subst.mf"/>
77
        <delete file="manifest-subst.mf"/>
84
        <delete file="${libs_root}/regexp.nbm"/>
78
        <delete file="regexp.nbm"/>
85
        <delete dir="netbeans"/>
79
        <delete>
86
        <delete dir="Info"/>
80
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
81
                <patternset refID="libs/regexp.files"/>
82
            </fileset>
83
       </delete>
87
    </target>
84
    </target>
88
85
89
    <target name="all" depends="clean, nbm"/>
86
    <target name="all" depends="clean, nbm"/>
(-)libs/xalan/build.xml (-32 / +31 lines)
Lines 13-57 Link Here
13
-->
13
-->
14
14
15
<project name="libs/xalan" default="netbeans" basedir=".">
15
<project name="libs/xalan" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="libs_root" location=".."/>
18
    <property name="apache-license.file" location="${nb_all}/nbbuild/external/apache-license.txt"/>
18
19
    <property name="nbroot" location="${libs_root}/.."/>
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
19
22
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
20
    <property name="libs_root" location=".."/>
23
    <property name="apache-license.file" location="${nbroot}/nbbuild/external/apache-license.txt"/>
24
    <property name="homepage.base" value="libs.netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="nbm_alias" value="nb_ide"/>
27
28
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
29
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
30
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
31
21
32
    <target name="init">
22
    <target name="init" depends="default.init">
33
        <property file="${libs_root}/public.properties"/>
23
        <property file="${libs_root}/public.properties"/>
34
        <filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
24
        <filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
35
        <filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
25
        <filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
36
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
26
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
37
        <ant dir="../external" target="unscramble"/>
27
        <ant dir="../external" target="unscramble"/>
28
        <patternset id="libs/xalan.files">
29
          <include name="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"/>
30
          <include name="${nb.modules/autoload.dir}/ext/xalan*.jar"/>
31
        </patternset>
38
    </target>
32
    </target>
39
33
40
    <target name="jars" depends="init">
34
    <target name="jars" depends="init">
41
        <mkdir dir="netbeans/modules"/>
35
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
42
36
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
37
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <locjar jarfile="netbeans/modules/autoload/nb-xalan-wrapper.jar"
38
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"
45
                manifest="manifest-subst.mf"
39
             manifest="manifest-subst.mf"
46
                compress="false">
40
             compress="false">
47
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
41
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
48
            <locale name="ja"/>
42
        </jar>    
49
        </locjar>    
50
    </target>
43
    </target>
51
44
52
    <target name="release" depends="init">
45
    <target name="release" depends="init">
53
        <mkdir dir="netbeans/modules/autoload/ext"/>
46
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
54
        <copy todir="netbeans/modules/autoload/ext">
47
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
55
            <fileset dir="../external">
48
            <fileset dir="../external">
56
                <include name="xalan*.jar"/>
49
                <include name="xalan*.jar"/>
57
            </fileset>
50
            </fileset>
Lines 59-72 Link Here
59
    </target>
52
    </target>
60
53
61
    <target name="netbeans" depends="jars, release">
54
    <target name="netbeans" depends="jars, release">
62
        <genlist targetname="nbm" outputfiledir="netbeans"/>
55
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar">
56
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
57
             <patternset refID="libs/xalan.files"/>
58
          </fileset>
59
       </genlist>
63
    </target>
60
    </target>
64
61
65
    <target name="nbm" depends="netbeans">
62
    <target name="nbm" depends="netbeans">
66
        <delete dir="Info"/>
63
        <makenbm file="xalan.nbm"
67
        <makenbm file="${libs_root}/xalan.nbm"
64
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
68
                 topdir="."
65
                 module="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"
69
                 module="netbeans/modules/autoload/nb-xalan-wrapper.jar"
70
                 homepage="http://${homepage.base}/#xalan"
66
                 homepage="http://${homepage.base}/#xalan"
71
                 distribution="http://${dist.base}/xalan.nbm">
67
                 distribution="http://${dist.base}/xalan.nbm">
72
            <license name="xalan-license.txt">
68
            <license name="xalan-license.txt">
Lines 79-89 Link Here
79
        </makenbm>
75
        </makenbm>
80
    </target>
76
    </target>
81
77
82
    <target name="clean">
78
    <target name="clean" depends="init">
83
        <delete file="manifest-subst.mf"/>
79
        <delete file="manifest-subst.mf"/>
84
        <delete file="${libs_root}/xalan.nbm"/>
80
        <delete file="xalan.nbm"/>
85
        <delete dir="netbeans"/>
81
        <delete>
86
        <delete dir="Info"/>
82
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
83
              <patternset refID="libs/xalan.files"/>
84
            </fileset>
85
        </delete>
87
    </target>
86
    </target>
88
87
89
    <target name="all" depends="clean, nbm"/>
88
    <target name="all" depends="clean, nbm"/>
(-)libs/xerces/build.xml (-32 / +31 lines)
Lines 13-59 Link Here
13
-->
13
-->
14
14
15
<project name="libs/xerces" default="netbeans" basedir=".">
15
<project name="libs/xerces" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="libs_root" location=".."/>
18
    <property name="libs_root" location=".."/>
18
19
19
    <property name="nbroot" location="${libs_root}/.."/>
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
22
    <property file="${libs_root}/public.properties"/>
20
    <property file="${libs_root}/public.properties"/>
21
    <property name="apache-license.file" location="${nb_all}/nbbuild/external/apache-license.txt"/>
23
22
24
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
23
    <target name="init" depends="default.init">
25
    <property name="apache-license.file" location="${nbroot}/nbbuild/external/apache-license.txt"/>
26
    <property name="homepage.base" value="libs.netbeans.org"/>
27
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
28
    <property name="nbm_alias" value="nb_ide"/>
29
30
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
31
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
32
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
33
34
    <target name="init">
35
        <property file="${libs_root}/public.properties"/>
24
        <property file="${libs_root}/public.properties"/>
36
        <filter token="XERCES_SPEC_VERS_SUBST" value="${libs.xerces.specification.version}"/>
25
        <filter token="XERCES_SPEC_VERS_SUBST" value="${libs.xerces.specification.version}"/>
37
        <filter token="XERCES_IMPL_VERS_SUBST" value="${libs.xerces.implementation.version}"/>
26
        <filter token="XERCES_IMPL_VERS_SUBST" value="${libs.xerces.implementation.version}"/>
38
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
27
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
        <ant dir="../external" target="unscramble"/>
28
        <ant dir="../external" target="unscramble"/>
29
        <patternset id="libs/xerces.files">
30
          <include name="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"/>
31
          <include name="${nb.modules/autoload.dir}/ext/${libs.xerces.jar}"/>
32
          <include name="${nb.modules/autoload.dir}/ext/xml-commons-dom-ranges-*.jar"/>
33
        </patternset>
40
    </target>
34
    </target>
41
35
42
    <target name="jars" depends="init">
36
    <target name="jars" depends="init">
43
        <mkdir dir="netbeans/modules"/>
37
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
44
38
45
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
39
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
46
        <locjar jarfile="netbeans/modules/autoload/nb-xerces-wrapper.jar"
40
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"
47
                manifest="manifest-subst.mf"
41
             manifest="manifest-subst.mf"
48
                compress="false">
42
             compress="false">
49
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
43
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
50
            <locale name="ja"/>
44
        </jar>    
51
        </locjar>    
52
    </target>
45
    </target>
53
46
54
    <target name="release" depends="init">
47
    <target name="release" depends="init">
55
        <mkdir dir="netbeans/modules/autoload/ext"/>
48
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
56
        <copy todir="netbeans/modules/autoload/ext">
49
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
57
            <fileset dir="../external">
50
            <fileset dir="../external">
58
                <include name="${libs.xerces.jar}"/>
51
                <include name="${libs.xerces.jar}"/>
59
                <include name="xml-commons-dom-ranges-*.jar"/>
52
                <include name="xml-commons-dom-ranges-*.jar"/>
Lines 62-75 Link Here
62
    </target>
55
    </target>
63
56
64
    <target name="netbeans" depends="jars, release">
57
    <target name="netbeans" depends="jars, release">
65
        <genlist targetname="nbm" outputfiledir="netbeans"/>
58
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar">
59
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
60
             <patternset refID="libs/xerces.files"/>
61
          </fileset>
62
       </genlist>
66
    </target>
63
    </target>
67
64
68
    <target name="nbm" depends="netbeans">
65
    <target name="nbm" depends="netbeans">
69
        <delete dir="Info"/>
66
        <makenbm file="xerces.nbm"
70
        <makenbm file="${libs_root}/xerces.nbm"
67
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
71
                 topdir="."
68
                 module="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"
72
                 module="netbeans/modules/autoload/nb-xerces-wrapper.jar"
73
                 homepage="http://${homepage.base}/#xerces"
69
                 homepage="http://${homepage.base}/#xerces"
74
                 distribution="http://${dist.base}/xerces.nbm">
70
                 distribution="http://${dist.base}/xerces.nbm">
75
            <license name="xerces-license.txt">
71
            <license name="xerces-license.txt">
Lines 84-94 Link Here
84
        </makenbm>
80
        </makenbm>
85
    </target>
81
    </target>
86
82
87
    <target name="clean">
83
    <target name="clean" depends="init">
88
        <delete file="manifest-subst.mf"/>
84
        <delete file="manifest-subst.mf"/>
89
        <delete file="${libs_root}/xerces.nbm"/>
85
        <delete file="xerces.nbm"/>
90
        <delete dir="netbeans"/>
86
        <delete>
91
        <delete dir="Info"/>
87
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
88
              <patternset refID="libs/xerces.files"/>
89
            </fileset>
90
        </delete>
92
    </target>
91
    </target>
93
92
94
    <target name="all" depends="clean, nbm"/>
93
    <target name="all" depends="clean, nbm"/>
(-)monitor/build.xml (-115 / +54 lines)
Lines 14-64 Link Here
14
14
15
15
16
<project name="monitor" default="netbeans" basedir=".">
16
<project name="monitor" default="netbeans" basedir=".">
17
  <import file="../nbbuild/default.xml"/>
17
18
18
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
19
  <target name="init" depends="default.init">
19
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
20
    <patternset id="monitor.files">
20
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
21
      <include name="${nb.modules.dir}/module.jar"/>
21
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
22
      <include name="${nb.modules.dir}/ext/httpmonitor.jar"/>
22
23
    </patternset>
23
  <property name="nb_root" location=".."/>
24
    <path id="core-cp">
24
  <property name="homepage.base" value="netbeans.org"/>
25
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
  <property name="nbm_alias" value="nb_ide"/>
28
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
28
  <property name="storepass" value="?"/>
29
      <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
29
30
    </path>
30
  <property name="servlet22" 
31
    <path id="server-cp">
31
     location="${nb_root}/httpserver/external/servlet-2.2.jar"/>
32
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
32
  <property name="servlet23" 
33
      <pathelement location="${web/servletapi23.dir}/${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
33
     location="${nb_root}/web/external/servlet-2.3.jar"/>
34
    </path>
34
35
  <target name="setup-jdkhome-1">
36
    <!-- Note: user-configured -Djavahome=... will always override this: -->
37
    <property name="javahome" location="${java.home}"/>
38
    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
39
  </target>
40
  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
41
    <property name="jdkhome" value="${javahome}"/>
42
    <property name="jdkhome-valid" value="true"/>
43
  </target>
44
  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
45
    <property name="jdkhome" location="${javahome}/.."/>
46
    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
47
  </target>
48
  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
49
    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
50
  </target>
35
  </target>
51
36
52
  <!-- These are the primary targets. -->
37
  <!-- These are the primary targets. -->
53
38
54
  <target name="netbeans" depends="jars,javahelp,copy-to-tomcat5">
39
  <target name="netbeans" depends="jars,javahelp,copy-to-tomcat5">
55
    <genlist targetname="nbm" outputfiledir="netbeans"/>
40
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/monitor.jar">
41
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
42
        <patternset refID="monitor.files"/>
43
      </fileset>
44
    </genlist>
56
  </target>
45
  </target>
57
46
58
  <target name="nbm" depends="netbeans">
47
  <target name="nbm" depends="netbeans">
59
    <makenbm file="monitor.nbm"
48
    <makenbm file="monitor.nbm"
60
             topdir="."
49
             productdir="${netbeans.dest.dir}/${cluster.dir}"
61
	     module="netbeans/modules/monitor.jar"
50
	     module="${nb.modules.dir}/monitor.jar"
62
	     homepage="http://monitor.${homepage.base}/"
51
	     homepage="http://monitor.${homepage.base}/"
63
	     distribution="http://${dist.base}/monitor.nbm">
52
	     distribution="http://${dist.base}/monitor.nbm">
64
      <license file="${license.file}" />
53
      <license file="${license.file}" />
Lines 66-86 Link Here
66
    </makenbm>
55
    </makenbm>
67
  </target>
56
  </target>
68
57
69
  <target name="clean">
58
  <target name="clean" depends="init">
70
    <delete>
59
    <delete>
71
      <fileset dir="src">
60
      <fileset dir="src">
72
        <include name="**/*.class"/>
61
        <include name="**/*.class"/>
73
      </fileset>
62
      </fileset>
63
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
64
        <patternset refID="monitor.files"/>
65
      </fileset>
74
    </delete>
66
    </delete>
75
    <delete dir="netbeans"/>
67
    <delete dir="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2"/>
76
    <delete dir="Info"/>
68
    <delete file="monitor.nbm"/>	
77
   <delete dir="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2"/>
69
    <delete file="manifest-subst.mf"/>	
78
   <delete file="monitor.nbm"/>	
79
   <delete file="manifest-subst.mf"/>	
80
  </target>
70
  </target>
81
71
82
  <!-- These are the secondary targets. -->
72
  <!-- These are the secondary targets. -->
83
 <target name="javahelp">
73
 <target name="javahelp" depends="init">
84
    <mkdir dir="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2"/>
74
    <mkdir dir="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2"/>
85
    <jhindexer basedir="javahelp/org/netbeans/modules/web/monitor/docs/"
75
    <jhindexer basedir="javahelp/org/netbeans/modules/web/monitor/docs/"
86
               db="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2">
76
               db="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2">
Lines 94-105 Link Here
94
      <exclude name="ja/"/>
84
      <exclude name="ja/"/>
95
      <exclude name="credits.html"/>
85
      <exclude name="credits.html"/>
96
    </jhindexer>
86
    </jhindexer>
97
    <mkdir dir="netbeans/modules/docs"/>
87
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
98
    <locjar jarfile="netbeans/modules/docs/monitor.jar"
88
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/monitor.jar"
99
            compress="true">
89
         compress="true">
100
      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
90
      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
101
      <locale name="ja"/>
91
    </jar>
102
    </locjar>
103
  </target>
92
  </target>
104
93
105
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
94
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
Lines 130-160 Link Here
130
    The need for this target will be removed when we move the the
119
    The need for this target will be removed when we move the the
131
    projects based deployment of the monitor. 
120
    projects based deployment of the monitor. 
132
    --> 
121
    --> 
133
    <copy file="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" tofile="${nb_root}/tomcatint/tomcat5/bundled/netbeans/jakarta-tomcat-5.0.19/common/lib/schema2beans.jar"/>
122
    <copy file="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" 
134
    <copy file="netbeans/modules/ext/httpmonitor.jar"                      tofile="${nb_root}/tomcatint/tomcat5/bundled/netbeans/jakarta-tomcat-5.0.19/common/lib/httpmonitor.jar"/>
123
          tofile="${tomcatint/tomcat5/bundled.dir}/jakarta-tomcat-5.0.19/common/lib/schema2beans.jar"/>
124
    <copy file="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/httpmonitor.jar"
125
          tofile="${tomcatint/tomcat5/bundled.dir}/jakarta-tomcat-5.0.19/common/lib/httpmonitor.jar"/>
135
  </target>
126
  </target>
136
127
137
  <target name="bundled-tomcat5-check">
128
  <target name="bundled-tomcat5-check">
138
    <available property="tomcat5-bundled" 
129
    <available property="tomcat5-bundled" 
139
    file="${nb_root}/tomcatint/tomcat5/bundled/netbeans/modules/eager/tomcat5-bundled.jar"/>
130
    file="${tomcatint/tomcat5/bundled.dir}/${nb.modules/eager.dir}/tomcat5-bundled.jar"/>
140
  </target>
131
  </target>
141
132
142
  <target name="compile"
133
  <target name="compile"
143
	  depends="setup-jdkhome, compile-core, compile-server"/>
134
	  depends=" compile-core, compile-server"/>
144
135
145
  <target name="compile-core">
136
  <target name="compile-core" depends="init">
146
    <javac srcdir="src" destdir="src"
137
    <javac srcdir="src" destdir="src"
147
       deprecation="${build.compiler.deprecation}" 
138
       deprecation="${build.compiler.deprecation}" 
148
       debug="${build.compiler.debug}"
139
       debug="${build.compiler.debug}"
149
       includes="**/MonitorModule.java,**/monitor/data/*,**/monitor/client/**">
140
       includes="**/MonitorModule.java,**/monitor/data/*,**/monitor/client/**">
150
141
       <classpath refID="core-cp"/>
151
       <classpath>
152
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
153
         <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
154
         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
155
         <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
156
         <pathelement location="${servlet22}"/>
157
       </classpath>
158
     </javac>
142
     </javac>
159
  </target>
143
  </target>
160
144
Lines 164-206 Link Here
164
       debug="${build.compiler.debug}"
148
       debug="${build.compiler.debug}"
165
       includes="**/monitor/server/**"
149
       includes="**/monitor/server/**"
166
       excludes="**/SCCS/**, **/CVS/**">
150
       excludes="**/SCCS/**, **/CVS/**">
167
151
       <classpath refID="server-cp"/>
168
       <classpath>
169
         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
170
         <pathelement location="${servlet23}"/>	
171
       </classpath>
172
     </javac>
152
     </javac>
173
  </target>
153
  </target>
174
154
175
<!--
155
  <target name="jars" depends="compile">
176
  <target name="compile-catalina" if="tomcat4-bundled" depends="bundled-tomcat4-check">
156
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
177
    <javac srcdir="src" destdir="src"
178
         deprecation="${build.compiler.deprecation}" 
179
	 debug="${build.compiler.debug}"
180
	 includes="**/monitor/catalina/**">
181
       <classpath>
182
          <pathelement location="${servlet23}"/>
183
          <pathelement location="${nb_root}/tomcatint/bundledtomcat/netbeans/tomcat406/server/lib/catalina.jar"/> 
184
       </classpath>
185
     </javac>
186
  </target>
187
-->  
188
189
  <target name="jars" depends="compile,module-jars">
190
  </target>
191
192
  <target name="module-jars">
193
    <mkdir dir="netbeans/modules"/>
194
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
157
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
195
    <copy file="manifest.mf" tofile="manifest-subst.mf"
158
    <copy file="manifest.mf" tofile="manifest-subst.mf"
196
          filtering="on"/>
159
          filtering="on"/>
197
160
198
    <locjar jarfile="netbeans/modules/monitor.jar"
161
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/monitor.jar"
199
         manifest="manifest-subst.mf"
162
         manifest="manifest-subst.mf"
200
         compress="false">
163
         compress="false">
201
      <locale name="ja"/>
202
      <fileset dir="src">
164
      <fileset dir="src">
203
        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
165
        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
204
          <include name="org/netbeans/modules/web/monitor/client/"/>
166
          <include name="org/netbeans/modules/web/monitor/client/"/>
205
          <include name="org/netbeans/modules/web/monitor/data/"/>
167
          <include name="org/netbeans/modules/web/monitor/data/"/>
206
          <include name="org/netbeans/modules/web/monitor/resources/"/>
168
          <include name="org/netbeans/modules/web/monitor/resources/"/>
Lines 209-253 Link Here
209
          <include name="org/netbeans/modules/web/monitor/Bundle_*.properties"/>
171
          <include name="org/netbeans/modules/web/monitor/Bundle_*.properties"/>
210
        </patternset>
172
        </patternset>
211
      </fileset>
173
      </fileset>
212
    </locjar>
174
    </jar>
213
 
175
 
214
 <!-- NOTE: this is not an IDE module. It is deployed on the execution 
176
 <!-- NOTE: this is not an IDE module. It is deployed on the execution 
215
      server. It will not be deployed correctly if we build a separate 
177
      server. It will not be deployed correctly if we build a separate 
216
      version for another language --> 
178
      version for another language --> 
217
    <mkdir dir="netbeans/modules/ext"/>
179
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
218
    <jar jarfile="netbeans/modules/ext/httpmonitor.jar"
180
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/httpmonitor.jar"
219
         compress="false">
181
         compress="false">
220
	<fileset dir="src">
182
	<fileset dir="src">
221
        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
183
        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
222
	  <include name="org/netbeans/modules/web/monitor/server/"/>
184
	  <include name="org/netbeans/modules/web/monitor/server/"/>
223
          <include name="org/netbeans/modules/web/monitor/data/"/>
185
          <include name="org/netbeans/modules/web/monitor/data/"/>
224
        </patternset>
186
        </patternset>
225
      </fileset>
187
      </fileset>
226
    </jar>
188
    </jar>
227
  </target>
189
  </target>
228
229
<!--
230
  <target name="catalina-jar" if="tomcat5-bundled" depends="bundled-tomcat5-check">
231
 - NOTE: this is not an IDE module. It is deployed on the execution 
232
      server. It will not be deployed correctly if we build a separate 
233
      version for another language. 
234
      This jar file will no longer be required when we switch to J2EE
235
      1.4. 
236
   -
237
  <jar jarfile="netbeans/modules/ext/monitor-valve.jar"
238
         compress="false">
239
      <fileset dir="src">
240
        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
241
          <include name="org/netbeans/modules/web/monitor/catalina/MonitorValve**"/> 
242
243
          <include name="org/netbeans/modules/web/monitor/catalina/DispatchListener**"/>	
244
        </patternset>
245
      </fileset>
246
247
    </jar>
248
  </target>
249
-->
250
251
</project>
190
</project>
252
191
253
192
(-)nbbuild/build.xml (-15 / +28 lines)
Lines 1-4 Link Here
1
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
1
<?xml version="1.0" encoding="UTF-8"?> 
2
<!-- -*- sgml-indent-step: 2 -*- -->
2
<!--
3
<!--
3
                Sun Public License Notice
4
                Sun Public License Notice
4
5
Lines 22-27 Link Here
22
-->
23
-->
23
24
24
<project name="nbbuild" default="all" basedir=".">
25
<project name="nbbuild" default="all" basedir=".">
26
  <import file="default-properties.xml"/>
25
27
26
  <!-- First things first: read the user's and/or -->
28
  <!-- First things first: read the user's and/or -->
27
  <!-- the site's build properties files.         -->
29
  <!-- the site's build properties files.         -->
Lines 494-500 Link Here
494
    <echo message="Building module metrics..."/>
496
    <echo message="Building module metrics..."/>
495
    <ant dir="../metrics" target="netbeans"/>
497
    <ant dir="../metrics" target="netbeans"/>
496
  </target>
498
  </target>
497
  <target name="all-monitor" depends="all-openide,all-web/core,all-schema2beans/rt,all-html,all-httpserver,all-tomcatint/tomcat5/bundled">
499
  <target name="all-monitor" depends="all-openide,all-web/core,all-schema2beans/rt,all-html,all-httpserver,all-tomcatint/tomcat5/bundled,all-httpserver/servletapi,all-web/servletapi23">
498
    <echo message="Building module monitor..."/>
500
    <echo message="Building module monitor..."/>
499
    <ant dir="../monitor" target="netbeans"/>
501
    <ant dir="../monitor" target="netbeans"/>
500
  </target>
502
  </target>
Lines 1027-1057 Link Here
1027
    <echo message="Java: ${java.vendor} ${java.version} in ${java.home}; for NetBeans: ${jdkhome}"/>
1029
    <echo message="Java: ${java.vendor} ${java.version} in ${java.home}; for NetBeans: ${jdkhome}"/>
1028
    <echo message="Classpath: ${java.class.path}"/>
1030
    <echo message="Classpath: ${java.class.path}"/>
1029
  </target>
1031
  </target>
1030
1032
  
1031
  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
1033
  <target name="create-module-xmls-for-one-cluster" >
1032
  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
1033
1034
  <target name="build-nozip" depends="delete-and-merge" description="Build the IDE but do not create a final ZIP file.">
1035
    <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="nbantext.jar"/>
1034
    <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="nbantext.jar"/>
1036
    <mkdir dir="${netbeans.dest}/system/Modules"/>
1035
    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
1037
    <mkdir dir="${netbeans.dest}/modules/autoload"/>
1036
    <loadproperties srcFile="cluster.properties" />
1038
    <mkdir dir="${netbeans.dest}/modules/eager"/>
1037
    <loadproperties srcFile="directories.properties" />
1039
    <createmodulexml xmldir="${netbeans.dest}/system/Modules">
1038
    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
1040
      <enabled dir="${netbeans.dest}/modules">
1039
    
1040
    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.system.dir}/Modules"/>
1041
    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/autoload"/>
1042
    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/eager"/>
1043
    <createmodulexml xmldir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.system.dir}/Modules">
1044
      <enabled dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}">
1041
        <include name="*.jar"/>
1045
        <include name="*.jar"/>
1042
        <!-- Just to test that we can in fact preconfigure some disabled modules: -->
1046
        <!-- Just to test that we can in fact preconfigure some disabled modules: -->
1043
        <exclude name="icebrowser.jar"/>
1047
        <exclude name="icebrowser.jar"/>
1044
      </enabled>
1048
      </enabled>
1045
      <disabled dir="${netbeans.dest}/modules">
1049
      <disabled dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}">
1046
        <include name="icebrowser.jar"/>
1050
        <include name="icebrowser.jar"/>
1047
      </disabled>
1051
      </disabled>
1048
      <autoload dir="${netbeans.dest}/modules/autoload">
1052
      <autoload dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/autoload">
1049
        <include name="*.jar"/>
1053
        <include name="*.jar"/>
1050
      </autoload>
1054
      </autoload>
1051
      <eager dir="${netbeans.dest}/modules/eager">
1055
      <eager dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/eager">
1052
        <include name="*.jar"/>
1056
        <include name="*.jar"/>
1053
      </eager>
1057
      </eager>
1054
    </createmodulexml>
1058
    </createmodulexml>
1059
  </target>
1060
1061
  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
1062
  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
1063
1064
  <target name="build-nozip" depends="merge" description="Build the IDE but do not create a final ZIP file.">
1065
    <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>
1066
    <loadproperties srcFile="cluster.properties" />
1067
    <repeat target="create-module-xmls-for-one-cluster" name="one.cluster.name" values="${clusters.list}" /> 
1055
    <echo file="${netbeans.dest}/build_info">NetBeans dev build
1068
    <echo file="${netbeans.dest}/build_info">NetBeans dev build
1056
------------------
1069
------------------
1057
Number:   ${buildnumber}
1070
Number:   ${buildnumber}
(-)nbbuild/cluster.properties (+127 lines)
Added Link Here
1
local.config.tasklist4barracuda=\
2
        tasklist/api, \
3
        tasklist/core, \
4
        tasklist/suggestions, \
5
        tasklist/docscan
6
7
local.config.libs=libs/xalan, \
8
        libs/jaxp, \
9
        libs/xerces, \
10
        libs/j2eeeditor
11
12
local.config.xml=xml/api, \
13
        xml/tax, \
14
        xml/core, \
15
        xml/catalog, \
16
        xml/tools, \
17
        xml/text-edit, \
18
        xml/css, \
19
        xml/xsl, \
20
	xml/schema
21
22
local.config.vcsprofiles=vcsgeneric/profiles/cvsprofiles, \
23
        vcsgeneric/profiles/pvcs, \
24
        vcsgeneric/profiles/vss
25
26
clusters.list=nb.cluster.platform,nb.cluster.ide,nb.cluster.test
27
28
nb.cluster.platform=core, \
29
        openide, \
30
        openide/compiler, \
31
        openide/util, \
32
        openide/actions, \
33
        openide/awt, \
34
        openide/dialogs, \
35
        openide/nodes, \
36
        openide/explorer, \
37
        openide/fs, \
38
        openide/compat, \
39
        openide/text, \
40
        openide/windows, \
41
        openide/deprecated, \
42
        openide/loaders, \
43
        openide/io, \
44
        openide/execution, \
45
        core/term, \
46
        core/output, \
47
        core/settings, \
48
        core/deprecated, \
49
        java/srcmodel, \
50
        libs/regexp, \
51
        debuggercore/oldapi, \
52
        core/javahelp, \
53
        core/compiler, \
54
        core/execution, \
55
        core/ui, \
56
        core/windows, \
57
        core/ide
58
59
nb.cluster.platform.dir=netbeans
60
61
nb.cluster.ide=classfile, \
62
        clazz, \
63
        editor, \
64
        html, \
65
        image, \
66
        java/api, \
67
        java, \
68
        junit, \
69
        openidex, \
70
        projects, \
71
        text, \
72
        utilities, \
73
        utilities/group,\
74
        autoupdate, \
75
        autoupdate/updatecenters, \
76
        beans, \
77
        debuggercore, \
78
        debuggerjpda, \
79
        form, \
80
        httpserver, \
81
        httpserver/servletapi, \
82
        javadoc, \
83
        properties \
84
        ant, \
85
        applet, \
86
        core/settings, \
87
        db, \
88
        diff, \
89
        extbrowser, \
90
        i18n, \
91
        j2eeserver, \
92
        j2eeserver/j2eeapis, \
93
        j2eeserver/deprecated, \
94
        jarpackager, \
95
        javacvs, \
96
        javacvs/compat, \
97
        javacvs/libmodule, \
98
        monitor, \
99
        schema2beans/rt, \
100
        schema2beans/dev, \
101
        tomcatint/tomcat5, \
102
        tomcatint/tomcat5/bundled, \
103
        ui/welcome, \
104
        usersguide, \
105
        vcscore, \
106
        vcscvs/compat, \
107
        vcsgeneric, \
108
        web/servletapi23, \
109
        web/servletapi24, \
110
        web/advanced, \
111
        web/core, \
112
        web/ddapi, \
113
        web/jspdebug, \
114
        web/jspparser, \
115
        web/jspsyntax, \
116
        web/taglibed, \
117
        ${local.config.libs}, \
118
        ${local.config.xml}, \
119
        ${local.config.vcsprofiles}, \
120
        ${local.config.tasklist4barracuda}
121
122
nb.cluster.ide.dir=netbeans
123
124
nb.cluster.test=xtest/plugins_src/deprecated, \
125
        xtest/plugins_src/ide
126
127
nb.cluster.test.dir=tests
(-)nbbuild/default-properties.xml (+18 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?> 
2
<project name="default-properties" default="netbeans" basedir=".">
3
  <dirname property="nb_all" file="${ant.file.default-properties}/.."/>
4
5
  <property name="homepage.base" value="netbeans.org"/>
6
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
7
  <property name="license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
8
  <property name="nbm_alias" value="nb_ide"/>
9
10
  <property name="clusters.list.file" location="${nb_all}/nbbuild/cluster.properties"/>
11
  <property name="netbeans.dest.dir" location="${nb_all}/nbbuild"/>
12
  <property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
13
  <property name="directoryList.file" location="${nb_all}/nbbuild/directories.properties"/>
14
15
  <property file="${clusters.list.file}"/>
16
  <property file="${moduleCluster.file}"/>
17
  <property file="${directoryList.file}"/>
18
</project>
(-)nbbuild/default.xml (+50 lines)
Added Link Here
1
<project name="default" default="init" basedir=".">
2
  <import file="default-properties.xml"/>
3
  <taskdef name="jhindexer"
4
         classname="org.netbeans.nbbuild.JHIndexer"
5
         classpath="${nb_all}/nbbuild/nbantext.jar"/>
6
  <taskdef name="makenbm"
7
         classname="org.netbeans.nbbuild.MakeNBM"
8
         classpath="${nb_all}/nbbuild/nbantext.jar"/>
9
  <taskdef name="genlist"
10
         classname="org.netbeans.nbbuild.MakeListOfNBM"
11
         classpath="${nb_all}/nbbuild/nbantext.jar"/>
12
  <taskdef name="setcluster"
13
         classname="org.netbeans.nbbuild.SetCluster"
14
         classpath="${nb_all}/nbbuild/nbantext.jar"/>
15
  <taskdef name="getmodulename"
16
         classname="org.netbeans.nbbuild.GetModuleName"
17
         classpath="${nb_all}/nbbuild/nbantext.jar"/>
18
19
  <target name="init" depends="setup-jdkhome">
20
    <!-- Gets the module name -->
21
    <getmodulename name="module.name" root="${nb_all}"/>
22
23
    <setcluster name="cluster.dir" module="${module.name}" list="${clusters.list}"/>
24
25
    <!-- Creating the output directory -->
26
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}"/>
27
28
    <!-- Writing the module's cluster to property file -->
29
    <propertyfile file="${moduleCluster.file}">
30
      <entry  key="${module.name}.dir" value="$${netbeans.dest.dir}/${cluster.dir}"/>
31
    </propertyfile>
32
  </target>
33
34
  <target name="setup-jdkhome-1">
35
    <!-- Note: user-configured -Djavahome=... will always override this: -->
36
    <property name="javahome" location="${java.home}"/>
37
    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
38
  </target>
39
  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
40
    <property name="jdkhome" value="${javahome}"/>
41
    <property name="jdkhome-valid" value="true"/>
42
  </target>
43
  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
44
    <property name="jdkhome" location="${javahome}/.."/>
45
    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
46
  </target>
47
  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
48
    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
49
  </target>
50
</project>
(-)nbbuild/directories.properties (+15 lines)
Added Link Here
1
nb.beans.dir=beans
2
nb.bin.dir=bin
3
nb.docs.dir=docs
4
nb.lib.dir=lib
5
nb.lib/patches.dir=${nb.lib.dir}/patches
6
nb.modules.dir=modules
7
nb.modules/autoload.dir=${nb.modules.dir}/autoload
8
nb.modules/autoload/docs.dir=${nb.modules/autoload.dir}/docs
9
nb.modules/bin.dir=${nb.modules.dir}/bin
10
nb.modules/docs.dir=${nb.modules.dir}/docs
11
nb.modules/eager.dir=${nb.modules.dir}/eager
12
nb.modules/patches.dir=${nb.modules.dir}/patches
13
nb.sources.dir=sources
14
nb.system.dir=system
15
nb.update_tracking.dir=update_tracking
(-)nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java (+49 lines)
Added Link Here
1
/*
2
 *                 Sun Public License Notice
3
 *
4
 * The contents of this file are subject to the Sun Public License
5
 * Version 1.0 (the "License"). You may not use this file except in
6
 * compliance with the License. A copy of the License is available at
7
 * http://www.sun.com/
8
 *
9
 * The Original Code is NetBeans. The Initial Developer of the Original
10
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
 * Microsystems, Inc. All Rights Reserved.
12
 */
13
14
package org.netbeans.nbbuild;
15
16
import java.io.File;
17
import org.apache.tools.ant.*;
18
import org.apache.tools.ant.types.*;
19
20
/**
21
 * @author Michal Zlamal
22
 */
23
public class GetModuleName extends Task {
24
    String name = null;
25
    File root = null;
26
    
27
    public void setName (String name) {
28
        this.name = name;
29
    }
30
    
31
    /** Root directory of the whole project - ${nb_all} */
32
    public void setRoot( File root ) {
33
        this.root = root;
34
    }
35
     
36
    public void execute() throws BuildException {
37
        if (name == null) 
38
            throw new BuildException("You must set the property name, where to store the module name", this.getLocation());
39
        if (root == null)
40
            throw new BuildException("You must set the root dir", this.getLocation());
41
        String basedir = this.getProject().getBaseDir().getAbsolutePath();
42
        String rootdir = root.getAbsolutePath();
43
        if (!basedir.startsWith(rootdir)) throw new BuildException( "This module in on different path than the root dir",this.getLocation());
44
        System.out.println("Basedir: " + basedir + " rootdir: " + rootdir);
45
        String modulename = basedir.substring(rootdir.length() + 1).replace(File.separatorChar,'/');
46
        this.getProject().setProperty( name, modulename);
47
    }
48
    
49
}
(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java (-74 / +73 lines)
Lines 21-26 Link Here
21
import java.lang.reflect.Method;
21
import java.lang.reflect.Method;
22
import java.util.jar.Attributes;
22
import java.util.jar.Attributes;
23
import java.util.jar.Manifest;
23
import java.util.jar.Manifest;
24
import java.util.jar.JarFile;
24
25
25
/**
26
/**
26
 * Create an update tracking file automatically.
27
 * Create an update tracking file automatically.
Lines 29-125 Link Here
29
 * @author  Michal Zlamal
30
 * @author  Michal Zlamal
30
 */
31
 */
31
public class MakeListOfNBM extends Task {
32
public class MakeListOfNBM extends Task {
32
    String targetName = null;
33
    File outputFile = null;
33
    File outputFile = null;
34
    
34
    String moduleName = null;
35
    /** Sets target which contains the <makenbm> tasks */
35
    boolean pok = true;
36
    public void setTargetname(String s) {
36
    FileSet fs = null;
37
        targetName = s;
38
    }
39
    
37
    
40
    /** Sets the directory used to create the NBM list file */
38
    /** Sets the directory used to create the NBM list file */
41
    public void setOutputfiledir(File s) {
39
    public void setOutputfiledir(File s) {
42
        outputFile = s;
40
        outputFile = s;
43
    }
41
    }
44
42
43
    public FileSet createFileSet() {
44
        return (fs = new FileSet());
45
    }
46
    
47
    /** Sets the module file */
48
    public void setModule(String s) {
49
        moduleName = s;
50
    }
51
52
    public void setTargetName(String t) {
53
        pok = false;
54
    }
45
55
46
    public void execute () throws BuildException {
56
    public void execute () throws BuildException {
47
        if ( targetName == null ) new BuildException( "You have to specify target used to make NBMs" );
57
        if (!pok) throw new BuildException("Use the fileset to specify the content of the NBM");
48
        if ( outputFile == null ) new BuildException( "You have to specify output directoty" );
58
        if ( outputFile == null ) throw new BuildException( "You have to specify output directoty" );
59
        if ( moduleName == null ) throw new BuildException( "You have to specify the main module's file" );
60
        if ( fs == null ) throw new BuildException( "You have to specify the fileset of files of this module" );
61
49
        log ("Generating information for Auto Update...");
62
        log ("Generating information for Auto Update...");
50
        
63
        
51
/*        if (!outputFile.exists()) {
64
/*        if (!outputFile.exists()) {
52
            outputFile.mkdirs();
65
            outputFile.mkdirs();
53
        }
66
        }
54
*/        
67
*/        
55
        Task nbms[] = ((Target) this.getProject().getTargets().get(targetName)).getTasks();
56
        UpdateTracking track = new UpdateTracking( outputFile.getAbsolutePath() );
68
        UpdateTracking track = new UpdateTracking( outputFile.getAbsolutePath() );
57
        for( int i=0; i < nbms.length; i++) {
69
        Attributes attr;
58
            if (nbms[i].getClass().getName().endsWith("MakeNBM")) {
70
        JarFile jar = null;
59
                
71
        File module = new File( outputFile, moduleName );
60
                nbms[i].maybeConfigure();
72
        try {
61
                
73
            jar = new JarFile(module);
62
                FileSet fs;
74
            attr = jar.getManifest().getMainAttributes();
63
                try {
75
        } catch (IOException ex) {
64
                    Method m = nbms[i].getClass().getDeclaredMethod("getFileSet",null);
76
            throw new BuildException( "Can't get manifest attributes", ex, location );
65
                    m.setAccessible(true);
77
        } finally {
66
                    fs = (FileSet)m.invoke(nbms[i],null);
78
            try {
67
                } catch (Exception ex) {
79
                if (jar != null) jar.close();
68
                    throw new BuildException( "Can't get fileset of NBM", ex, location );
80
            } catch( IOException ex1 ) {}
69
                }
81
        }
70
                Attributes attr;
82
      
71
                try {
83
        String codename = attr.getValue("OpenIDE-Module");
72
                    Method m = nbms[i].getClass().getDeclaredMethod("getAttributes",null);
84
        if (codename == null)
73
                    m.setAccessible(true);
85
            throw new BuildException("invalid manifest, does not contain OpenIDE-Module", location);
74
                    attr = (Attributes)m.invoke(nbms[i],null);
86
        
75
                } catch (Exception ex) {
87
        String versionSpecNum = attr.getValue("OpenIDE-Module-Specification-Version");
76
                    throw new BuildException( "Can't get manifest attributes", ex, location );
88
        if (versionSpecNum == null) {
77
                }
89
            log("manifest does not contain OpenIDE-Module-Specification-Version");
78
                
90
            return;
79
		String codename = attr.getValue ("OpenIDE-Module");
91
        }
80
		if (codename == null)
92
        
81
                    throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
93
        UpdateTracking.Version version = track.addNewModuleVersion( codename, versionSpecNum );
82
                
94
        
83
		String versionSpecNum = attr.getValue ("OpenIDE-Module-Specification-Version");
95
        DirectoryScanner ds = fs.getDirectoryScanner( this.getProject() );
84
		if (versionSpecNum == null) {
96
        String excludes[]={"Info/info.xml", "main/**"};
85
                    log ("manifest does not contain OpenIDE-Module-Specification-Version");
97
        ds.setExcludes( excludes );
86
                    return;
98
        ds.scan();
87
                }
99
        
88
                
100
        //                log ("Module: " + codenamebase);
89
                UpdateTracking.Version version = track.addNewModuleVersion( codename, versionSpecNum );
101
        //                log ("Specification Version: " + versionSpecNum);
90
                
102
        
91
                DirectoryScanner ds = fs.getDirectoryScanner( this.getProject() );
103
        String include[] = ds.getIncludedFiles();
92
                ds.scan();
104
        for( int j=0; j < include.length; j++ ){
93
 
105
            if (include[j].equals("Info/info.xml") || include[j].startsWith("main/")) continue;
94
//                log ("Module: " + codenamebase);
106
            try {
95
//                log ("Specification Version: " + versionSpecNum);
107
                File inFile = new File( ds.getBasedir(), include[j] );
96
                
108
                FileInputStream inFileStream = new FileInputStream( inFile );
97
                String include[] = ds.getIncludedFiles();
109
                byte array[] = new byte[ (int) inFile.length() ];
98
                for( int j=0; j < include.length; j++ ){
110
                CRC32 crc = new CRC32();
99
                    if (include[j].equals("Info" + File.separatorChar + "info.xml") || 
111
                inFileStream.read( array );
100
			include[j].startsWith("main" + File.separatorChar) || 
112
                inFileStream.close();
101
			include[j].startsWith("netbeans" + File.separatorChar + "update_tracking" + File.separatorChar)) 
113
                crc.update( array );
102
			    continue;
114
                String abs = inFile.getAbsolutePath();
103
115
                String prefix = ds.getBasedir().getAbsolutePath() + File.separatorChar;
104
                    try {
116
                if (! abs.startsWith(prefix)) throw new IllegalStateException(abs);
105
                        File inFile = new File( ds.getBasedir(), include[j] );
117
                version.addFileWithCrc(abs.substring(prefix.length()), Long.toString( crc.getValue() ) );
106
                        FileInputStream inFileStream = new FileInputStream( inFile );
118
            } catch (IOException ex) {
107
                        byte array[] = new byte[ (int) inFile.length() ];
119
                log( ex.toString() );
108
                        CRC32 crc = new CRC32();
109
                        inFileStream.read( array );
110
			inFileStream.close();
111
                        crc.update( array );
112
                        String abs = inFile.getAbsolutePath();
113
                        String prefix = ds.getBasedir().getAbsolutePath() + File.separatorChar + "netbeans" + File.separatorChar;
114
                        if (! abs.startsWith(prefix)) throw new IllegalStateException(abs);
115
                        version.addFileWithCrc(abs.substring(prefix.length()), Long.toString( crc.getValue() ) );
116
//                        log( "File : " + inFile.getAbsolutePath().substring((ds.getBasedir().getAbsolutePath() + "/netbeans/").length() ) + " has CRC " + crc.getValue() );
117
                    } catch (IOException ex) {
118
                        log ( ex.toString() );
119
                    }
120
                }
121
		track.write();		    
122
            }
120
            }
123
        }
121
        }
122
        track.write();		    
124
    }
123
    }
125
}
124
}
(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java (-210 / +168 lines)
Lines 1-11 Link Here
1
/*
1
/*
2
 *                 Sun Public License Notice
2
 *                 Sun Public License Notice
3
 * 
3
 *
4
 * The contents of this file are subject to the Sun Public License
4
 * The contents of this file are subject to the Sun Public License
5
 * Version 1.0 (the "License"). You may not use this file except in
5
 * Version 1.0 (the "License"). You may not use this file except in
6
 * compliance with the License. A copy of the License is available at
6
 * compliance with the License. A copy of the License is available at
7
 * http://www.sun.com/
7
 * http://www.sun.com/
8
 * 
8
 *
9
 * The Original Code is NetBeans. The Initial Developer of the Original
9
 * The Original Code is NetBeans. The Initial Developer of the Original
10
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
10
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
 * Microsystems, Inc. All Rights Reserved.
11
 * Microsystems, Inc. All Rights Reserved.
Lines 22-39 Link Here
22
import org.apache.tools.ant.BuildException;
22
import org.apache.tools.ant.BuildException;
23
import org.apache.tools.ant.Location;
23
import org.apache.tools.ant.Location;
24
import org.apache.tools.ant.Project;
24
import org.apache.tools.ant.Project;
25
import org.apache.tools.ant.taskdefs.MatchingTask;
25
import org.apache.tools.ant.Task;
26
import org.apache.tools.ant.taskdefs.Jar;
26
import org.apache.tools.ant.taskdefs.Jar;
27
import org.apache.tools.ant.taskdefs.Zip;
27
import org.apache.tools.ant.taskdefs.Zip;
28
import org.apache.tools.ant.taskdefs.SignJar;
28
import org.apache.tools.ant.taskdefs.SignJar;
29
import org.apache.tools.ant.types.FileSet;
29
import org.apache.tools.ant.types.FileSet;
30
import org.apache.tools.ant.types.ZipFileSet;
31
30
32
31
/** Makes a <code>.nbm</code> (<b>N</b>et<b>B</b>eans <b>M</b>odule) file.
33
/** Makes a <code>.nbm</code> (<b>N</b>et<b>B</b>eans <b>M</b>odule) file.
32
 *
34
 *
33
 * @author Jesse Glick
35
 * @author Jesse Glick
34
 */
36
 */
35
public class MakeNBM extends MatchingTask {
37
public class MakeNBM extends Task {
36
38
    
37
    /** The same syntax may be used for either <samp>&lt;license&gt;</samp> or
39
    /** The same syntax may be used for either <samp>&lt;license&gt;</samp> or
38
     * <samp>&lt;description&gt;</samp> subelements.
40
     * <samp>&lt;description&gt;</samp> subelements.
39
     * <p>By setting the property <code>makenbm.nocdata</code> to <code>true</code>,
41
     * <p>By setting the property <code>makenbm.nocdata</code> to <code>true</code>,
Lines 215-282 Link Here
215
        }
217
        }
216
        return s2.toString();
218
        return s2.toString();
217
    }
219
    }
218
220
    
219
    /** <samp>&lt;signature&gt;</samp> subelement for signing the NBM. */
221
    /** <samp>&lt;signature&gt;</samp> subelement for signing the NBM. */
220
    public /*static*/ class Signature {
222
    public /*static*/ class Signature {
221
	public File keystore;
223
        public File keystore;
222
	public String storepass, alias;
224
        public String storepass, alias;
223
        /** Path to the keystore (private key). */
225
        /** Path to the keystore (private key). */
224
	public void setKeystore (File f) {
226
        public void setKeystore(File f) {
225
	    keystore = f;
227
            keystore = f;
226
	}
228
        }
227
        /** Password for the keystore.
229
        /** Password for the keystore.
228
         * If a question mark (<samp>?</samp>), the NBM will not be signed
230
         * If a question mark (<samp>?</samp>), the NBM will not be signed
229
         * and a warning will be printed.
231
         * and a warning will be printed.
230
         */
232
         */
231
	public void setStorepass (String s) {
233
        public void setStorepass(String s) {
232
	    storepass = s;
234
            storepass = s;
233
	}
235
        }
234
        /** Alias for the private key. */
236
        /** Alias for the private key. */
235
	public void setAlias (String s) {
237
        public void setAlias(String s) {
236
	    alias = s;
238
            alias = s;
237
	}
239
        }
238
    }
240
    }
239
241
    
242
    private File productDir = null;
240
    private File file = null;
243
    private File file = null;
241
    private File topdir = null;
242
    private File manifest = null;
244
    private File manifest = null;
243
    /** see #13850 for explanation */
245
    /** see #13850 for explanation */
244
    private File module = null;
246
    private String moduleName = null;
245
    private String homepage = null;
247
    private String homepage = null;
246
    private String distribution = null;
248
    private String distribution = null;
247
    private String needsrestart = null;
249
    private String needsrestart = null;
248
    private Blurb license = null;
250
    private Blurb license = null;
249
    private Blurb description = null;
251
    private Blurb description = null;
250
    private Blurb notification = null;    
252
    private Blurb notification = null;
251
    private Signature signature = null;
253
    private Signature signature = null;
252
    private long mostRecentInput = 0L;
254
    private long mostRecentInput = 0L;
253
    private boolean isStandardInclude = true;
255
    private boolean isStandardInclude = true;
254
    private Vector externalPackages = null;
256
    private Vector externalPackages = null;
255
257
    
256
    /** Include netbeans directory - default is true */
258
    /** Include netbeans directory - default is true */
257
    public void setIsStandardInclude(boolean isStandardInclude) {
259
    public void setIsStandardInclude(boolean isStandardInclude) {
258
	this.isStandardInclude = isStandardInclude;
260
        this.isStandardInclude = isStandardInclude;
259
    }
261
    }
260
262
    
261
    /** Name of resulting NBM file. */
263
    /** Directory of the product's files */
262
    public void setFile (File file) {
264
    public void setProductDir( File dir ) {
263
	this.file = file;
265
        productDir = dir;
264
    }
266
    }
265
    /** Top directory.
267
    
266
     * Expected to contain a subdirectory <samp>netbeans/</samp> with the
268
    /** Name of resulting NBM file. */
267
     * desired contents of the NBM.
269
    public void setFile(File file) {
268
     * Will create <samp>Info/info.xml</samp> with metadata.
270
        this.file = file;
269
     */
270
    public void setTopdir (File topdir) {
271
	this.topdir = topdir;
272
    }
271
    }
272
    
273
    /** Module manifest needed for versioning.
273
    /** Module manifest needed for versioning.
274
     * @deprecated Use {@link #setModule} instead.
274
     * @deprecated Use {@link #setModule} instead.
275
     */
275
     */
276
    public void setManifest (File manifest) {
276
    public void setManifest(File manifest) {
277
	this.manifest = manifest;
277
        this.manifest = manifest;
278
	long lmod = manifest.lastModified ();
278
        long lmod = manifest.lastModified();
279
	if (lmod > mostRecentInput) mostRecentInput = lmod;
279
        if (lmod > mostRecentInput) mostRecentInput = lmod;
280
        log(getLocation() + "The 'manifest' attr on <makenbm> is deprecated, please use 'module' instead", Project.MSG_WARN);
280
        log(getLocation() + "The 'manifest' attr on <makenbm> is deprecated, please use 'module' instead", Project.MSG_WARN);
281
    }
281
    }
282
    /** Module JAR needed for generating the info file.
282
    /** Module JAR needed for generating the info file.
Lines 290-297 Link Here
290
     * of what the resulting variant NBMs (or variant information within
290
     * of what the resulting variant NBMs (or variant information within
291
     * the NBM) should look like.
291
     * the NBM) should look like.
292
     */
292
     */
293
    public void setModule(File module) {
293
    public void setModule(String module) {
294
        this.module = module;
294
        this.moduleName = module;
295
        // mostRecentInput updated below...
295
        // mostRecentInput updated below...
296
    }
296
    }
297
    /** URL to a home page describing the module. */
297
    /** URL to a home page describing the module. */
Lines 342-352 Link Here
342
    }
342
    }
343
343
344
    public void execute () throws BuildException {
344
    public void execute () throws BuildException {
345
        if (productDir == null)
346
            throw new BuildException("must set directory of compiled product", location);
345
	if (file == null)
347
	if (file == null)
346
	    throw new BuildException ("must set file for makenbm", location);
348
	    throw new BuildException ("must set file for makenbm", location);
347
        if (manifest == null && module == null)
349
        if (manifest == null && moduleName == null)
348
            throw new BuildException ("must set module for makenbm", location);
350
            throw new BuildException ("must set module for makenbm", location);
349
        if (manifest != null && module != null)
351
        if (manifest != null && moduleName != null)
350
            throw new BuildException("cannot set both manifest and module for makenbm", location);
352
            throw new BuildException("cannot set both manifest and module for makenbm", location);
351
353
352
    File file;
354
    File file;
Lines 361-373 Link Here
361
        overrideURLIfNeeded() ;
363
        overrideURLIfNeeded() ;
362
	overrideLicenseIfNeeded() ;
364
	overrideLicenseIfNeeded() ;
363
365
364
	// Will create a file Info/info.xml to be stored alongside netbeans/ contents.
366
        File module = new File( productDir, moduleName );
365
	File infodir = new File (topdir, "Info"); //NOI18N
367
        // Will create a file Info/info.xml to be stored in tmp
366
	infodir.mkdirs ();
368
        File infofile = null;
367
	File infofile = new File (infodir, "info.xml"); //NOI18N
368
	if (infofile.exists ()) {
369
            infofile.delete();
370
        }
371
        Attributes attr = null;
369
        Attributes attr = null;
372
        if (module != null) {
370
        if (module != null) {
373
            // The normal case; read attributes from its manifest and maybe bundle.
371
            // The normal case; read attributes from its manifest and maybe bundle.
Lines 423-564 Link Here
423
            } catch (IOException ioe) {
421
            } catch (IOException ioe) {
424
                throw new BuildException("exception while reading " + module, ioe, location);
422
                throw new BuildException("exception while reading " + module, ioe, location);
425
            }
423
            }
426
        } // else we will read attr later if info file is out of date
424
        }
427
	boolean skipInfo = false;
425
        try {
428
	if (infofile.exists ()) {
426
	    infofile = File.createTempFile("info",".xml");
429
	    // Check for up-to-date w.r.t. manifest and maybe license file.
427
            OutputStream infoStream = new FileOutputStream (infofile);
430
	    long iMod = infofile.lastModified ();
428
            try {
431
	    if (mostRecentInput < iMod)
429
                PrintWriter ps = new PrintWriter(new OutputStreamWriter(infoStream, "UTF-8")); //NOI18N
432
		skipInfo = true;
430
                // Begin writing XML.
433
	}
431
                ps.println ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //NOI18N
434
	if (! skipInfo) {
432
                ps.println("<!DOCTYPE module PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">"); //NOI18N
435
	    log ("Creating NBM info file " + infofile);
433
                String codenamebase = attr.getValue ("OpenIDE-Module"); //NOI18N
436
            if (manifest != null) {
434
                if (codenamebase == null)
437
                // Read module manifest for main attributes.
435
                    throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
438
                try {
436
                // Strip major release number if any.
439
                    InputStream manifestStream = new FileInputStream (manifest);
437
                int idx = codenamebase.lastIndexOf ('/'); //NOI18N
440
                    try {
438
                if (idx != -1) codenamebase = codenamebase.substring (0, idx);
441
                        attr = new Manifest (manifestStream).getMainAttributes ();
439
                ps.println ("<module codenamebase=\"" + xmlEscape(codenamebase) + "\""); //NOI18N
442
                    } finally {
440
                if (homepage != null)
443
                        manifestStream.close ();
441
                    ps.println ("        homepage=\"" + xmlEscape(homepage) + "\""); //NOI18N
444
                    }
442
                if (distribution != null) {
445
                } catch (IOException e) {
443
                    ps.println ("        distribution=\"" + xmlEscape(distribution) + "\""); //NOI18N
446
                    throw new BuildException ("exception when reading manifest " + manifest, e, location);
444
                } else {
445
                    throw new BuildException ("NBM distribution URL is not set", location);
447
                }
446
                }
448
            } // else we read attr before
447
                // Here we only write a name for the license.
449
	    try {
448
                if (license != null) {
450
		OutputStream infoStream = new FileOutputStream (infofile);
449
                    String name = license.getName ();
451
		try {
450
                    if (name == null)
452
                    PrintWriter ps = new PrintWriter(new OutputStreamWriter(infoStream, "UTF-8")); //NOI18N
451
                        throw new BuildException ("Every license must have a name or file attribute", location);
453
		    // Begin writing XML.
452
                    ps.println ("        license=\"" + xmlEscape(name) + "\""); //NOI18N
454
                    ps.println ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //NOI18N
453
                }
455
                    ps.println("<!DOCTYPE module PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">"); //NOI18N
454
                ps.println ("        downloadsize=\"0\""); //NOI18N
456
		    String codenamebase = attr.getValue ("OpenIDE-Module"); //NOI18N
455
                if (needsrestart != null)
457
		    if (codenamebase == null)
456
                    ps.println ("        needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N
458
			throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
457
                ps.println (">"); //NOI18N
459
		    // Strip major release number if any.
458
                if (description != null) {
460
		    int idx = codenamebase.lastIndexOf ('/'); //NOI18N
459
                    ps.print ("  <description>"); //NOI18N
461
		    if (idx != -1) codenamebase = codenamebase.substring (0, idx);
460
                    ps.print (description.getText ());
462
		    ps.println ("<module codenamebase=\"" + xmlEscape(codenamebase) + "\""); //NOI18N
461
                    ps.println ("</description>"); //NOI18N
463
		    if (homepage != null)
462
                }
464
                        ps.println ("        homepage=\"" + xmlEscape(homepage) + "\""); //NOI18N
463
                if (notification != null) {
465
		    if (distribution != null) {
464
                    ps.print("  <module_notification>"); //NOI18N
466
                        ps.println ("        distribution=\"" + xmlEscape(distribution) + "\""); //NOI18N
465
                    ps.print(notification.getText());
467
                    } else {
466
                    ps.println("</module_notification>"); //NOI18N
468
                        throw new BuildException ("NBM distribution URL is not set", location);
467
                }
469
                    }
468
                if (externalPackages != null) {
470
		    // Here we only write a name for the license.
469
                    Enumeration exp = externalPackages.elements();
471
		    if (license != null) {
470
                    while (exp.hasMoreElements()) {
472
			String name = license.getName ();
471
                        ExternalPackage externalPackage = (ExternalPackage) exp.nextElement();
473
			if (name == null)
472
                        if (externalPackage.name == null || 
474
			    throw new BuildException ("Every license must have a name or file attribute", location);
473
                            externalPackage.targetName == null ||
475
                        ps.println ("        license=\"" + xmlEscape(name) + "\""); //NOI18N
474
                            externalPackage.startUrl == null)
476
		    }
475
                            throw new BuildException("Must define name, targetname, starturl for external package");
477
		    ps.println ("        downloadsize=\"0\""); //NOI18N
476
                        ps.print("  <external_package "); //NOI18N
478
                    if (needsrestart != null)
477
                        ps.print("name=\""+xmlEscape(externalPackage.name)+"\" "); //NOI18N
479
                        ps.println ("        needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N
478
                        ps.print("target_name=\""+xmlEscape(externalPackage.targetName)+"\" "); //NOI18N
480
		    ps.println (">"); //NOI18N
479
                        ps.print("start_url=\""+xmlEscape(externalPackage.startUrl)+"\""); //NOI18N
481
		    if (description != null) {
480
                        if (externalPackage.description != null)
482
			ps.print ("  <description>"); //NOI18N
481
                            ps.print(" description=\""+xmlEscape(externalPackage.description)+"\""); //NOI18N
483
			ps.print (description.getText ());
482
                        ps.println("/>"); //NOI18N
484
			ps.println ("</description>"); //NOI18N
485
                    }
486
                    if (notification != null) {
487
                        ps.print("  <module_notification>"); //NOI18N
488
                        ps.print(notification.getText());
489
                        ps.println("</module_notification>"); //NOI18N
490
		    }
491
		    if (externalPackages != null) {
492
			Enumeration exp = externalPackages.elements();
493
			while (exp.hasMoreElements()) {
494
			    ExternalPackage externalPackage = (ExternalPackage) exp.nextElement();
495
			    if (externalPackage.name == null || 
496
				externalPackage.targetName == null ||
497
				externalPackage.startUrl == null)
498
				throw new BuildException("Must define name, targetname, starturl for external package");
499
			    ps.print("  <external_package "); //NOI18N
500
			    ps.print("name=\""+xmlEscape(externalPackage.name)+"\" "); //NOI18N
501
			    ps.print("target_name=\""+xmlEscape(externalPackage.targetName)+"\" "); //NOI18N
502
			    ps.print("start_url=\""+xmlEscape(externalPackage.startUrl)+"\""); //NOI18N
503
			    if (externalPackage.description != null)
504
				ps.print(" description=\""+xmlEscape(externalPackage.description)+"\""); //NOI18N
505
			    ps.println("/>"); //NOI18N
506
			}
507
		    }
508
		    // Write manifest attributes.
509
		    ps.print ("  <manifest "); //NOI18N
510
		    boolean firstline = true;
511
                    List attrNames = new ArrayList(attr.size()); // List<String>
512
                    Iterator it = attr.keySet().iterator();
513
                    while (it.hasNext()) {
514
                        attrNames.add(((Attributes.Name)it.next()).toString());
515
                    }
483
                    }
516
                    Collections.sort(attrNames);
484
                }
517
                    it = attrNames.iterator();
485
                // Write manifest attributes.
518
                    while (it.hasNext()) {
486
                ps.print ("  <manifest "); //NOI18N
519
                        String name = (String)it.next();
487
                boolean firstline = true;
520
                        // Ignore irrelevant attributes (cf. www/www/dtds/autoupdate-catalog-2_0.dtd
488
                List attrNames = new ArrayList(attr.size()); // List<String>
521
                        //  and www/www/dtds/autoupdate-info-2_0.dtd):
489
                Iterator it = attr.keySet().iterator();
522
                        if (! name.startsWith("OpenIDE-Module")) continue; //NOI18N
490
                while (it.hasNext()) {
523
                        if (name.equals("OpenIDE-Module-Localizing-Bundle")) continue; //NOI18N
491
                    attrNames.add(((Attributes.Name)it.next()).toString());
524
                        if (name.equals("OpenIDE-Module-Install")) continue; //NOI18N
492
                }
525
                        if (name.equals("OpenIDE-Module-Layer")) continue; //NOI18N
493
                Collections.sort(attrNames);
526
                        if (name.equals("OpenIDE-Module-Description")) continue; //NOI18N
494
                it = attrNames.iterator();
527
                        if (name.equals("OpenIDE-Module-Package-Dependency-Message")) continue; //NOI18N
495
                while (it.hasNext()) {
528
                        if (name.equals("OpenIDE-Module-Public-Packages")) continue; //NOI18N
496
                    String name = (String)it.next();
529
			if (firstline)
497
                    // Ignore irrelevant attributes (cf. www/www/dtds/autoupdate-catalog-2_0.dtd
530
			    firstline = false;
498
                    //  and www/www/dtds/autoupdate-info-2_0.dtd):
531
			else
499
                    if (! name.startsWith("OpenIDE-Module")) continue; //NOI18N
532
			    ps.print ("            ");
500
                    if (name.equals("OpenIDE-Module-Localizing-Bundle")) continue; //NOI18N
533
                        ps.println(name + "=\"" + xmlEscape(attr.getValue(name)) + "\""); //NOI18N
501
                    if (name.equals("OpenIDE-Module-Install")) continue; //NOI18N
534
		    }
502
                    if (name.equals("OpenIDE-Module-Layer")) continue; //NOI18N
535
		    ps.println ("  />"); //NOI18N
503
                    if (name.equals("OpenIDE-Module-Description")) continue; //NOI18N
536
		    // Maybe write out license text.
504
                    if (name.equals("OpenIDE-Module-Package-Dependency-Message")) continue; //NOI18N
537
		    if (license != null) {
505
                    if (name.equals("OpenIDE-Module-Public-Packages")) continue; //NOI18N
538
                        ps.print ("  <license name=\"" + xmlEscape(license.getName ()) + "\">"); //NOI18N
506
                    if (firstline)
539
			ps.print (license.getText ());
507
                        firstline = false;
540
			ps.println ("</license>"); //NOI18N
508
                    else
541
		    }
509
                        ps.print ("            ");
542
		    ps.println ("</module>"); //NOI18N
510
                    ps.println(name + "=\"" + xmlEscape(attr.getValue(name)) + "\""); //NOI18N
543
                    ps.flush();
511
                }
544
		} finally {
512
                ps.println ("  />"); //NOI18N
545
		    infoStream.close ();
513
                // Maybe write out license text.
546
		}
514
                if (license != null) {
547
	    } catch (IOException e) {
515
                    ps.print ("  <license name=\"" + xmlEscape(license.getName ()) + "\">"); //NOI18N
548
		throw new BuildException ("exception when creating Info/info.xml", e, location);
516
                    ps.print (license.getText ());
549
	    }
517
                    ps.println ("</license>"); //NOI18N
550
	}
518
                }
519
                ps.println ("</module>"); //NOI18N
520
                ps.flush();
521
            } finally {
522
                infoStream.close ();
523
            }
524
        } catch (IOException e) {
525
            throw new BuildException ("exception when creating Info/info.xml", e, location);
526
        }
527
        infofile.deleteOnExit();
528
        ZipFileSet infoXML = new ZipFileSet();
529
        infoXML.setDir( new File("/") );
530
        infoXML.setIncludes( infofile.getAbsolutePath().substring(1) );
531
        infoXML.setFullpath("Info/info.xml");
532
533
        String codename = attr.getValue("OpenIDE-Module");
534
        if (codename == null)
535
 	    new BuildException( "Can't get codenamebase" );
536
 	
537
 	UpdateTracking tracking = new UpdateTracking(productDir.getAbsolutePath());
538
 	String files[] = tracking.getListOfNBM( codename );
539
 	ZipFileSet fs = new ZipFileSet();
540
 	fs.setDir( productDir );
541
 	for (int i=0; i < files.length; i++)
542
 	    fs.createInclude().setName( files[i] );
543
 	fs.setPrefix("netbeans/");
544
551
	// JAR it all up together.
545
	// JAR it all up together.
552
	long jarModified = file.lastModified (); // may be 0
546
	long jarModified = file.lastModified (); // may be 0
553
	//log ("Ensuring existence of NBM file " + file);
547
	//log ("Ensuring existence of NBM file " + file);
554
	Jar jar = (Jar) project.createTask ("jar"); //NOI18N
548
	Jar jar = (Jar) project.createTask ("jar"); //NOI18N
555
    
549
    
556
	jar.setJarfile (file);
550
	jar.setJarfile (file);
557
	//jar.setBasedir (topdir.getAbsolutePath ());
551
        jar.addZipfileset(fs);
552
        jar.addFileset (infoXML);
558
        jar.setCompress(true);
553
        jar.setCompress(true);
559
	//jar.createInclude ().setName ("netbeans/"); //NOI18N
560
	//jar.createInclude ().setName ("Info/info.xml"); //NOI18N
561
        jar.addFileset (getFileSet());
562
	jar.setLocation (location);
554
	jar.setLocation (location);
563
	jar.init ();
555
	jar.init ();
564
	jar.execute ();
556
	jar.execute ();
Lines 634-673 Link Here
634
	}
626
	}
635
    }
627
    }
636
   
628
   
637
    // Reflection access from MakeListOfNBM:
638
    
639
    FileSet getFileSet() {
640
        FileSet fs = fileset;		//makes in apperance to excludes and includes files defined in XML
641
        fs.setDir (topdir);
642
643
	if (isStandardInclude) {
644
	    fs.createInclude ().setName ("netbeans/"); //NOI18N
645
	    fs.createExclude ().setName ("netbeans/update_tracking/*.xml"); //NOI18N
646
        }
647
648
	fs.createInclude ().setName ("Info/info.xml"); //NOI18N
649
        return fs;
650
    }
651
652
    Attributes getAttributes() throws IOException {
653
        if (manifest != null) {
654
            InputStream is = new FileInputStream(manifest);
655
            try {
656
                return new Manifest(is).getMainAttributes();
657
            } finally {
658
                is.close();
659
            }
660
        } else if (module != null) {
661
            JarFile jar = new JarFile(module);
662
            try {
663
                return jar.getManifest().getMainAttributes();
664
            } finally {
665
                jar.close();
666
            }
667
        } else {
668
            throw new IOException(location + "must give either 'manifest' or 'module' on <makenbm>");
669
        }
670
    }
671
629
672
  /** This returns true if the license should be overridden. */
630
  /** This returns true if the license should be overridden. */
673
  protected boolean overrideLicense() {
631
  protected boolean overrideLicense() {
(-)nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java (-44 lines)
Lines 322-371 Link Here
322
            suppressedlocales.add (s.locale);
322
            suppressedlocales.add (s.locale);
323
        }        
323
        }        
324
324
325
        mergemodules = new Vector ();
326
        mergemodules.addAll(builtmodules);
327
        if (mergedependentmodules) {
328
            for ( int i = 0; i < builttargets.size(); i++) {
329
                String target = (String) builttargets.elementAt(i);
330
                if (target.startsWith(targetprefix)) {
331
                    String module = target.substring(targetprefix.length());
332
                    if ( mergemodules.indexOf(module) < 0 ) {
333
                        mergemodules.addElement(module);
334
                    }
335
                }
336
            }
337
        }
338
339
        // merge the data
340
        for (int j = 0; j < topdirs.size (); j++) {
341
            File topdir = (File) topdirs.get (j);
342
            for (int i = 0; i < mergemodules.size (); i++) {
343
                String module = (String) mergemodules.elementAt (i);
344
                File netbeans = new File (new File (topdir, module), "netbeans");
345
                if (! netbeans.exists ()) {
346
                    log ("Build product dir " + netbeans + " does not exist, skipping...", Project.MSG_WARN);
347
                    continue;
348
                }
349
                Copy copy = (Copy) project.createTask ("copy");
350
                FileSet fs = new FileSet ();
351
                fs.setDir (netbeans);
352
                it = suppressedlocales.iterator ();
353
                while (it.hasNext ()) {
354
                    String locale = (String) it.next ();
355
                    fs.createExclude ().setName ("**/*_" + locale);
356
                    fs.createExclude ().setName ("**/*_" + locale + ".*");
357
                    fs.createExclude ().setName ("**/*_" + locale + "/");
358
                }
359
                copy.addFileset (fs);
360
                copy.setTodir (dest);
361
                copy.setIncludeEmptyDirs (true);
362
                copy.init ();
363
                copy.setLocation (location);
364
                copy.execute ();
365
            }
366
        }
367
        log("mergedmodules=" + mergemodules);
368
        it = suppressedlocales.iterator ();
369
        UpdateTracking tr = new UpdateTracking( dest.getAbsolutePath() );
325
        UpdateTracking tr = new UpdateTracking( dest.getAbsolutePath() );
370
        log ( dest.getAbsolutePath() );
326
        log ( dest.getAbsolutePath() );
371
        while (it.hasNext ()) {
327
        while (it.hasNext ()) {
(-)nbbuild/antsrc/org/netbeans/nbbuild/SetCluster.java (+101 lines)
Added Link Here
1
/*
2
 *                 Sun Public License Notice
3
 *
4
 * The contents of this file are subject to the Sun Public License
5
 * Version 1.0 (the "License"). You may not use this file except in
6
 * compliance with the License. A copy of the License is available at
7
 * http://www.sun.com/
8
 *
9
 * The Original Code is NetBeans. The Initial Developer of the Original
10
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
 * Microsystems, Inc. All Rights Reserved.
12
 */
13
14
package org.netbeans.nbbuild;
15
16
import java.io.*;
17
import java.util.*;
18
19
import org.apache.tools.ant.BuildException;
20
import org.apache.tools.ant.taskdefs.*;
21
import org.apache.tools.ant.Task;
22
import org.apache.tools.ant.Project;
23
24
/** Settigns the given property to cluster value
25
 *
26
 * @author Michal Zlamal
27
 */
28
public class SetCluster extends org.apache.tools.ant.Task {
29
    private String name = null;
30
    private String propertiesList = null;
31
    private String cluster;
32
    private String thisModuleName = null;
33
    
34
    /** Sets the name of property which should contain the value */
35
    public void setName(String name) {
36
        this.name = name;
37
    }
38
    
39
    /** Comma separated list of properties. One of those properties should contain the name of module from what it is ran. */
40
    public void setList( String propertiesList ) {
41
        this.propertiesList = propertiesList;
42
    }
43
    
44
    /** Name of a cluster */
45
    public void setCluster (String cluster) {
46
        this.cluster = cluster;
47
    }
48
    
49
    /** Name of this module */
50
    public void setModule(String module) {
51
        thisModuleName = module;
52
    }
53
    
54
    public void execute() throws BuildException {
55
        if (name == null)
56
            throw new BuildException("Name of property to set have to be specified",this.getLocation());
57
        if (propertiesList != null) {
58
            if (cluster != null)
59
                throw new BuildException("Either list or cluster property can be specified not both",this.getLocation());
60
            if (thisModuleName == null)
61
                throw new BuildException("The name of current module have to be set", this.getLocation());
62
        } else {
63
            if (cluster == null) {
64
                throw new BuildException("Either list or cluster property have to be specified",this.getLocation());
65
            }
66
            if (thisModuleName != null) {
67
                throw new BuildException("When cluster property is used thisModuleName should not be set",this.getLocation());
68
            }
69
        }
70
        
71
        if (cluster != null) {
72
            String clusterDir = this.getProject().getProperty(cluster + ".dir");
73
            if (clusterDir == null) throw new BuildException( "Property: " + cluster + ".dir have to be defined", this.getLocation());
74
            this.getProject().setProperty( name, clusterDir );
75
            return;
76
        }
77
        
78
        HashSet modules = new HashSet();
79
        
80
        StringTokenizer tokens = new StringTokenizer( propertiesList, " \t\n\f\r," );
81
        while (tokens.hasMoreTokens()) {
82
            String property = tokens.nextToken().trim();
83
            String list = this.getProject().getProperty( property );
84
            if (list == null) throw new BuildException("Property: " + property + " is not defined anywhere",this.getLocation());
85
            StringTokenizer modTokens = new StringTokenizer(list," \t\n\f\r,");
86
            while (modTokens.hasMoreTokens()) {
87
                String module = modTokens.nextToken();
88
                log( property + " " + module, Project.MSG_VERBOSE );
89
                if (module.equals(thisModuleName)) {
90
                    // We found the list reffering to this module
91
                    String clusterDir = this.getProject().getProperty(property + ".dir");
92
                    if (clusterDir == null) throw new BuildException( "Property: " + property + ".dir have to be defined", this.getLocation());
93
                    System.out.println( "Property: "+name+" will be set to " + clusterDir);
94
                    this.getProject().setProperty( name, clusterDir );
95
                    return;
96
                }
97
            }
98
        }
99
        throw new BuildException("No cluster list with this module: " + thisModuleName + " was found", this.getLocation());
100
    }
101
}
(-)nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java (-3 / +30 lines)
Lines 72-77 Link Here
72
        return version;
72
        return version;
73
    }
73
    }
74
    
74
    
75
    public String[] getListOfNBM( String codeName ) {
76
        module = new Module();
77
        module.setCodename( codeName );
78
        File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
79
        trackingFile = new File(directory, getTrackingFileName());
80
81
        if (!trackingFile.exists() || !trackingFile.isFile())
82
            return null;
83
        
84
        read();
85
        
86
        if ( module.getVersions().size() != 1 ) 
87
            return null;
88
        
89
        List files = ((Version) module.getVersions().get(0)).getFiles();
90
        String [] listFiles = new String[ files.size() ];
91
        for (int i=0; i < files.size(); i++) {
92
            listFiles[i] = (((ModuleFile) files.get(i)).getName());
93
        }
94
        
95
        return listFiles;
96
    }
97
75
    public void removeLocalized( String locale ) {
98
    public void removeLocalized( String locale ) {
76
        File updateDirectory = new File( nbPath, TRACKING_DIRECTORY );
99
        File updateDirectory = new File( nbPath, TRACKING_DIRECTORY );
77
        File[] trackingFiles = updateDirectory.listFiles( new FileFilter() { // Get only *.xml files
100
        File[] trackingFiles = updateDirectory.listFiles( new FileFilter() { // Get only *.xml files
Lines 112-124 Link Here
112
        }
135
        }
113
        
136
        
114
        //document.getDocumentElement().normalize();
137
        //document.getDocumentElement().normalize();
115
        String trackingFileName = module.getCodenamebase();
116
        trackingFileName = trackingFileName.replace('.', '-') + ".xml";
117
        File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
138
        File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
118
        if (!directory.exists()) {
139
        if (!directory.exists()) {
119
            directory.mkdirs();
140
            directory.mkdirs();
120
        }
141
        }
121
        trackingFile = new File(directory, trackingFileName);
142
        trackingFile = new File(directory, getTrackingFileName());
122
        try {
143
        try {
123
	    OutputStream os = new FileOutputStream(trackingFile);
144
	    OutputStream os = new FileOutputStream(trackingFile);
124
            XMLUtil.write(document, os);
145
            XMLUtil.write(document, os);
Lines 128-133 Link Here
128
            trackingFile.delete();
149
            trackingFile.delete();
129
            throw new BuildException("Could not write update tracking file", e);
150
            throw new BuildException("Could not write update tracking file", e);
130
        }        
151
        }        
152
    }
153
154
    private String getTrackingFileName() {
155
        String trackingFileName = module.getCodenamebase();
156
        trackingFileName = trackingFileName.replace('.', '-') + ".xml";
157
        return trackingFileName;
131
    }
158
    }
132
159
133
    /** Scan through org.w3c.dom.Document document. */
160
    /** Scan through org.w3c.dom.Document document. */
(-)openide/build.xml (-24 / +27 lines)
Lines 1-4 Link Here
1
<?xml version='1.0' encoding='ISO-8859-1' ?><!-- -*- sgml-indent-step: 2 -*- -->
1
<?xml version="1.0" encoding="iso-8859-1"?><!-- -*- sgml-indent-step: 2 -*- -->
2
<!--
2
<!--
3
                Sun Public License Notice
3
                Sun Public License Notice
4
4
Lines 17-29 Link Here
17
<!-- Not clear how to solve this. Try rerunning build if it happens. -->
17
<!-- Not clear how to solve this. Try rerunning build if it happens. -->
18
18
19
<project name="openide" default="netbeans" basedir=".">
19
<project name="openide" default="netbeans" basedir=".">
20
  <property name="homepage.base" value="netbeans.org"/>
20
  <import file="../nbbuild/default.xml"/>
21
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
23
21
24
  <property name="nbm_alias" value="nb_ide"/>
22
  <target name="init" depends="default.init">
25
23
    <patternset id="openide.files">
26
  <target name="init">
24
      <include name="${nb.lib.dir}/openide.jar"/>
25
      <include name="${nb.system.dir}/ModuleAutoDeps/org-openide.xml"/>
26
    </patternset>
27
    <ant dir="../core/external" target="unscramble"/>
27
    <ant dir="../core/external" target="unscramble"/>
28
    <path id="openide-cp">
28
    <path id="openide-cp">
29
      <!-- nothing -->
29
      <!-- nothing -->
Lines 134-143 Link Here
134
  </target>
134
  </target>
135
  
135
  
136
  <target name="old-jars" depends="compile,13javac-workaround,vers-prep,loaders_32143-compat" description="Create JAR files.">
136
  <target name="old-jars" depends="compile,13javac-workaround,vers-prep,loaders_32143-compat" description="Create JAR files.">
137
    <mkdir dir="netbeans/lib"/>
137
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
138
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
138
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
139
    <jar jarfile="netbeans/lib/openide.jar" manifest="manifest-subst.mf" compress="false" duplicate="preserve" >
139
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide.jar" manifest="manifest-subst.mf" compress="false" duplicate="preserve" >
140
      
141
      <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
140
      <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
142
      <fileset dir="windows/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
141
      <fileset dir="windows/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
143
      <fileset dir="explorer/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
142
      <fileset dir="explorer/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
Lines 147-153 Link Here
147
           <!-- But include patch files -->
146
           <!-- But include patch files -->
148
           <include name="**/$$*$$Patch$$.class" />
147
           <include name="**/$$*$$Patch$$.class" />
149
      </fileset>
148
      </fileset>
150
      
151
    </jar>
149
    </jar>
152
  </target>
150
  </target>
153
151
Lines 162-182 Link Here
162
     <ant antfile="build.xml" target="openide-compat" dir="text" />
160
     <ant antfile="build.xml" target="openide-compat" dir="text" />
163
  </target>
161
  </target>
164
  
162
  
165
  <target name="release">
163
  <target name="release" depends="init">
166
    <copy todir="netbeans" includeEmptyDirs="false">
164
    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
167
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
165
      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
168
    </copy>
166
    </copy>
169
  </target>
167
  </target>
170
168
171
  <target name="netbeans" depends="jars-from-libs,release,libs,loaders_32143-compat" description="Build everything needed for inclusion in the IDE.">
169
  <target name="netbeans" depends="init,jars-from-libs,release,libs,loaders_32143-compat" description="Build everything needed for inclusion in the IDE.">
172
<!--    <genlist targetname="nbm" outputfiledir="netbeans"/> -->
170
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/openide.jar">
171
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
172
        <patternset refID="openide.files"/>
173
      </fileset>
174
    </genlist>
173
  </target>
175
  </target>
174
176
175
  <target name="nbm" depends="netbeans">
177
  <target name="nbm" depends="netbeans">
176
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
177
    <makenbm file="openide.nbm"
178
    <makenbm file="openide.nbm"
178
             topdir="."
179
             productdir="${netbeans.dest.dir}/${cluster.dir}"
179
             module="netbeans/lib/openide.jar"
180
             module="${nb.lib.dir}/openide.jar"
180
	     homepage="http://openide.${homepage.base}/"
181
	     homepage="http://openide.${homepage.base}/"
181
	     distribution="http://${dist.base}/openide.nbm">
182
	     distribution="http://${dist.base}/openide.nbm">
182
      <license file="${license.file}"/>
183
      <license file="${license.file}"/>
Lines 373-382 Link Here
373
      <property name="javadoc.files" value="${selector}" />
374
      <property name="javadoc.files" value="${selector}" />
374
    </ant>
375
    </ant>
375
  </target>
376
  </target>
377
376
  <!-- Build whole openide.jar from separate libraries -->
378
  <!-- Build whole openide.jar from separate libraries -->
377
  <target name="jars-from-libs" depends="libs,vers-prep,loaders_32143-compat" description="Create JAR files from copied directories." unless="no-openide.jar">
379
  <target name="jars-from-libs" depends="init,libs,vers-prep,loaders_32143-compat" description="Create JAR files from copied directories." unless="no-openide.jar">
378
    <property name="openide.jar" value="netbeans/lib/openide.jar" />
380
    <property name="openide.jar" value="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide.jar" />
379
    <mkdir dir="netbeans/lib"/>
381
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
380
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
382
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
381
    <jar jarfile="${openide.jar}" manifest="manifest-subst.mf" compress="false" duplicate="fail" >
383
    <jar jarfile="${openide.jar}" manifest="manifest-subst.mf" compress="false" duplicate="fail" >
382
      
384
      
Lines 810-816 Link Here
810
    </zip>
812
    </zip>
811
  </target>
813
  </target>
812
814
813
  <target name="clean" description="Remove all build products." depends="libs-clean">
815
  <target name="clean" description="Remove all build products." depends="init,libs-clean">
814
    <delete>
816
    <delete>
815
      <fileset dir="src">
817
      <fileset dir="src">
816
        <include name="**/*.class"/>
818
        <include name="**/*.class"/>
Lines 821-835 Link Here
821
      <fileset dir=".">
823
      <fileset dir=".">
822
        <include name="*-subst.mf"/>
824
        <include name="*-subst.mf"/>
823
      </fileset>
825
      </fileset>
826
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
827
        <patternset refID="openide.files"/>
828
      </fileset>
824
    </delete>
829
    </delete>
825
    <delete dir="netbeans"/>
826
    <delete file="openide-13javac-workaround.jar"/>
830
    <delete file="openide-13javac-workaround.jar"/>
827
    <delete dir="javadoc"/>
831
    <delete dir="javadoc"/>
828
    <delete file="nb-api-tutorial.zip"/>
832
    <delete file="nb-api-tutorial.zip"/>
829
    <!-- PENDING
833
    <!-- PENDING
830
    <delete dir="standalone"/>
834
    <delete dir="standalone"/>
831
    -->
835
    -->
832
    <delete dir="Info"/>
833
    <delete file="openide.nbm"/>
836
    <delete file="openide.nbm"/>
834
    <ant dir="api/examples" target="clean"/>
837
    <ant dir="api/examples" target="clean"/>
835
  </target>
838
  </target>
(-)openide/compat/build.xml (-3 / +5 lines)
Lines 13-19 Link Here
13
-->
13
-->
14
14
15
<project name="openide/compat" default="netbeans" basedir=".">
15
<project name="openide/compat" default="netbeans" basedir=".">
16
  <property name="nbroot" location="../.." />
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <property name="nbroot" location="${nb_all}" />
17
19
18
  <property name="nbm_alias" value="nb_ide"/>
20
  <property name="nbm_alias" value="nb_ide"/>
19
  <property name="homepage.base" value="netbeans.org"/>
21
  <property name="homepage.base" value="netbeans.org"/>
Lines 34-40 Link Here
34
    <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
36
    <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
35
  </path>
37
  </path>
36
  
38
  
37
  <target name="compile" >
39
  <target name="compile" depends="init">
38
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
40
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
39
      <property name="include" value="**/*$$*.java" />
41
      <property name="include" value="**/*$$*.java" />
40
      <property name="localdir" location="src" />
42
      <property name="localdir" location="src" />
Lines 110-116 Link Here
110
                <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
112
                <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
111
                <pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
113
                <pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
112
                <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
114
                <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
113
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
115
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
114
           </classpath>
116
           </classpath>
115
        </javac>
117
        </javac>
116
118
(-)openide/compiler/build.xml (-32 / +32 lines)
Lines 13-46 Link Here
13
-->
13
-->
14
14
15
<project name="openide/compiler" default="netbeans" basedir=".">
15
<project name="openide/compiler" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="openide/compiler.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.modules/autoload.dir}/openide-compiler.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
26
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
33
        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
27
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
34
    </path>
28
      </path>
29
    </target>
35
  
30
  
36
    <target name="compile">
31
    <target name="compile" depends="init">
37
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
32
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
38
            <classpath refid="cp"/>
33
            <classpath refid="cp"/>
39
        </javac>
34
        </javac>
40
        <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"/>
41
        <enhanceclass basedir="src">
36
        <enhanceclass basedir="src">
42
            <classpath>
37
            <classpath>
43
                <pathelement location="../../core/netbeans/lib/ext/boot.jar"/>
38
                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
44
                <!-- See xtest/instance/build-clover.xml for explanation: -->
39
                <!-- See xtest/instance/build-clover.xml for explanation: -->
45
                <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
40
                <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
46
            </classpath>
41
            </classpath>
Lines 56-81 Link Here
56
    </target>
51
    </target>
57
52
58
    <target name="jars" depends="compile">
53
    <target name="jars" depends="compile">
59
        <mkdir dir="netbeans/modules/autoload"/>
54
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
60
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
55
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
61
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
56
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
62
        <locjar jarfile="netbeans/modules/autoload/openide-compiler.jar"
57
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"
63
                manifest="manifest-subst.mf"
58
             manifest="manifest-subst.mf"
64
                basedir="src"
59
             basedir="src"
65
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
60
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
66
	        compress="false">
61
	     compress="false"/>
67
            <locale name="ja"/>
68
        </locjar>
69
    </target>
62
    </target>
70
63
71
    <target name="netbeans" depends="jars">
64
    <target name="netbeans" depends="jars">
72
        <genlist targetname="nbm" outputfiledir="netbeans"/>
65
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-compiler.jar">
66
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
67
          <patternset refID="openide/compiler.files"/>
68
        </fileset>
69
      </genlist>
73
    </target>
70
    </target>
74
71
75
    <target name="nbm" depends="netbeans">
72
    <target name="nbm" depends="netbeans">
76
        <makenbm file="openide-compiler.nbm"
73
        <makenbm file="openide-compiler.nbm"
77
                 topdir="."
74
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
78
                 module="netbeans/modules/autoload/openide-compiler.jar"
75
                 module="${nb.modules/autoload.dir}/openide-compiler.jar"
79
                 homepage="http://openide.${homepage.base}/"
76
                 homepage="http://openide.${homepage.base}/"
80
                 distribution="http://${dist.base}/openide-compiler.nbm">
77
                 distribution="http://${dist.base}/openide-compiler.nbm">
81
            <license file="${license.file}"/>
78
            <license file="${license.file}"/>
Lines 83-89 Link Here
83
        </makenbm>
80
        </makenbm>
84
    </target>
81
    </target>
85
82
86
    <target name="javadoc" description="Build Javadoc.">
83
    <target name="javadoc" depends="init" description="Build Javadoc.">
87
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
84
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
88
            <property name="javadoc.base" location="."/>
85
            <property name="javadoc.base" location="."/>
89
            <property name="javadoc.name" value="CompilerAPI"/>
86
            <property name="javadoc.name" value="CompilerAPI"/>
Lines 97-106 Link Here
97
        </ant>
94
        </ant>
98
    </target>
95
    </target>
99
  
96
  
100
    <target name="clean">
97
    <target name="clean" depends="init">
101
        <delete>
98
        <delete>
102
            <fileset dir="src">
99
            <fileset dir="src">
103
                <include name="**/*.class"/>
100
                <include name="**/*.class"/>
101
            </fileset>
102
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
103
                <patternset refID="openide/compiler.files"/>
104
            </fileset>
104
            </fileset>
105
        </delete>
105
        </delete>
106
        <delete file="manifest-subst.mf"/>
106
        <delete file="manifest-subst.mf"/>
(-)openide/deprecated/build.xml (-38 / +37 lines)
Lines 13-74 Link Here
13
-->
13
-->
14
14
15
<project name="openide/deprecated" default="netbeans" basedir=".">
15
<project name="openide/deprecated" default="netbeans" basedir=".">
16
16
    <import file="../../nbbuild/default.xml"/>
17
    <property name="nb_all" value="../.."/>
18
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
    
17
    
28
    <path id="cp">
18
    <target name="init" depends="default.init">
19
      <patternset id="openide/deprecated.files">
20
        <include name="${nb.modules/autoload.dir}/openide-deprecated.jar"/>
21
        <include name="${nb.system.dir}/ModuleAutoDeps/org-openide-deprecated.xml"/>
22
      </patternset>
23
      <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
25
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
26
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
        <pathelement location="${nb_all}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
27
        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
33
        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
28
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
34
        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
29
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
35
        <pathelement location="${nb_all}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
30
        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
36
        <pathelement location="${nb_all}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
31
        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
37
    </path>
32
      </path>
33
    </target>
38
  
34
  
39
    <target name="compile">
35
    <target name="compile" depends="init">
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
36
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath refid="cp"/>
37
            <classpath refid="cp"/>
42
        </javac>
38
        </javac>
43
    </target>
39
    </target>
44
40
45
    <target name="jars" depends="compile">
41
    <target name="jars" depends="compile">
46
        <mkdir dir="netbeans/modules/autoload"/>
42
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
47
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
48
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
        <locjar jarfile="netbeans/modules/autoload/openide-deprecated.jar"
45
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"
50
                manifest="manifest-subst.mf"
46
             manifest="manifest-subst.mf"
51
                basedir="src"
47
             basedir="src"
52
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
48
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
53
	        compress="false">
49
	     compress="false"/>
54
            <locale name="ja"/>
55
        </locjar>
56
    </target>
50
    </target>
57
51
58
    <target name="release">
52
    <target name="release" depends="init">
59
        <copy todir="netbeans" includeEmptyDirs="false">
53
        <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
60
            <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
54
            <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
61
        </copy>
55
        </copy>
62
    </target>
56
    </target>
63
57
64
    <target name="netbeans" depends="jars,release">
58
    <target name="netbeans" depends="jars,release">
65
        <genlist targetname="nbm" outputfiledir="netbeans"/>
59
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-deprecated.jar">
60
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
61
             <patternset refID="openide/deprecated.files"/>
62
          </fileset>
63
        </genlist>
66
    </target>
64
    </target>
67
65
68
    <target name="nbm" depends="netbeans">
66
    <target name="nbm" depends="netbeans">
69
        <makenbm file="openide-deprecated.nbm"
67
        <makenbm file="openide-deprecated.nbm"
70
                 topdir="."
68
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
71
                 module="netbeans/modules/autoload/openide-deprecated.jar"
69
                 module="${nb.modules/autoload.dir}/openide-deprecated.jar"
72
                 homepage="http://openide.${homepage.base}/"
70
                 homepage="http://openide.${homepage.base}/"
73
                 distribution="http://${dist.base}/openide-deprecated.nbm">
71
                 distribution="http://${dist.base}/openide-deprecated.nbm">
74
            <license file="${license.file}"/>
72
            <license file="${license.file}"/>
Lines 76-82 Link Here
76
        </makenbm>
74
        </makenbm>
77
    </target>
75
    </target>
78
    
76
    
79
    <target name="javadoc" description="Build Javadoc.">
77
    <target name="javadoc" depends="init" description="Build Javadoc.">
80
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
78
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
81
            <property name="javadoc.base" location="."/>
79
            <property name="javadoc.base" location="."/>
82
            <property name="javadoc.name" value="DeprecatedAPIs"/>
80
            <property name="javadoc.name" value="DeprecatedAPIs"/>
Lines 87-103 Link Here
87
        </ant>
85
        </ant>
88
    </target>
86
    </target>
89
    
87
    
90
    <target name="clean">
88
    <target name="clean" depends="init">
91
        <delete>
89
        <delete>
92
            <fileset dir="src">
90
            <fileset dir="src">
93
                <include name="**/*.class"/>
91
                <include name="**/*.class"/>
94
            </fileset>
92
            </fileset>
93
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
94
              <patternset refID="openide/deprecated.files"/>
95
            </fileset>
95
        </delete>
96
        </delete>
96
        <delete file="manifest-subst.mf"/>
97
        <delete file="manifest-subst.mf"/>
97
        <delete file="openide-deprecated.nbm"/>
98
        <delete file="openide-deprecated.nbm"/>
98
        <delete dir="netbeans"/>
99
        <delete dir="javadoc"/>
99
        <delete dir="javadoc"/>
100
        <delete dir="Info"/>
101
    </target>
100
    </target>
102
  
101
  
103
</project>
102
</project>
(-)openide/execution/build.xml (-34 / +32 lines)
Lines 13-64 Link Here
13
-->
13
-->
14
14
15
<project name="openide/execution" default="netbeans" basedir=".">
15
<project name="openide/execution" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="openide/execution.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.modules/autoload.dir}/openide-execution.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
32
        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
26
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
33
    </path>
27
      </path>
28
    </target>
34
  
29
  
35
    <target name="compile">
30
    <target name="compile" depends="init">
36
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
31
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
            <classpath refid="cp"/>
32
            <classpath refid="cp"/>
38
        </javac>
33
        </javac>
39
    </target>
34
    </target>
40
35
41
    <target name="jars" depends="compile">
36
    <target name="jars" depends="init,compile">
42
        <mkdir dir="netbeans/modules/autoload"/>
37
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
43
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
38
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
39
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
        <locjar jarfile="netbeans/modules/autoload/openide-execution.jar"
40
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-execution.jar"
46
                manifest="manifest-subst.mf"
41
             manifest="manifest-subst.mf"
47
                basedir="src"
42
             basedir="src"
48
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
43
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
49
	        compress="false">
44
	     compress="false"/>
50
            <locale name="ja"/>
51
        </locjar>
52
    </target>
45
    </target>
53
46
54
    <target name="netbeans" depends="jars" description="Build everything.">
47
    <target name="netbeans" depends="init,jars" description="Build everything.">
55
        <genlist targetname="nbm" outputfiledir="netbeans"/>
48
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-execution.jar">
49
        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
50
          <patternset refID="openide/execution.files"/>
51
        </fileset>
52
      </genlist>
56
    </target>
53
    </target>
57
54
58
    <target name="nbm" depends="netbeans" description="Build NBM.">
55
    <target name="nbm" depends="netbeans" description="Build NBM.">
59
        <makenbm file="openide-execution.nbm"
56
        <makenbm file="openide-execution.nbm"
60
                 topdir="."
57
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
61
                 module="netbeans/modules/autoload/openide-execution.jar"
58
                 module="${nb.modules/autoload.dir}/openide-execution.jar"
62
                 homepage="http://openide.${homepage.base}/"
59
                 homepage="http://openide.${homepage.base}/"
63
                 distribution="http://${dist.base}/openide-execution.nbm">
60
                 distribution="http://${dist.base}/openide-execution.nbm">
64
            <license file="${license.file}"/>
61
            <license file="${license.file}"/>
Lines 66-72 Link Here
66
        </makenbm>
63
        </makenbm>
67
    </target>
64
    </target>
68
  
65
  
69
    <target name="javadoc" description="Build Javadoc.">
66
    <target name="javadoc" depends="init" description="Build Javadoc.">
70
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
67
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
71
            <property name="javadoc.base" location="."/>
68
            <property name="javadoc.base" location="."/>
72
            <property name="javadoc.name" value="ExecutionAPI"/>
69
            <property name="javadoc.name" value="ExecutionAPI"/>
Lines 79-94 Link Here
79
        </ant>
76
        </ant>
80
    </target>
77
    </target>
81
  
78
  
82
    <target name="clean" description="Clean everything.">
79
    <target name="clean" depends="init" description="Clean everything.">
83
        <delete>
80
        <delete>
84
            <fileset dir="src">
81
            <fileset dir="src">
85
                <include name="**/*.class"/>
82
                <include name="**/*.class"/>
86
            </fileset>
83
            </fileset>
84
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
85
                <patternset refID="openide/execution.files"/>
86
            </fileset>
87
        </delete>
87
        </delete>
88
        <delete file="manifest-subst.mf"/>
88
        <delete file="manifest-subst.mf"/>
89
        <delete file="openide-execution.nbm"/>
89
        <delete file="openide-execution.nbm"/>
90
        <delete dir="netbeans"/>
91
        <delete dir="Info"/>
92
        <delete dir="javadoc"/>
90
        <delete dir="javadoc"/>
93
    </target>
91
    </target>
94
  
92
  
(-)openide/explorer/build.xml (-3 / +9 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="openide/explorer" default="netbeans" basedir=".">
15
<project name="openide/explorer" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <target name="boot">
19
    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
20
    <property file="${moduleCluster.file}"/>
21
  </target>
22
16
  <property name="nbroot" location="../.." />
23
  <property name="nbroot" location="../.." />
17
24
18
  <property name="nbm_alias" value="nb_ide"/>
25
  <property name="nbm_alias" value="nb_ide"/>
Lines 31-37 Link Here
31
       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
38
       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
32
  </path>
39
  </path>
33
  
40
  
34
  <target name="compile" >
41
  <target name="compile" depends="init">
35
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
42
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
36
      <property name="localdir" location="src" />
43
      <property name="localdir" location="src" />
37
      <property name="selector" value="openide.explorer" />
44
      <property name="selector" value="openide.explorer" />
Lines 40-50 Link Here
40
  
47
  
41
  <target name="patch" depends="compile" >
48
  <target name="patch" depends="compile" >
42
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
49
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
43
    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
44
    
50
    
45
    <enhanceclass basedir="src" >
51
    <enhanceclass basedir="src" >
46
        <classpath>
52
        <classpath>
47
            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
53
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
48
            <!-- See xtest/instance/build-clover.xml for explanation: -->
54
            <!-- See xtest/instance/build-clover.xml for explanation: -->
49
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
55
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
50
        </classpath>
56
        </classpath>
(-)openide/fs/build.xml (-2 / +9 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="openide/fs" default="netbeans" basedir=".">
15
<project name="openide/fs" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <target name="boot">
19
    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
20
    <property file="${moduleCluster.file}"/>
21
  </target>
22
16
  <property name="nbroot" location="../.." />
23
  <property name="nbroot" location="../.." />
17
24
18
  <property name="nbm_alias" value="nb_ide"/>
25
  <property name="nbm_alias" value="nb_ide"/>
Lines 27-33 Link Here
27
    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
34
    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
28
  </path>
35
  </path>
29
  
36
  
30
  <target name="compile" >
37
  <target name="compile" depends="init">
31
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
38
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32
      <property name="localdir" location="src" />
39
      <property name="localdir" location="src" />
33
      <property name="selector" value="openide.fs" />
40
      <property name="selector" value="openide.fs" />
Lines 40-46 Link Here
40
    
47
    
41
    <enhanceclass basedir="src" >
48
    <enhanceclass basedir="src" >
42
        <classpath>
49
        <classpath>
43
            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
50
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
44
            <!-- See xtest/instance/build-clover.xml for explanation: -->
51
            <!-- See xtest/instance/build-clover.xml for explanation: -->
45
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
52
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
46
        </classpath>
53
        </classpath>
(-)openide/io/build.xml (-29 / +27 lines)
Lines 13-36 Link Here
13
-->
13
-->
14
14
15
<project name="openide/io" default="netbeans" basedir=".">
15
<project name="openide/io" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="openide/io.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.modules/autoload.dir}/openide-io.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
31
    </path>
25
      </path>
26
    </target>
32
  
27
  
33
    <target name="compile">
28
    <target name="compile" depends="init">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
            <classpath refid="cp"/>
30
            <classpath refid="cp"/>
36
        </javac>
31
        </javac>
Lines 40-46 Link Here
40
             classpath="${nb_all}/nbbuild/nbantext.jar"/>
35
             classpath="${nb_all}/nbbuild/nbantext.jar"/>
41
        <enhanceclass basedir="src">
36
        <enhanceclass basedir="src">
42
            <classpath>
37
            <classpath>
43
                <pathelement location="../../core/netbeans/lib/ext/boot.jar"/>
38
                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
44
                <!-- See xtest/instance/build-clover.xml for explanation: -->
39
                <!-- See xtest/instance/build-clover.xml for explanation: -->
45
                <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
40
                <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
46
            </classpath>
41
            </classpath>
Lines 50-76 Link Here
50
        </enhanceclass>
45
        </enhanceclass>
51
    </target>
46
    </target>
52
47
53
    <target name="jars" depends="compile">
48
    <target name="jars" depends="init,compile">
54
        <mkdir dir="netbeans/modules/autoload"/>
49
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
55
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
50
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
56
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
51
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
57
        <locjar jarfile="netbeans/modules/autoload/openide-io.jar"
52
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-io.jar"
58
                manifest="manifest-subst.mf"
53
                manifest="manifest-subst.mf"
59
                basedir="src"
54
                basedir="src"
60
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
55
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
61
	        compress="false">
56
	        compress="false"/>
62
            <locale name="ja"/>
63
        </locjar>
64
    </target>
57
    </target>
65
58
66
    <target name="netbeans" depends="jars">
59
    <target name="netbeans" depends="init,jars">
67
        <genlist targetname="nbm" outputfiledir="netbeans"/>
60
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-io.jar">
61
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
62
             <patternset refID="openide/io.files"/>
63
          </fileset>
64
        </genlist>
68
    </target>
65
    </target>
69
66
70
    <target name="nbm" depends="netbeans">
67
    <target name="nbm" depends="netbeans">
71
        <makenbm file="openide-io.nbm"
68
        <makenbm file="openide-io.nbm"
72
                 topdir="."
69
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
73
                 module="netbeans/modules/autoload/openide-io.jar"
70
                 module="${nb.modules/autoload}/openide-io.jar"
74
                 homepage="http://openide.${homepage.base}/"
71
                 homepage="http://openide.${homepage.base}/"
75
                 distribution="http://${dist.base}/openide-io.nbm">
72
                 distribution="http://${dist.base}/openide-io.nbm">
76
            <license file="${license.file}"/>
73
            <license file="${license.file}"/>
Lines 90-105 Link Here
90
        </ant>
87
        </ant>
91
    </target>
88
    </target>
92
  
89
  
93
    <target name="clean">
90
    <target name="clean" depends="init">
94
        <delete>
91
        <delete>
95
            <fileset dir="src">
92
            <fileset dir="src">
96
                <include name="**/*.class"/>
93
                <include name="**/*.class"/>
97
            </fileset>
94
            </fileset>
95
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
96
              <patternset refID="openide/io.files"/>
97
            </fileset>
98
        </delete>
98
        </delete>
99
        <delete file="manifest-subst.mf"/>
99
        <delete file="manifest-subst.mf"/>
100
        <delete file="openide-io.nbm"/>
100
        <delete file="openide-io.nbm"/>
101
        <delete dir="netbeans"/>
102
        <delete dir="Info"/>
103
        <delete dir="javadoc"/>
101
        <delete dir="javadoc"/>
104
    </target>
102
    </target>
105
  
103
  
(-)openide/loaders/build.xml (-30 / +29 lines)
Lines 13-31 Link Here
13
-->
13
-->
14
14
15
<project name="openide/loaders" default="netbeans" basedir=".">
15
<project name="openide/loaders" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="openide/loaders.files">
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
        <include name="${nb.lib.dir}/openide-loaders.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
      </patternset>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
      <path id="cp">
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/alpha/dev"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
28
    <path id="cp">
29
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="${nb_all}/openide/fs/netbeans/lib/openide-fs.jar"/>
24
        <pathelement location="${nb_all}/openide/fs/netbeans/lib/openide-fs.jar"/>
31
        <pathelement location="${nb_all}/openide/util/netbeans/lib/openide-util.jar"/>
25
        <pathelement location="${nb_all}/openide/util/netbeans/lib/openide-util.jar"/>
Lines 38-54 Link Here
38
        <pathelement location="${nb_all}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
32
        <pathelement location="${nb_all}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
39
        <pathelement location="${nb_all}/openide/modules/netbeans/lib/openide-modules.jar"/>
33
        <pathelement location="${nb_all}/openide/modules/netbeans/lib/openide-modules.jar"/>
40
        <!-- By transitivity from text and explorer; needed for Javadoc, apparently: -->
34
        <!-- By transitivity from text and explorer; needed for Javadoc, apparently: -->
41
        <pathelement location="${nb_all}/openide/options/netbeans/lib/openide-options.jar"/>
35
<!--        <pathelement location="${nb_all}/openide/options/netbeans/lib/openide-options.jar"/>-->
42
    </path>
36
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
43
  
37
      </path>
44
    <target name="compile">
38
    </target>
39
 
40
    <target name="compile" depends="init">
45
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
41
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
46
            <classpath refid="cp"/>
42
            <classpath refid="cp"/>
47
        </javac>
43
        </javac>
48
        <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"/>
49
        <enhanceclass basedir="src">
45
        <enhanceclass basedir="src">
50
            <classpath>
46
            <classpath>
51
                <pathelement location="${nb_all}/core/netbeans/lib/ext/boot.jar"/>
47
                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
52
                <!-- See xtest/instance/build-clover.xml for explanation: -->
48
                <!-- See xtest/instance/build-clover.xml for explanation: -->
53
                <pathelement location="${nb_all}/core/netbeans/lib/ext/clover.jar"/>
49
                <pathelement location="${nb_all}/core/netbeans/lib/ext/clover.jar"/>
54
            </classpath>
50
            </classpath>
Lines 78-104 Link Here
78
        </enhanceclass>
74
        </enhanceclass>
79
    </target>
75
    </target>
80
76
81
    <target name="jars" depends="compile">
77
    <target name="jars" depends="init,compile">
82
        <mkdir dir="netbeans/lib"/>
78
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
83
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
79
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
84
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
80
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
85
        <locjar jarfile="netbeans/lib/openide-loaders.jar"
81
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide-loaders.jar"
86
                manifest="manifest-subst.mf"
82
                manifest="manifest-subst.mf"
87
                basedir="src"
83
                basedir="src"
88
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
84
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
89
	        compress="false">
85
	        compress="false"/>
90
            <locale name="ja"/>
91
        </locjar>
92
    </target>
86
    </target>
93
87
94
    <target name="netbeans" depends="jars" description="Build module.">
88
    <target name="netbeans" depends="jars" description="Build module.">
95
        <genlist targetname="nbm" outputfiledir="netbeans"/>
89
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/openide-loaders.jar">
90
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
91
             <patternset refID="openide/loaders.files"/>
92
          </fileset>
93
        </genlist>
96
    </target>
94
    </target>
97
95
98
    <target name="nbm" depends="netbeans" description="Build NBM.">
96
    <target name="nbm" depends="netbeans" description="Build NBM.">
99
        <makenbm file="openide-loaders.nbm"
97
        <makenbm file="openide-loaders.nbm"
100
                 topdir="."
98
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
101
                 module="netbeans/lib/openide-loaders.jar"
99
                 module="${nb.lib.dir}/openide-loaders.jar"
102
                 homepage="http://openide.${homepage.base}/"
100
                 homepage="http://openide.${homepage.base}/"
103
                 distribution="http://${dist.base}/openide-loaders.nbm">
101
                 distribution="http://${dist.base}/openide-loaders.nbm">
104
            <license file="${license.file}"/>
102
            <license file="${license.file}"/>
Lines 106-112 Link Here
106
        </makenbm>
104
        </makenbm>
107
    </target>
105
    </target>
108
106
109
    <target name="javadoc" description="Build Javadoc.">
107
    <target name="javadoc" depends="init" description="Build Javadoc.">
110
        <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
108
        <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
111
            <property name="javadoc.base" location="."/>
109
            <property name="javadoc.base" location="."/>
112
            <property name="javadoc.name" value="LoadersAPI"/>
110
            <property name="javadoc.name" value="LoadersAPI"/>
Lines 120-135 Link Here
120
        </ant>
118
        </ant>
121
    </target>
119
    </target>
122
  
120
  
123
    <target name="clean" description="Clean build products.">
121
    <target name="clean" depends="init" description="Clean build products.">
124
        <delete>
122
        <delete>
125
            <fileset dir="src">
123
            <fileset dir="src">
126
                <include name="**/*.class"/>
124
                <include name="**/*.class"/>
127
            </fileset>
125
            </fileset>
126
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
127
              <patternset refID="openide/loaders.files"/>
128
            </fileset>
128
        </delete>
129
        </delete>
129
        <delete file="manifest-subst.mf"/>
130
        <delete file="manifest-subst.mf"/>
130
        <delete file="openide-loaders.nbm"/>
131
        <delete file="openide-loaders.nbm"/>
131
        <delete dir="netbeans"/>
132
        <delete dir="Info"/>
133
        <delete dir="javadoc"/>
132
        <delete dir="javadoc"/>
134
    </target>
133
    </target>
135
    
134
    
(-)openide/nodes/build.xml (-3 / +9 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="openide/nodes" default="netbeans" basedir=".">
15
<project name="openide/nodes" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <target name="boot">
19
    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
20
    <property file="${moduleCluster.file}"/>
21
  </target>
22
16
  <property name="nbroot" location="../.." />
23
  <property name="nbroot" location="../.." />
17
24
18
  <property name="nbm_alias" value="nb_ide"/>
25
  <property name="nbm_alias" value="nb_ide"/>
Lines 29-35 Link Here
29
    <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
36
    <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
30
  </path>
37
  </path>
31
  
38
  
32
  <target name="compile" >
39
  <target name="compile" depends="init">
33
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
40
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
34
      <property name="localdir" location="src" />
41
      <property name="localdir" location="src" />
35
      <property name="selector" value="openide.nodes" />
42
      <property name="selector" value="openide.nodes" />
Lines 38-48 Link Here
38
45
39
  <target name="patch" depends="compile" >
46
  <target name="patch" depends="compile" >
40
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
47
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
41
    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
42
    
48
    
43
    <enhanceclass basedir="src" >
49
    <enhanceclass basedir="src" >
44
        <classpath>
50
        <classpath>
45
            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
51
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
46
            <!-- See xtest/instance/build-clover.xml for explanation: -->
52
            <!-- See xtest/instance/build-clover.xml for explanation: -->
47
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
53
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
48
        </classpath>
54
        </classpath>
(-)openide/test/build.xml (-99 / +30 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="openide tests" basedir="." default="all">
15
<project name="openide tests" basedir="." default="all">
16
    <import file="../../nbbuild/default-properties.xml"/>
16
17
17
    <!-- Ant property. Value 'ignore' means that system classpath is ignored
18
    <!-- Ant property. Value 'ignore' means that system classpath is ignored
18
         and only classpath specified in build file is used. -->
19
         and only classpath specified in build file is used. -->
Lines 220-249 Link Here
220
    <!-- ========================= -->
221
    <!-- ========================= -->
221
    
222
    
222
    <target name="prepare-compile-classpath"
223
    <target name="prepare-compile-classpath"
223
         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
224
         depends="srccompile-classpath,idecompile-classpath"/>
224
    
225
    
225
    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
226
        <echo message="Using jars classpath for compilation."/>
227
    	<!-- this classpath will be used for compiling tests against jars -->
228
	<path id="compiletest.classpath">        
229
	    <!-- If you need e.g. openide.jar, write this:
230
	           <pathelement location="../netbeans/lib/openide.jar"/>
231
 	      -->
232
                <pathelement location="../openide-13javac-workaround.jar"/>
233
                <pathelement location="../netbeans/lib/openide.jar"/>
234
                <!-- XXX -->
235
                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/>
236
                <pathelement location="../compiler/netbeans/modules/autoload/openide-compiler.jar"/>
237
                <pathelement location="../execution/netbeans/modules/autoload/openide-execution.jar"/>
238
                <pathelement location="../io/netbeans/modules/autoload/openide-io.jar"/>
239
240
                <fileset dir="../../core/netbeans/lib">
241
            		<include name="core.jar"/>
242
            		<include name="ext/*.jar"/>
243
                </fileset>             
244
	</path>
245
    </target>
246
        
247
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
226
    <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
248
        <echo message="Using srcs classpath for compilation."/>
227
        <echo message="Using srcs classpath for compilation."/>
249
    	<!-- this classpath will be used for compiling tests against sources -->
228
    	<!-- this classpath will be used for compiling tests against sources -->
Lines 273-283 Link Here
273
                <pathelement location="../execution/src/"/>
252
                <pathelement location="../execution/src/"/>
274
                <pathelement location="../io/src/"/>
253
                <pathelement location="../io/src/"/>
275
                <pathelement location="../windows/src/"/>
254
                <pathelement location="../windows/src/"/>
276
                
255
                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
277
                <pathelement location="../../core/src/"/>
256
                <pathelement location="../../core/src/"/>
278
                <fileset dir="../../core/netbeans/lib">
279
            		<include name="ext/*.jar"/>
280
                </fileset>             
281
	</path>
257
	</path>
282
    </target>
258
    </target>
283
    
259
    
Lines 290-309 Link Here
290
	         If you need e.g. your tested module, write this:
266
	         If you need e.g. your tested module, write this:
291
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
267
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
292
 	      -->
268
 	      -->
293
             <fileset dir="${netbeans.home}/lib">
269
	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
294
            		<include name="core.jar"/>
270
             <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
295
                        <include name="openide.jar"/>
271
             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
296
            		<include name="ext/*.jar"/>
297
             </fileset>             
298
             <!-- XXX -->
272
             <!-- XXX -->
299
             <fileset dir="${netbeans.home}/lib">
273
             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
300
                    <include name="openide-loaders.jar" />
274
             <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
301
             </fileset>
275
             <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
302
             <fileset dir="${netbeans.home}/modules/autoload">
276
             <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
303
                     <include name="openide-*.jar"/>
277
             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
304
                     <include name="core-*.jar"/>
305
             </fileset>
306
             
307
   	</path>
278
   	</path>
308
    </target>
279
    </target>
309
    
280
    
Lines 312-350 Link Here
312
    <!-- ================================== -->
283
    <!-- ================================== -->
313
    
284
    
314
    <target name="prepare-codetest-classpath" 
285
    <target name="prepare-codetest-classpath" 
315
            depends="jartest-classpath,srctest-classpath,idetest-classpath"/>
286
            depends="srctest-classpath,idetest-classpath"/>
316
    
287
       
317
    <target name="jartest-classpath" depends="which-classpath" if="jarcode.classpath">
318
        <echo message="Using jars classpath."/>
319
        <!-- this classpath will be used for executing tests against jars -->
320
	<path id="codetest.classpath">
321
       	    <!-- If you need e.g. openide.jar, write this:
322
	           <pathelement location="../netbeans/lib/openide.jar"/>
323
 	      -->
324
                <pathelement location="../openide-13javac-workaround.jar"/>
325
                <pathelement location="../netbeans/lib/openide.jar"/>
326
                <!-- XXX -->
327
                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/>
328
                <pathelement location="../compiler/netbeans/modules/autoload/openide-compiler.jar"/>
329
                <pathelement location="../execution/netbeans/modules/autoload/openide-execution.jar"/>
330
                <pathelement location="../io/netbeans/modules/autoload/openide-io.jar"/>
331
                
332
                <fileset dir="../../core/netbeans/lib">
333
            		<include name="core.jar"/>
334
            		<include name="ext/*.jar"/>
335
                </fileset>             
336
                <fileset dir="../../core/windows/netbeans/modules">
337
            		<include name="core-windows.jar"/>
338
                </fileset>             
339
                
340
                <!-- Cf. #36294: XMLUtilTest.testNamespaces requires Xerces to pass -->
341
                <fileset dir="../../libs/external">
342
                    <include name="xerces-*.jar"/>
343
                    <include name="xml-commons-dom-ranges-*.jar"/>
344
                </fileset>
345
    	</path>
346
    </target>
347
        
348
    <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
288
    <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
349
        <echo message="Using srcs classpath."/>
289
        <echo message="Using srcs classpath."/>
350
        <!-- this classpath will be used for executing tests against sources -->
290
        <!-- this classpath will be used for executing tests against sources -->
Lines 354-360 Link Here
354
	         If you need e.g. sources of your tested module, write this:
294
	         If you need e.g. sources of your tested module, write this:
355
	           <pathelement location="../src"/>
295
	           <pathelement location="../src"/>
356
 	      -->
296
 	      -->
357
                <pathelement location="../openide-13javac-workaround.jar"/>
297
                <pathelement location="${nb_all}/openide-13javac-workaround.jar"/>
358
                <pathelement location="../src/"/>
298
                <pathelement location="../src/"/>
359
                <pathelement location="../../core/src/"/>
299
                <pathelement location="../../core/src/"/>
360
                <!-- XXX -->
300
                <!-- XXX -->
Lines 363-377 Link Here
363
                <pathelement location="../execution/src/"/>
303
                <pathelement location="../execution/src/"/>
364
                <pathelement location="../io/src/"/>
304
                <pathelement location="../io/src/"/>
365
                
305
                
366
                <fileset dir="../../core/netbeans/lib">
306
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/> <!-- for the manifest -->
367
            		<include name="core.jar"/> <!-- for the manifest -->
307
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- for the manifest -->
368
            		<include name="ext/*.jar"/>
308
                <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- for the manifest -->
369
                </fileset>             
309
                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
370
                <fileset dir="../../core/windows/netbeans/modules">
310
                <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
371
            		<include name="core-windows.jar"/>
372
                </fileset>             
373
                <pathelement location="../netbeans/lib/openide.jar"/> <!-- for the manifest -->
374
                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/> <!-- for the manifest -->
375
311
376
                <fileset dir="../../libs/external">
312
                <fileset dir="../../libs/external">
377
                    <include name="xerces-*.jar"/>
313
                    <include name="xerces-*.jar"/>
Lines 390-412 Link Here
390
	         If you need e.g. your tested module, write this:
326
	         If you need e.g. your tested module, write this:
391
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
327
	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
392
 	      --> 
328
 	      --> 
393
             <fileset dir="${netbeans.home}/lib">
329
	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
394
            		<include name="core.jar"/>
330
             <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
395
                        <include name="openide.jar"/>
331
             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
396
                        <include name="openide-loaders.jar"/>
332
             <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
397
            		<include name="ext/*.jar"/>
333
             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
398
             </fileset>             
334
             <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
399
             <fileset dir="${netbeans.home}/modules">
335
             <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
400
            		<include name="core-windows.jar"/>
336
             <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
401
             </fileset>
337
             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
402
             <!-- XXX -->
338
             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
403
             <fileset dir="${netbeans.home}/modules/autoload">
404
                     <include name="openide-*.jar"/>
405
                     <include name="core-*.jar"/>
406
             </fileset>
407
408
                
339
                
409
             <fileset dir="${netbeans.home}/modules/autoload/ext">
340
             <fileset dir="${libs/xerces.dir}/${nb.modules/autoload.dir}/ext">
410
                  <include name="xerces-*.jar"/>
341
                  <include name="xerces-*.jar"/>
411
                  <include name="xml-commons-dom-ranges-*.jar"/>
342
                  <include name="xml-commons-dom-ranges-*.jar"/>
412
            </fileset>
343
            </fileset>
(-)openide/text/build.xml (-3 / +6 lines)
Lines 13-19 Link Here
13
-->
13
-->
14
14
15
<project name="openide/text" default="netbeans" basedir=".">
15
<project name="openide/text" default="netbeans" basedir=".">
16
  <property name="nbroot" location="../.." />
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <property name="nbroot" location="${nb_all}" />
17
19
18
  <property name="nbm_alias" value="nb_ide"/>
20
  <property name="nbm_alias" value="nb_ide"/>
19
  <property name="homepage.base" value="netbeans.org"/>
21
  <property name="homepage.base" value="netbeans.org"/>
Lines 30-38 Link Here
30
       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
32
       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
31
       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
33
       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
32
       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
34
       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
35
       <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
  </path>
36
  </path>
34
  
37
  
35
  <target name="compile" >
38
  <target name="compile" depends="init">
36
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
39
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
37
      <property name="localdir" location="src" />
40
      <property name="localdir" location="src" />
38
      <property name="selector" value="openide.text" />
41
      <property name="selector" value="openide.text" />
Lines 64-70 Link Here
64
            <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
67
            <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
65
            <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
68
            <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
66
            <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
69
            <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
67
            <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
70
            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
68
          </classpath>  
71
          </classpath>  
69
        </javac>
72
        </javac>
70
73
(-)openide/util/build.xml (-5 / +11 lines)
Lines 13-19 Link Here
13
-->
13
-->
14
14
15
<project name="openide/util" default="netbeans" basedir=".">
15
<project name="openide/util" default="netbeans" basedir=".">
16
  <property name="nbroot" location="../.." />
16
  <import file="../../nbbuild/default.xml"/>
17
18
  <target name="boot">
19
    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
20
    <property file="${moduleCluster.file}"/>
21
  </target>
22
23
  <property name="nbroot" location="${nb_all}" />
17
24
18
  <property name="nbm_alias" value="nb_ide"/>
25
  <property name="nbm_alias" value="nb_ide"/>
19
  <property name="homepage.base" value="netbeans.org"/>
26
  <property name="homepage.base" value="netbeans.org"/>
Lines 27-46 Link Here
27
      <pathelement location="src" />
34
      <pathelement location="src" />
28
  </path>
35
  </path>
29
  
36
  
30
  <target name="compile" >
37
  <target name="compile" depends="init">
31
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
38
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32
      <property name="localdir" location="src" />
39
      <property name="localdir" location="src" />
33
      <property name="selector" value="openide.util" />
40
      <property name="selector" value="openide.util" />
34
    </ant>
41
    </ant>
35
  </target>
42
  </target>
36
  
43
  
37
  <target name="patch" depends="compile" >
44
  <target name="patch" depends="compile,boot" >
38
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
45
    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
39
    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
40
    
46
    
41
    <enhanceclass basedir="src" >
47
    <enhanceclass basedir="src" >
42
        <classpath>
48
        <classpath>
43
            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
49
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
44
            <!-- See xtest/instance/build-clover.xml for explanation: -->
50
            <!-- See xtest/instance/build-clover.xml for explanation: -->
45
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
51
            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
46
        </classpath>
52
        </classpath>
(-)openide/windows/build.xml (-2 / +4 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="openide/windows" default="netbeans" basedir=".">
15
<project name="openide/windows" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/>
17
16
  <property name="nbroot" location="../.." />
18
  <property name="nbroot" location="../.." />
17
19
18
  <property name="nbm_alias" value="nb_ide"/>
20
  <property name="nbm_alias" value="nb_ide"/>
Lines 30-36 Link Here
30
       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
32
       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
31
  </path>
33
  </path>
32
  
34
  
33
  <target name="compile" >
35
  <target name="compile" depends="init">
34
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
36
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
35
      <property name="localdir" location="src" />
37
      <property name="localdir" location="src" />
36
      <property name="selector" value="openide.windows" />
38
      <property name="selector" value="openide.windows" />
Lines 60-66 Link Here
60
             <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
62
             <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
61
             <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
63
             <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
62
             <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
64
             <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
63
             <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
65
             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
64
           </classpath>
66
           </classpath>
65
        </javac>
67
        </javac>
66
68
(-)openidex/build.xml (-35 / +33 lines)
Lines 15-61 Link Here
15
<!-- ToDo: may need to ensure that SearchTask.java is compiled before Utilities2.java -->
15
<!-- ToDo: may need to ensure that SearchTask.java is compiled before Utilities2.java -->
16
<!--       due to an obscure 1.3 compiler bug                                         -->
16
<!--       due to an obscure 1.3 compiler bug                                         -->
17
<project name="openidex" default="netbeans" basedir=".">
17
<project name="openidex" default="netbeans" basedir=".">
18
  <import file="../nbbuild/default.xml"/>
19
  
20
  <target name="init" depends="default.init">
21
    <patternset id="openidex.files">
22
      <include name="${nb.modules/autoload.dir}/openidex.jar"/>
23
    </patternset>
24
    <path id="cp">
25
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
26
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
    </path>
29
  </target>
18
30
19
  <property name="nbm_alias" value="nb_ide"/>
20
  <property name="homepage.base" value="netbeans.org"/>
21
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
23
24
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
25
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
26
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
27
31
28
  <target name="compile">
32
  <target name="compile" depends="init">
29
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
33
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
      <classpath>
34
      <classpath refID="cp"/>
31
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
32
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
33
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
34
      </classpath>
35
    </javac>
35
    </javac>
36
  </target>
36
  </target>
37
37
38
  <target name="jars" depends="compile">
38
  <target name="jars" depends="compile">
39
    <mkdir dir="netbeans/modules/autoload"/>
39
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
40
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
40
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
41
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
42
    <locjar jarfile="netbeans/modules/autoload/openidex.jar"
42
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openidex.jar"
43
            manifest="manifest-subst.mf"
43
         manifest="manifest-subst.mf"
44
            basedir="src"
44
         basedir="src"
45
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
45
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
46
	    compress="false">
46
         compress="false"/>
47
      <locale name="ja"/>
48
    </locjar>
49
  </target>
47
  </target>
50
48
51
  <target name="netbeans" depends="jars" description="Build everything.">
49
  <target name="netbeans" depends="jars" description="Build everything.">
52
    <genlist targetname="nbm" outputfiledir="netbeans"/>
50
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openidex.jar">
51
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
52
        <patternset refID="openidex.files"/>
53
      </fileset>
54
    </genlist>
53
  </target>
55
  </target>
54
56
55
  <target name="nbm" depends="netbeans" description="Build NBM.">
57
  <target name="nbm" depends="netbeans" description="Build NBM.">
56
    <makenbm file="openidex.nbm"
58
    <makenbm file="openidex.nbm"
57
             topdir="."
59
             productdir="${netbeans.dest.dir}/${cluster.dir}"
58
             module="netbeans/modules/autoload/openidex.jar"
60
             module="${nb.modules/autoload.dir}/openidex.jar"
59
	     homepage="http://openidex.${homepage.base}/"
61
	     homepage="http://openidex.${homepage.base}/"
60
	     distribution="http://${dist.base}/openidex.nbm">
62
	     distribution="http://${dist.base}/openidex.nbm">
61
      <license file="${license.file}"/>
63
      <license file="${license.file}"/>
Lines 63-82 Link Here
63
    </makenbm>
65
    </makenbm>
64
  </target>
66
  </target>
65
67
66
  <target name="clean" description="Clean everything.">
68
  <target name="clean" depends="init" description="Clean everything.">
67
    <delete>
69
    <delete>
68
      <fileset dir="src">
70
      <fileset dir="src">
69
        <include name="**/*.class"/>
71
        <include name="**/*.class"/>
70
      </fileset>
72
      </fileset>
73
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
74
        <patternset refID="openidex.files"/>
75
      </fileset>
71
    </delete>
76
    </delete>
72
    <delete file="manifest-subst.mf"/>
77
    <delete file="manifest-subst.mf"/>
73
    <delete file="openidex.nbm"/>
78
    <delete file="openidex.nbm"/>
74
    <delete dir="netbeans"/>
75
    <delete dir="javadoc"/>
79
    <delete dir="javadoc"/>
76
    <delete dir="Info"/>
77
  </target>
80
  </target>
78
81
79
  <target name="javadoc" description="Build openidex module API documentation.">
82
  <target name="javadoc" depends="init" description="Build openidex module API documentation.">
80
    <tstamp/>
83
    <tstamp/>
81
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
84
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
82
    <echo message="Build openidex module API documentation..."/>
85
    <echo message="Build openidex module API documentation..."/>
Lines 96-107 Link Here
96
        <pathelement location="src"/>
99
        <pathelement location="src"/>
97
        <pathelement location="looks/src"/>
100
        <pathelement location="looks/src"/>
98
      </sourcepath>
101
      </sourcepath>
99
      <classpath>
102
      <classpath refID="cp"/>
100
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
101
        <fileset dir="../openide/netbeans/lib">
102
          <include name="openide*.jar" />
103
        </fileset>
104
      </classpath>
105
    </javadoc>    
103
    </javadoc>    
106
  </target>
104
  </target>
107
105
(-)projects/build.xml (-36 / +36 lines)
Lines 13-67 Link Here
13
-->
13
-->
14
14
15
<project name="projects" default="netbeans" basedir=".">
15
<project name="projects" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="projects.files">
20
      <include name="${nb.modules.dir}/projects.jar"/>
21
    </patternset>
22
23
    <path id="cp">
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
      <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/>
28
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
29
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
30
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
31
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
32
    </path>
33
  </target>
16
34
17
  <property name="nbm_alias" value="nb_ide"/>
35
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
  <property name="build.sysclasspath" value="ignore"/>
22
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
25
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
26
27
  <path id="cp">
28
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
29
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
30
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
31
    <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/>
32
    <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
33
    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
34
    <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
35
    <pathelement location="../core/netbeans/lib/core.jar"/>
36
  </path>
37
38
  <target name="compile">
39
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
36
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
40
      <classpath refid="cp"/>
37
      <classpath refid="cp"/>
41
    </javac>
38
    </javac>
42
  </target>
39
  </target>
43
40
44
  <target name="jars" depends="compile">
41
  <target name="jars" depends="compile">
45
    <mkdir dir="netbeans/modules"/>
42
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
46
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
47
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
48
    <locjar jarfile="netbeans/modules/projects.jar"
45
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/projects.jar"
49
            manifest="manifest-subst.mf"
46
         manifest="manifest-subst.mf"
50
            basedir="src"
47
         basedir="src"
51
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
48
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
52
	    compress="false">
49
	 compress="false"/>
53
      <locale name="ja"/>
54
    </locjar>
55
  </target>
50
  </target>
56
51
57
  <target name="netbeans" depends="jars">
52
  <target name="netbeans" depends="jars">
58
    <genlist targetname="nbm" outputfiledir="netbeans"/>
53
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/projects.jar">
54
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
55
        <patternset refID="projects.files"/>
56
      </fileset>
57
    </genlist>
59
  </target>
58
  </target>
60
59
61
  <target name="nbm" depends="netbeans">
60
  <target name="nbm" depends="netbeans">
62
    <makenbm file="projects.nbm"
61
    <makenbm file="projects.nbm"
63
             topdir="."
62
             productdir="${netbeans.dest.dir}/${cluster.dir}"
64
             module="netbeans/modules/projects.jar"
63
             module="${nb.modules.dir}/projects.jar"
65
	     homepage="http://projects.${homepage.base}/"
64
	     homepage="http://projects.${homepage.base}/"
66
	     distribution="http://${dist.base}/projects.nbm">
65
	     distribution="http://${dist.base}/projects.nbm">
67
      <license file="${license.file}"/>
66
      <license file="${license.file}"/>
Lines 69-85 Link Here
69
    </makenbm>
68
    </makenbm>
70
  </target>
69
  </target>
71
70
72
  <target name="clean">
71
  <target name="clean" depends="init">
73
    <delete>
72
    <delete>
74
      <fileset dir="src">
73
      <fileset dir="src">
75
        <include name="**/*.class"/>
74
        <include name="**/*.class"/>
76
      </fileset>
75
      </fileset>
76
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
77
        <patternset refID="projects.files"/>
78
      </fileset>
77
    </delete>
79
    </delete>
78
    <delete file="manifest-subst.mf"/>
80
    <delete file="manifest-subst.mf"/>
79
    <delete file="projects.nbm"/>
81
    <delete file="projects.nbm"/>
80
    <delete dir="netbeans"/>
81
    <delete dir="javadoc"/>
82
    <delete dir="javadoc"/>
82
    <delete dir="Info"/>
83
  </target>
83
  </target>
84
84
85
</project>
85
</project>
(-)properties/build.xml (-35 / +52 lines)
Lines 13-23 Link Here
13
-->
13
-->
14
14
15
<project name="properties" default="netbeans" basedir=".">
15
<project name="properties" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
  <property name="javadoc.private" value="false"/>
18
  <property name="javadoc.private" value="false"/>
22
  <property name="docs.location.jdk"
19
  <property name="docs.location.jdk"
23
            value="http://java.sun.com/j2se/1.4.2/docs/api"/>
20
            value="http://java.sun.com/j2se/1.4.2/docs/api"/>
Lines 26-46 Link Here
26
  <property name="docs.location.openide-deprecated"
23
  <property name="docs.location.openide-deprecated"
27
            value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
24
            value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
28
25
29
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
26
  <target name="init" depends="default.init">
30
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
27
    <patternset id="properties.files">
31
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
28
      <include name="${nb.modules.dir}/properties.jar"/>
32
29
    </patternset>
33
  <target name="init">
30
    <patternset id="properties-syntax.files">
31
      <include name="${nb.modules/eager.dir}/properties-syntax.jar"/>
32
    </patternset>
34
    <path id="properties-nosyntax-cp">
33
    <path id="properties-nosyntax-cp">
35
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
34
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
36
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
35
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
37
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
36
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
38
    </path>
37
    </path>
39
    <path id="properties-syntax-cp">
38
    <path id="properties-syntax-cp">
40
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
39
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
41
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
40
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
42
      <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
41
      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
43
      <pathelement location="../editor/netbeans/modules/editor.jar"/>
42
      <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
44
      <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
43
      <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
45
      <pathelement location="src" />
44
      <pathelement location="src" />
46
    </path>
45
    </path>
Lines 62-99 Link Here
62
  </target>
61
  </target>
63
62
64
  <target name="jars" depends="compile">
63
  <target name="jars" depends="compile">
65
    <mkdir dir="netbeans/modules/eager"/>
64
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
66
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
65
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
67
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
66
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
68
    <locjar jarfile="netbeans/modules/properties.jar"
67
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/properties.jar"
69
            manifest="manifest-subst.mf"
68
         manifest="manifest-subst.mf"
70
            basedir="src"
69
         basedir="src"
71
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
70
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
72
	    compress="false">
71
	 compress="false">
73
      <exclude name="org/netbeans/modules/properties/syntax/"/>
72
      <exclude name="org/netbeans/modules/properties/syntax/"/>
74
      <locale name="ja"/>
73
    </jar>
75
    </locjar>
76
    <copy file="manifest-syntax.mf" tofile="manifest-syntax-subst.mf" filtering="on"/>
74
    <copy file="manifest-syntax.mf" tofile="manifest-syntax-subst.mf" filtering="on"/>
77
    <locjar jarfile="netbeans/modules/eager/properties-syntax.jar"
75
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/properties-syntax.jar"
78
            manifest="manifest-syntax-subst.mf"
76
            manifest="manifest-syntax-subst.mf"
79
            basedir="src"
77
            basedir="src"
80
            excludesfile="../nbbuild/standard-jar-excludes.txt"
78
            excludesfile="../nbbuild/standard-jar-excludes.txt"
81
            compress="false">
79
            compress="false">
82
      <include name="org/netbeans/modules/properties/syntax/"/>
80
      <include name="org/netbeans/modules/properties/syntax/"/>
83
      <locale name="ja"/>
81
    </jar>
84
    </locjar>
85
  </target>
82
  </target>
86
83
87
  <target name="netbeans" depends="jars">
84
  <target name="netbeans" depends="jars">
88
    <genlist targetname="nbm" outputfiledir="netbeans"/>
85
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/properties.jar">
86
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
87
        <patternset refID="properties.files"/>
88
      </fileset>
89
    </genlist>
90
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/properties-syntax.jar">
91
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
92
        <patternset refID="properties-syntax.files"/>
93
      </fileset>
94
    </genlist>
89
  </target>
95
  </target>
90
96
91
  <target name="nbm" depends="netbeans">
97
  <target name="nbm" depends="netbeans">
92
    <!-- Make one NBM with both module JARs. -->
93
    <!-- XXX now preferred to make separate NBMs. -->
94
    <makenbm file="properties.nbm"
98
    <makenbm file="properties.nbm"
95
             topdir="."
99
             productdir="${netbeans.dest.dir}/${cluster.dir}"
96
             module="netbeans/modules/properties.jar"
100
             module="${nb.modules.dir}/properties.jar"
101
	     homepage="http://properties.${homepage.base}/"
102
	     distribution="http://${dist.base}/properties.nbm">
103
      <license file="${license.file}"/>
104
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
105
    </makenbm>
106
    <makenbm file="properties-syntax.nbm"
107
             productdir="${netbeans.dest.dir}/${cluster.dir}"
108
             module="${nb.modules/eager.dir}/properties-syntax.jar"
97
	     homepage="http://properties.${homepage.base}/"
109
	     homepage="http://properties.${homepage.base}/"
98
	     distribution="http://${dist.base}/properties.nbm">
110
	     distribution="http://${dist.base}/properties.nbm">
99
      <license file="${license.file}"/>
111
      <license file="${license.file}"/>
Lines 101-118 Link Here
101
    </makenbm>
113
    </makenbm>
102
  </target>
114
  </target>
103
115
104
  <target name="clean">
116
  <target name="clean" depends="init">
105
    <delete>
117
    <delete>
106
      <fileset dir="src">
118
      <fileset dir="src">
107
        <include name="**/*.class"/>
119
        <include name="**/*.class"/>
108
      </fileset>
120
      </fileset>
121
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
122
        <patternset refID="properties.files"/>
123
      </fileset>
124
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
125
        <patternset refID="properties-syntax.files"/>
126
      </fileset>
109
    </delete>
127
    </delete>
110
    <delete file="manifest-subst.mf"/>
128
    <delete file="manifest-subst.mf"/>
111
    <delete file="manifest-syntax-subst.mf"/>
129
    <delete file="manifest-syntax-subst.mf"/>
112
    <delete file="properties.nbm"/>
130
    <delete file="properties.nbm"/>
113
    <delete dir="netbeans"/>
131
    <delete file="properties-syntax.nbm"/>
114
    <delete dir="javadoc"/>
132
    <delete dir="javadoc"/>
115
    <delete dir="Info"/>
116
  </target>
133
  </target>
117
134
118
  <target name="javadoc" depends="init" description="Build properties module API documentation.">
135
  <target name="javadoc" depends="init" description="Build properties module API documentation.">
(-)schema2beans/anttask/build.xml (-4 / +4 lines)
Lines 13-24 Link Here
13
-->
13
-->
14
14
15
<project name="schema2beans_anttask" default="jars" basedir=".">
15
<project name="schema2beans_anttask" default="jars" basedir=".">
16
  <property name="nb_root" location="../.."/>
16
  <import file="../../nbbuild/default-properties.xml"/> 
17
17
18
  <target name="jars" depends="compile">
18
  <target name="jars" depends="compile">
19
	<jar jarfile="s2banttask.jar"
19
	<jar jarfile="s2banttask.jar"
20
	  basedir="src"
20
	  basedir="src"
21
	  excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
21
	  excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
22
	  compress="false">
22
	  compress="false">
23
	</jar>
23
	</jar>
24
  </target>
24
  </target>
Lines 32-39 Link Here
32
                <!-- Ant in NB -->
32
                <!-- Ant in NB -->
33
                <!-- Note: in NB 4.0, ${ant.home}/lib/ant.jar will work as is -->
33
                <!-- Note: in NB 4.0, ${ant.home}/lib/ant.jar will work as is -->
34
                <pathelement path="${netbeans.library.path}"/>
34
                <pathelement path="${netbeans.library.path}"/>
35
		<pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
35
		<pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
36
		<pathelement location="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
36
		<pathelement location="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
37
	  </classpath>
37
	  </classpath>
38
	</javac>
38
	</javac>
39
  </target>
39
  </target>
(-)schema2beans/dev/build.xml (-27 / +28 lines)
Lines 13-85 Link Here
13
-->
13
-->
14
14
15
<project name="schema2beansdev" default="netbeans" basedir=".">
15
<project name="schema2beansdev" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <property name="nbroot" location="../.."/>
18
  <target name="init" depends="default.init">
18
  <property name="nbext" location="${nbroot}/nbbuild"/>
19
    <patternset id="schema2beans/dev.files">
19
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
20
      <include name="${nb.modules/autoload.dir}/schema2beansdev.jar"/>
20
  <property name="homepage.base" value="netbeans.org"/>
21
    </patternset>
21
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
    <path id="cp">
22
23
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
24
    </path>
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
25
  </target>
25
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
26
26
27
  <!-- Primary targets. -->
27
  <!-- Primary targets. -->
28
28
29
  <target name="netbeans" depends="jars">
29
  <target name="netbeans" depends="jars">
30
    <genlist targetname="nbm" outputfiledir="netbeans"/>
30
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/schema2beansdev.jar">
31
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
32
         <patternset refID="schema2beans/dev.files"/>
33
       </fileset>
34
    </genlist>
31
  </target>
35
  </target>
32
36
33
  <target name="nbm" depends="netbeans">
37
  <target name="nbm" depends="netbeans">
34
	<delete file="Info/info.xml"/>
35
    <makenbm file="schema2beansdev.nbm"
38
    <makenbm file="schema2beansdev.nbm"
36
             topdir="."
39
             productdir="${netbeans.dest.dir}/${cluster.dir}"
37
             module="netbeans/modules/autoload/schema2beansdev.jar"
40
             module="${nb.modules/autoload.dir}/schema2beansdev.jar"
38
	     homepage="http://${homepage.base}/schema2beans.html"
41
	     homepage="http://${homepage.base}/schema2beans.html"
39
	     distribution="http://${dist.base}/schema2beansdev.nbm">
42
	     distribution="http://${dist.base}/schema2beansdev.nbm">
40
      <license file="${license.file}" />
43
      <license file="${license.file}" />
41
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
44
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
42
      <exclude name="**/nondist/**" />
43
    </makenbm>
45
    </makenbm>
44
  </target>
46
  </target>
45
47
46
  <target name="clean">
48
  <target name="clean" depends="init">
47
    <delete>
49
    <delete>
48
      <fileset dir="src">
50
      <fileset dir="src">
49
        <include name="**/*.class"/>
51
        <include name="**/*.class"/>
50
      </fileset>
52
      </fileset>
53
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
        <patternset refID="schema2beans/dev.files"/>
55
      </fileset>
51
    </delete>
56
    </delete>
52
    <delete dir="netbeans"/>
53
    <delete dir="javadoc"/>
57
    <delete dir="javadoc"/>
54
    <delete file="manifest-subst.mf"/>
58
    <delete file="manifest-subst.mf"/>
55
    <delete file="schema2beansdev.nbm"/>
59
    <delete file="schema2beansdev.nbm"/>
56
    <delete dir="Info"/>
57
  </target>
60
  </target>
58
61
59
62
60
  <!-- Secondary targets. -->
63
  <!-- Secondary targets. -->
61
64
62
  <target name="jars" depends="compile">
65
  <target name="jars" depends="compile">
63
    <mkdir dir="netbeans/modules/autoload"/>
66
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
64
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
67
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
65
    <copy file="manifest.mf" tofile="manifest-subst.mf"
68
    <copy file="manifest.mf" tofile="manifest-subst.mf"
66
	  filtering="on"/>
69
	  filtering="on"/>
67
    <locjar jarfile="netbeans/modules/autoload/schema2beansdev.jar" manifest="manifest-subst.mf"
70
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" 
68
      compress="false">
71
         manifest="manifest-subst.mf"
69
      <locale name="ja"/>
72
         compress="false">
70
      <fileset dir="src">
73
      <fileset dir="src">
71
        <patternset excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
74
        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
72
          <include name="org/netbeans/modules/schema2beansdev/"/>
75
          <include name="org/netbeans/modules/schema2beansdev/"/>
73
        </patternset>
76
        </patternset>
74
      </fileset>
77
      </fileset>
75
    </locjar>
78
    </jar>
76
  </target>
79
  </target>
77
80
78
  <target name="compile">
81
  <target name="compile" depends="init">
79
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
82
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
80
	  <classpath>
83
	  <classpath refID="cp"/>
81
		<pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
82
	  </classpath>      
83
	  <patternset>
84
	  <patternset>
84
        <include name="org/netbeans/modules/schema2beansdev/"/>
85
        <include name="org/netbeans/modules/schema2beansdev/"/>
85
      </patternset>
86
      </patternset>
(-)schema2beans/rt/build.xml (-28 / +26 lines)
Lines 13-59 Link Here
13
-->
13
-->
14
14
15
<project name="schema2beans" default="netbeans" basedir=".">
15
<project name="schema2beans" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <property name="nbroot" location="../.."/>
18
  <target name="init" depends="default.init">
18
  <property name="nbext" location="${nbroot}/nbbuild"/>
19
    <patternset id="schema2beans/rt.files">
19
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
20
      <include name="${nb.modules/autoload.dir}/schema2beans.jar"/>
20
  <property name="homepage.base" value="netbeans.org"/>
21
    </patternset>
21
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22
    <path id="cp">
22
23
    </path>
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
24
  </target>
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
25
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
26
25
27
  <!-- Primary targets. -->
26
  <!-- Primary targets. -->
28
27
29
  <target name="netbeans" depends="jars">
28
  <target name="netbeans" depends="jars">
30
    <genlist targetname="nbm" outputfiledir="netbeans"/>
29
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/schema2beans.jar">
30
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
31
         <patternset refID="schema2beans/rt.files"/>
32
       </fileset>
33
    </genlist>
31
  </target>
34
  </target>
32
35
33
  <target name="nbm" depends="netbeans">
36
  <target name="nbm" depends="netbeans">
34
	<delete file="Info/info.xml"/>
35
    <makenbm file="schema2beans.nbm"
37
    <makenbm file="schema2beans.nbm"
36
             topdir="."
38
             productdir="${netbeans.dest.dir}/${cluster.dir}"
37
             module="netbeans/modules/autoload/schema2beans.jar"
39
             module="${nb.modules/autoload.dir}/schema2beans.jar"
38
	     homepage="http://${homepage.base}/schema2beans.html"
40
	     homepage="http://${homepage.base}/schema2beans.html"
39
	     distribution="http://${dist.base}/schema2beans.nbm">
41
	     distribution="http://${dist.base}/schema2beans.nbm">
40
      <license file="${license.file}" />
42
      <license file="${license.file}" />
41
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
43
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
42
      <exclude name="**/nondist/**" />
43
    </makenbm>
44
    </makenbm>
44
  </target>
45
  </target>
45
  
46
  
46
  <target name="clean">
47
  <target name="clean" depends="init">
47
    <delete>
48
    <delete>
48
      <fileset dir="src">
49
      <fileset dir="src">
49
        <include name="**/*.class"/>
50
        <include name="**/*.class"/>
50
      </fileset>
51
      </fileset>
52
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
53
        <patternset refID="schema2beans/rt.files"/>
54
      </fileset>
51
    </delete>
55
    </delete>
52
    <delete dir="netbeans"/>
53
    <delete dir="javadoc"/>
56
    <delete dir="javadoc"/>
54
    <delete file="manifest-subst.mf"/>
57
    <delete file="manifest-subst.mf"/>
55
    <delete file="schema2beans.nbm"/>
58
    <delete file="schema2beans.nbm"/>
56
    <delete dir="Info"/>
57
    <!-- Because build includes just rt and we need to clean other libs during real-clean: -->
59
    <!-- Because build includes just rt and we need to clean other libs during real-clean: -->
58
    <ant dir="../dev" target="clean"/>
60
    <ant dir="../dev" target="clean"/>
59
    <ant dir="../anttask" target="clean"/>
61
    <ant dir="../anttask" target="clean"/>
Lines 63-84 Link Here
63
  <!-- Secondary targets. -->
65
  <!-- Secondary targets. -->
64
66
65
  <target name="jars" depends="compile">
67
  <target name="jars" depends="compile">
66
    <mkdir dir="netbeans/modules/autoload"/>
68
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
67
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
69
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
68
    <copy file="manifest.mf" tofile="manifest-subst.mf"
70
    <copy file="manifest.mf" tofile="manifest-subst.mf"
69
          filtering="on"/>
71
          filtering="on"/>
70
    <locjar jarfile="netbeans/modules/autoload/schema2beans.jar" manifest="manifest-subst.mf"
72
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/schema2beans.jar" 
71
      compress="false">
73
         manifest="manifest-subst.mf"
72
      <locale name="ja"/>
74
         basedir="src"
73
      <fileset dir="src">
75
         compress="false"
74
        <patternset>
76
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
75
		  <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
76
        </patternset>
77
      </fileset>
78
    </locjar>
79
  </target>
77
  </target>
80
78
81
  <target name="compile">
79
  <target name="compile" depends="init">
82
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
80
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
83
       <patternset>
81
       <patternset>
84
        <include name="org/netbeans/modules/schema2beans/"/>
82
        <include name="org/netbeans/modules/schema2beans/"/>
(-)tasklist/api/build.xml (-35 / +32 lines)
Lines 13-69 Link Here
13
-->
13
-->
14
14
15
<project name="tasklist/api" default="netbeans" basedir=".">
15
<project name="tasklist/api" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
    <property file="../version.properties"/>
18
    <property file="../version.properties"/>
28
19
  
29
    <path id="cp">
20
    <target name="init" depends="default.init">
21
      <patternset id="tasklist/api.files">
22
        <include name="${nb.modules/autoload.dir}/tasklist-api.jar"/>
23
      </patternset>
24
      <path id="cp">
30
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
        <fileset dir="${nb_all}/openide/netbeans/lib">
26
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
            <include name="openide*.jar" />
27
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
        </fileset>
28
        <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
34
        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
29
      </path>
35
        <pathelement location="${nb_all}/java/netbeans/modules/java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
30
    </target>
36
    </path>
37
  
31
  
38
    <target name="compile">
32
    <target name="compile" depends="init">
39
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
33
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
40
            <classpath refid="cp"/>
34
            <classpath refid="cp"/>
41
        </javac>
35
        </javac>
42
    </target>
36
    </target>
43
37
44
    <target name="jars" depends="compile">
38
    <target name="jars" depends="compile">
45
        <mkdir dir="netbeans/modules/autoload"/>
39
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
46
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
40
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
47
        <filter filtersfile="../version.properties"/>
41
        <filter filtersfile="../version.properties"/>
48
        <filter token="tl.api.spec" value="${tl.api.spec}"/>
42
        <filter token="tl.api.spec" value="${tl.api.spec}"/>
49
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
50
        <locjar jarfile="netbeans/modules/autoload/tasklist-api.jar"
44
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"
51
                manifest="manifest-subst.mf"
45
             manifest="manifest-subst.mf"
52
                basedir="src"
46
             basedir="src"
53
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
47
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
54
	        compress="false">
48
	     compress="false"/>
55
            <locale name="ja"/>
56
        </locjar>
57
    </target>
49
    </target>
58
50
59
    <target name="netbeans" depends="jars">
51
    <target name="netbeans" depends="jars">
60
        <genlist targetname="nbm" outputfiledir="netbeans"/>
52
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/tasklist-api.jar">
53
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
                <patternset refID="tasklist/api.files"/>
55
           </fileset>
56
        </genlist>
61
    </target>
57
    </target>
62
58
63
    <target name="nbm" depends="netbeans">
59
    <target name="nbm" depends="netbeans">
64
        <makenbm file="../tasklist-api.nbm"
60
        <makenbm file="tasklist-api.nbm"
65
                 topdir="."
61
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
66
                 module="netbeans/modules/autoload/tasklist-api.jar"
62
                 module="${nb.modules/autoload.dir}/tasklist-api.jar"
67
                 homepage="http://tasklist.${homepage.base}/"
63
                 homepage="http://tasklist.${homepage.base}/"
68
                 distribution="http://${dist.base}/tasklist-api.nbm"
64
                 distribution="http://${dist.base}/tasklist-api.nbm"
69
                 needsrestart="false">
65
                 needsrestart="false">
Lines 72-85 Link Here
72
        </makenbm>
68
        </makenbm>
73
    </target>
69
    </target>
74
  
70
  
75
    <target name="clean">
71
    <target name="clean" depends="init">
76
        <delete>
72
        <delete>
77
            <fileset dir="." includes="**/*.class"/>
73
            <fileset dir="." includes="**/*.class"/>
74
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
               <patternset refID="tasklist/api.files"/>
76
            </fileset>
78
        </delete>
77
        </delete>
79
        <delete file="manifest-subst.mf"/>
78
        <delete file="manifest-subst.mf"/>
80
        <delete file="../tasklist-api.nbm"/>
79
        <delete file="tasklist-api.nbm"/>
81
        <delete dir="netbeans"/>
82
        <delete dir="Info"/>
83
        <delete dir="javadoc"/>
80
        <delete dir="javadoc"/>
84
    </target>
81
    </target>
85
82
(-)tasklist/core/build.xml (-42 / +43 lines)
Lines 13-65 Link Here
13
-->
13
-->
14
14
15
<project name="tasklist/core" default="netbeans" basedir=".">
15
<project name="tasklist/core" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
23
24
    <property name="nbm_alias" value="nb_ide"/>
25
    <property name="homepage.base" value="netbeans.org"/>
26
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
27
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
28
    <property file="../version.properties"/>
18
    <property file="../version.properties"/>
19
20
    <target name="init" depends="default.init">
21
      <patternset id="tasklist/core.files">
22
        <include name="${nb.modules/autoload.dir}/tasklist-core.jar"/>
23
        <include name="${nb.modules/autoload/docs.dir}/tasklist-manual.zip"/>
24
      </patternset>
25
      <path id="cp">
26
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
27
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
        <pathelement location="${core/settings.dir}/${nb.modules/autoload.dir}/core-settings.jar"/>
30
        <!-- tasklist api -->
31
        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
32
        <!-- depend on core/output so we can override F12 action -->
33
        <pathelement path="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
34
      </path>
35
    </target>
29
  
36
  
30
    <target name="compile">
37
    <target name="compile" depends="init">
31
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"> 
38
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"> 
32
            <classpath>
39
            <classpath refID="cp"/>
33
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
34
                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
35
                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
36
                <pathelement location="${nb_all}/core/settings/netbeans/modules/autoload/core-settings.jar"/>
37
                <!-- tasklist api -->
38
                <pathelement path="../api/src"/>
39
                <!-- depend on core/output so we can override F12 action -->
40
                <pathelement path="../../core/output/netbeans/modules/autoload/core-output.jar"/>
41
            </classpath>
42
        </javac>
40
        </javac>
43
    </target>
41
    </target>
44
42
45
43
46
    <target name="jars" depends="compile">
44
    <target name="jars" depends="compile">
47
        <mkdir dir="netbeans/modules"/>
45
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
48
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
46
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
49
        <filter filtersfile="../version.properties"/>
47
        <filter filtersfile="../version.properties"/>
50
        <filter token="tl.core.spec" value="${tl.core.spec}"/>
48
        <filter token="tl.core.spec" value="${tl.core.spec}"/>
51
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
49
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
52
        <locjar jarfile="netbeans/modules/autoload/tasklist-core.jar"
50
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"
53
                manifest="manifest-subst.mf"
51
             manifest="manifest-subst.mf"
54
                basedir="src"
52
             basedir="src"
55
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
53
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
56
	        compress="false">
54
	     compress="false"/>
57
            <locale name="ja"/>
58
        </locjar>
59
    </target>
55
    </target>
60
56
61
    <target name="netbeans" depends="jars">
57
    <target name="netbeans" depends="jars">
62
        <genlist targetname="nbm" outputfiledir="netbeans"/>
58
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/tasklist-core.jar">
59
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
60
                <patternset refID="tasklist/core.files"/>
61
           </fileset>
62
        </genlist>
63
    </target>
63
    </target>
64
64
65
    <target name="native">
65
    <target name="native">
Lines 68-76 Link Here
68
    </target>
68
    </target>
69
69
70
    <target name="nbm" depends="netbeans">
70
    <target name="nbm" depends="netbeans">
71
        <makenbm file="../tasklist-core.nbm"
71
        <makenbm file="tasklist-core.nbm"
72
                 topdir="."
72
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
73
                 module="netbeans/modules/autoload/tasklist-core.jar"
73
                 module="${nb.modules/autoload.dir}/tasklist-core.jar"
74
                 homepage="http://tasklist.${homepage.base}/"
74
                 homepage="http://tasklist.${homepage.base}/"
75
                 distribution="http://${dist.base}/tasklist-core.nbm"
75
                 distribution="http://${dist.base}/tasklist-core.nbm"
76
                 needsrestart="false">
76
                 needsrestart="false">
Lines 80-101 Link Here
80
        </makenbm>
80
        </makenbm>
81
    </target>
81
    </target>
82
  
82
  
83
    <target name="clean">
83
    <target name="clean" depends="init">
84
        <delete>
84
        <delete>
85
            <fileset dir="src">
85
            <fileset dir="src">
86
                <include name="**/*.class"/>
86
                <include name="**/*.class"/>
87
            </fileset>
87
            </fileset>
88
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
89
               <patternset refID="tasklist/core.files"/>
90
            </fileset>
88
        </delete>
91
        </delete>
89
        <delete file="manifest-subst.mf"/>
92
        <delete file="manifest-subst.mf"/>
90
        <delete file="../tasklist-core.nbm"/>
93
        <delete file="tasklist-core.nbm"/>
91
        <delete dir="netbeans"/>
92
        <delete dir="Info"/>
93
        <delete dir="javadoc"/>
94
        <delete dir="javadoc"/>
94
    </target>
95
    </target>
95
96
96
97
97
    <target name="javahelp">
98
    <target name="javahelp" depends="init">
98
      <mkdir dir="netbeans/modules/autoload/docs"/>
99
      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
99
      <mkdir dir="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch"/>
100
      <mkdir dir="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch"/>
100
      <jhindexer basedir="../javahelp/org/netbeans/modules/tasklist/help"
101
      <jhindexer basedir="../javahelp/org/netbeans/modules/tasklist/help"
101
                 db="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch">
102
                 db="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch">
Lines 107-114 Link Here
107
        <include name="**/*.html"/>
108
        <include name="**/*.html"/>
108
        <exclude name="JavaHelpSearch/"/>
109
        <exclude name="JavaHelpSearch/"/>
109
      </jhindexer>
110
      </jhindexer>
110
      <mkdir dir="netbeans/modules/docs"/>
111
      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
111
      <zip zipfile="netbeans/modules/autoload/docs/tasklist-manual.zip" compress="true">
112
      <zip zipfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}/tasklist-manual.zip" compress="true">
112
        <fileset dir="../javahelp" excludesfile="../../nbbuild/standard-jar-excludes.txt">
113
        <fileset dir="../javahelp" excludesfile="../../nbbuild/standard-jar-excludes.txt">
113
        </fileset>
114
        </fileset>
114
      </zip>
115
      </zip>
(-)tasklist/docscan/build.xml (-41 / +38 lines)
Lines 13-73 Link Here
13
-->
13
-->
14
14
15
<project name="tasklist/docscan" default="netbeans" basedir=".">
15
<project name="tasklist/docscan" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
    <property file="../version.properties"/>
18
    <property file="../version.properties"/>
19
20
    <target name="init" depends="default.init">
21
      <patternset id="tasklist/docscan.files">
22
        <include name="${nb.modules.dir}/tasklist-docscan.jar"/>
23
      </patternset>
24
      <path id="cp">
25
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
26
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
29
        <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
30
        <pathelement path="${tasklist/suggestions.dir}/${nb.modules/autoload.dir}/suggestions-framework.jar"/>
31
        <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
32
        <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
33
      </path>
34
    </target>
28
  
35
  
29
    <target name="compile">
36
    <target name="compile" depends="init">
30
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
37
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
31
            <classpath>
38
            <classpath refID="cp"/>
32
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
33
                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
34
                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
35
                <!-- tasklist api -->
36
                <pathelement path="../api/src"/>
37
                <!-- tasklist core -->
38
                <pathelement path="../core/src"/>
39
                <!-- usertasks -->
40
                <pathelement path="../usertasks/src"/>
41
                <pathelement path="../suggestions/src"/>
42
                <pathelement location="../../editor/netbeans/modules/ext/nb-editor.jar"/>
43
               <pathelement location="../../editor/netbeans/modules/editor.jar"/>
44
            </classpath>
45
        </javac>
39
        </javac>
46
    </target>
40
    </target>
47
41
48
    <target name="jars" depends="compile">
42
    <target name="jars" depends="compile">
49
        <mkdir dir="netbeans/modules"/>
43
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
50
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
51
        <filter filtersfile="../version.properties"/>
45
        <filter filtersfile="../version.properties"/>
52
        <filter token="tl.docscan.spec" value="${tl.docscan.spec}"/>
46
        <filter token="tl.docscan.spec" value="${tl.docscan.spec}"/>
53
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
47
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
54
        <locjar jarfile="netbeans/modules/tasklist-docscan.jar"
48
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/tasklist-docscan.jar"
55
                manifest="manifest-subst.mf"
49
             manifest="manifest-subst.mf"
56
                basedir="src"
50
             basedir="src"
57
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
51
	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
58
	        compress="false">
52
	     compress="false"/>
59
            <locale name="ja"/>
60
        </locjar>
61
    </target>
53
    </target>
62
54
63
    <target name="netbeans" depends="jars">
55
    <target name="netbeans" depends="jars">
64
        <genlist targetname="nbm" outputfiledir="netbeans"/>
56
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/tasklist-docscan.jar">
57
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
58
                <patternset refID="tasklist/docscan.files"/>
59
           </fileset>
60
        </genlist>
65
    </target>
61
    </target>
66
62
67
    <target name="nbm" depends="netbeans">
63
    <target name="nbm" depends="netbeans">
68
        <makenbm file="../tasklist-docscan.nbm"
64
        <makenbm file="tasklist-docscan.nbm"
69
                 topdir="."
65
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
70
                 module="netbeans/modules/tasklist-docscan.jar"
66
                 module="${nb.modules.dir}/tasklist-docscan.jar"
71
                 homepage="http://tasklist.${homepage.base}/"
67
                 homepage="http://tasklist.${homepage.base}/"
72
                 distribution="http://${dist.base}/tasklist-docscan.nbm"
68
                 distribution="http://${dist.base}/tasklist-docscan.nbm"
73
                 needsrestart="false">
69
                 needsrestart="false">
Lines 77-92 Link Here
77
        </makenbm>
73
        </makenbm>
78
    </target>
74
    </target>
79
  
75
  
80
    <target name="clean">
76
    <target name="clean" depends="init">
81
        <delete>
77
        <delete>
82
            <fileset dir="src">
78
            <fileset dir="src">
83
                <include name="**/*.class"/>
79
                <include name="**/*.class"/>
84
            </fileset>
80
            </fileset>
81
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
82
               <patternset refID="tasklist/docscan.files"/>
83
            </fileset>
85
        </delete>
84
        </delete>
86
        <delete file="manifest-subst.mf"/>
85
        <delete file="manifest-subst.mf"/>
87
        <delete file="../tasklist-docscan.nbm"/>
86
        <delete file="tasklist-docscan.nbm"/>
88
        <delete dir="netbeans"/>
89
        <delete dir="Info"/>
90
        <delete dir="javadoc"/>
87
        <delete dir="javadoc"/>
91
    </target>
88
    </target>
92
89
(-)tasklist/suggestions/build.xml (-38 / +37 lines)
Lines 13-70 Link Here
13
-->
13
-->
14
14
15
<project name="tasklist/suggestions" default="netbeans" basedir=".">
15
<project name="tasklist/suggestions" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
16
17
17
    <property name="nb_all" value="../.."/>
18
19
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
21
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
23
    <property name="nbm_alias" value="nb_ide"/>
24
    <property name="homepage.base" value="netbeans.org"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
27
    <property file="../version.properties"/>
18
    <property file="../version.properties"/>
19
20
    <target name="init" depends="default.init">
21
      <patternset id="tasklist/suggestions.files">
22
        <include name="${nb.modules/autoload.dir}/suggestions-framework.jar"/>
23
      </patternset>
24
      <path id="cp">
25
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
26
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
29
        <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
30
      </path>
31
    </target>
28
  
32
  
29
    <target name="compile">
33
    <target name="compile" depends="init">
30
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
34
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
31
            <classpath>
35
            <classpath refID="cp"/>
32
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
33
                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
34
                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
35
                <!-- tasklist api -->
36
                <pathelement path="../api/src"/>
37
                <!-- tasklist core -->
38
                <pathelement path="../core/src"/>
39
		<pathelement path="../../core/external/xml-apis-1.0b2.jar"/>
40
            </classpath>
41
        </javac>
36
        </javac>
42
    </target>
37
    </target>
43
38
44
    <target name="jars" depends="compile">
39
    <target name="jars" depends="compile">
45
        <mkdir dir="netbeans/modules"/>
40
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
46
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
41
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
47
        <filter filtersfile="../version.properties"/>
42
        <filter filtersfile="../version.properties"/>
48
        <filter token="tl.suggestions.spec" value="${tl.suggestions.spec}"/>
43
        <filter token="tl.suggestions.spec" value="${tl.suggestions.spec}"/>
49
       <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
50
        <locjar jarfile="netbeans/modules/autoload/suggestions-framework.jar"
45
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/suggestions-framework.jar"
51
                manifest="manifest-subst.mf"
46
             manifest="manifest-subst.mf"
52
                basedir="src"
47
             basedir="src"
53
	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
48
             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
54
	        compress="false">
49
	     compress="false">
55
            <locale name="ja"/>
56
            <exclude name="org/netbeans/modules/tasklist/suggestions/ui/*"/>
50
            <exclude name="org/netbeans/modules/tasklist/suggestions/ui/*"/>
57
        </locjar>
51
        </jar>
58
    </target>
52
    </target>
59
53
60
    <target name="netbeans" depends="jars">
54
    <target name="netbeans" depends="jars">
61
        <genlist targetname="nbm" outputfiledir="netbeans"/>
55
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/suggestions-framework.jar">
56
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
57
                <patternset refID="tasklist/suggestions.files"/>
58
           </fileset>
59
        </genlist>
62
    </target>
60
    </target>
63
61
64
    <target name="nbm" depends="netbeans">
62
    <target name="nbm" depends="netbeans">
65
        <makenbm file="../suggestions-framework.nbm"
63
        <makenbm file="suggestions-framework.nbm"
66
                 topdir="."
64
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
67
                 module="netbeans/modules/autoload/suggestions-framework.jar"
65
                 module="${nb.modules/autoload.dir}/suggestions-framework.jar"
68
                 homepage="http://tasklist.${homepage.base}/"
66
                 homepage="http://tasklist.${homepage.base}/"
69
                 distribution="http://${dist.base}/suggestions-framework.nbm"
67
                 distribution="http://${dist.base}/suggestions-framework.nbm"
70
                 needsrestart="false">
68
                 needsrestart="false">
Lines 73-88 Link Here
73
        </makenbm>
71
        </makenbm>
74
    </target>
72
    </target>
75
  
73
  
76
    <target name="clean">
74
    <target name="clean" depends="init">
77
        <delete>
75
        <delete>
78
            <fileset dir="src">
76
            <fileset dir="src">
79
                <include name="**/*.class"/>
77
                <include name="**/*.class"/>
80
            </fileset>
78
            </fileset>
79
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
80
               <patternset refID="tasklist/suggestions.files"/>
81
            </fileset>
81
        </delete>
82
        </delete>
82
        <delete file="manifest-subst.mf"/>
83
        <delete file="manifest-subst.mf"/>
83
        <delete file="../suggestions-framework.nbm"/>
84
        <delete file="suggestions-framework.nbm"/>
84
        <delete dir="netbeans"/>
85
        <delete dir="Info"/>
86
        <delete dir="javadoc"/>
85
        <delete dir="javadoc"/>
87
    </target>
86
    </target>
88
87
(-)text/build.xml (-37 / +35 lines)
Lines 8-59 Link Here
8
http://www.sun.com/
8
http://www.sun.com/
9
9
10
The Original Code is NetBeans. The Initial Developer of the Original
10
The Original Code is NetBeans. The Initial Developer of the Original
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
14
15
<project name="text" default="netbeans" basedir=".">
15
<project name="text" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/>
17
  
18
  <target name="init" depends="default.init">
19
    <patternset id="text.files">
20
      <include name="${nb.modules.dir}/text.jar"/>
21
    </patternset>
22
23
    <path id="cp">
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
    </path>
28
  </target>
16
29
17
  <property name="nbm_alias" value="nb_ide"/>
30
  <target name="compile" depends="init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
25
26
  <target name="compile">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
31
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
32
      <classpath refID="cp"/>
29
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
30
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
31
        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
32
      </classpath>
33
    </javac>
33
    </javac>
34
  </target>
34
  </target>
35
35
36
  <target name="jars" depends="compile">
36
  <target name="jars" depends="compile">
37
    <mkdir dir="netbeans/modules"/>
37
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <locjar jarfile="netbeans/modules/text.jar"
40
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/text.jar"
41
            manifest="manifest-subst.mf"
41
         manifest="manifest-subst.mf"
42
            basedir="src"
42
         basedir="src"
43
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
43
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
44
	    compress="false">
44
	 compress="false"/>
45
      <locale name="ja"/>
46
    </locjar>
47
  </target>
45
  </target>
48
46
49
  <target name="netbeans" depends="jars">
47
  <target name="netbeans" depends="jars">
50
    <genlist targetname="nbm" outputfiledir="netbeans"/>
48
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/text.jar">
49
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
50
        <patternset refID="text.files"/>
51
      </fileset>
52
    </genlist>
51
  </target>
53
  </target>
52
54
53
  <target name="nbm" depends="netbeans">
55
  <target name="nbm" depends="netbeans">
54
    <makenbm file="text.nbm"
56
    <makenbm file="text.nbm"
55
             topdir="."
57
             productdir="${netbeans.dest.dir}/${cluster.dir}"
56
             module="netbeans/modules/text.jar"
58
             module="${nb.modules.dir}/text.jar"
57
	     homepage="http://text.${homepage.base}/"
59
	     homepage="http://text.${homepage.base}/"
58
	     distribution="http://${dist.base}/text.nbm">
60
	     distribution="http://${dist.base}/text.nbm">
59
      <license file="${license.file}"/>
61
      <license file="${license.file}"/>
Lines 61-81 Link Here
61
    </makenbm>
63
    </makenbm>
62
  </target>
64
  </target>
63
65
64
  <target name="clean">
66
  <target name="clean" depends="init">
65
    <delete>
67
    <delete>
66
      <fileset dir="src">
68
      <fileset dir="src">
67
        <include name="**/*.class"/>
69
        <include name="**/*.class"/>
68
        <include name="**/*.jar"/>
70
        <include name="**/*.jar"/>
69
      </fileset>
71
      </fileset>
72
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
73
        <patternset refID="text.files"/>
74
      </fileset>
70
    </delete>
75
    </delete>
71
    <delete file="manifest-subst.mf"/>
76
    <delete file="manifest-subst.mf"/>
72
    <delete file="text.nbm"/>
77
    <delete file="text.nbm"/>
73
    <delete dir="netbeans"/>
74
    <delete dir="javadoc"/>
78
    <delete dir="javadoc"/>
75
    <delete dir="Info"/>
76
  </target>
79
  </target>
77
80
78
  <target name="javadoc" description="Build text module API documentation.">
81
  <target name="javadoc" depends="init" description="Build text module API documentation.">
79
    <tstamp/>
82
    <tstamp/>
80
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
83
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
81
    <echo message="Build text module API documentation..."/>
84
    <echo message="Build text module API documentation..."/>
Lines 94-105 Link Here
94
      <sourcepath>
97
      <sourcepath>
95
        <pathelement location="src"/>
98
        <pathelement location="src"/>
96
      </sourcepath>
99
      </sourcepath>
97
      <classpath>
100
      <classpath refID="cp"/>
98
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
99
        <fileset dir="../openide/netbeans/lib">
100
          <include name="openide*.jar" />
101
        </fileset>
102
      </classpath>
103
    </javadoc>    
101
    </javadoc>    
104
  </target>
102
  </target>
105
103
(-)tomcatint/tomcat5/build.xml (-89 / +70 lines)
Lines 13-64 Link Here
13
-->
13
-->
14
14
15
<project name="tomcat5" default="netbeans" basedir=".">
15
<project name="tomcat5" default="netbeans" basedir=".">
16
<!-- 
16
  <import file="../../nbbuild/default.xml"/> 
17
  <property name="nbm_alias" value="nb_ide"/>
17
18
-->
19
  
20
  <property name="homepage.base" value="netbeans.org"/>
21
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
  <property name="nb_root" location="../.."/>
24
  <property name="nbext" location="${nb_root}/nbbuild"/>
25
  <property name="tomcat5_dir" location="src/org/netbeans/modules/tomcat5"/>
18
  <property name="tomcat5_dir" location="src/org/netbeans/modules/tomcat5"/>
26
	
19
	
27
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
20
  <target name="init" depends="default.init">
28
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
21
    <patternset id="tomcatint/tomcat5.files">
29
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_root}/nbbuild/nbantext.jar"/>
22
      <include name="${nb.modules.dir}/tomacat5.jar"/>
30
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_root}/nbbuild/nbantext.jar"/>
23
    </patternset>
31
24
    <path id="cp">
32
  <path id="cp">
33
        <pathelement location="${jdkhome}/lib/tools.jar"/>
25
        <pathelement location="${jdkhome}/lib/tools.jar"/>
34
        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
26
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
35
        <!--<pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>-->
27
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
36
        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
28
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
37
        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
29
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
38
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
39
        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
31
        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/> <!-- XXX -->
40
        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
32
        <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
41
        <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
33
        <pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
42
        <pathelement location="${nb_root}/j2eeserver/external/ejb20.jar"/>
34
        <pathelement location="${nb_all}/j2eeserver/external/ejb20.jar"/>
43
        <pathelement location="${nb_root}/j2eeserver/external/jmxri.jar"/>
35
        <pathelement location="${nb_all}/j2eeserver/external/jmxri.jar"/>
44
        <pathelement location="${nb_root}/j2eeserver/external/javax77.jar"/>
36
        <pathelement location="${nb_all}/j2eeserver/external/javax77.jar"/>
45
        <pathelement location="${nb_root}/j2eeserver/external/jsr88javax.jar"/>
37
        <pathelement location="${nb_all}/j2eeserver/external/jsr88javax.jar"/>
46
        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar"/>
38
        <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar"/>
47
        <pathelement location="${nb_root}/debuggercore/api/netbeans/modules/autoload/debugger-api.jar"/>
39
        <pathelement location="${debuggercore/api.dir}/${nb.modules/autoload.dir}/debugger-api.jar"/>
48
        <pathelement location="${nb_root}/debuggerjpda/netbeans/modules/jpdaDebugger.jar"/>
40
        <pathelement location="${debuggerjpda.dir}/${nb.modules.dir}/jpdaDebugger.jar"/>
49
        <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
41
        <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
50
        <pathelement location="${nb_root}/libs/external/xerces-2.6.0.jar"/>
42
        <pathelement location="${nb_all}/libs/external/xerces-2.6.0.jar"/>
51
        <fileset dir="${nb_root}/openide/netbeans/lib">
43
    </path>
52
          <include name="openide*.jar" />
44
  </target>
53
        </fileset>
54
  </path>
55
  
45
  
56
  <target name="s2binit">
46
  <target name="s2binit" depends="init">
57
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
47
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
58
	  <classpath>
48
	  <classpath>
59
		<pathelement path="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
49
		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
60
		<pathelement path="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
50
		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
61
		<pathelement path="${nb_root}/schema2beans/anttask/s2banttask.jar"/>
51
		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
62
	  </classpath>
52
	  </classpath>
63
	</taskdef>
53
	</taskdef>
64
  </target>
54
  </target>
Lines 77-120 Link Here
77
	  rootDir="src"/>
67
	  rootDir="src"/>
78
  </target>
68
  </target>
79
  
69
  
80
  <target name="compile" depends="dd2beans_gen">
70
  <target name="compile" depends="init,dd2beans_gen">
81
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
71
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
82
      <classpath refid="cp"/>
72
      <classpath refid="cp"/>
83
    </javac>
73
    </javac>
84
  </target>
74
  </target>
85
  
75
  
86
  <target name="jars" depends="compile">
76
  <target name="jars" depends="compile">
87
    <mkdir dir="netbeans/modules"/>
77
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
88
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
78
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
89
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
79
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
90
    <locjar jarfile="netbeans/modules/tomcat5.jar"
80
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/tomcat5.jar"
91
            manifest="manifest-subst.mf"
81
         manifest="manifest-subst.mf"
92
            basedir="src"
82
         basedir="src"
93
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
83
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
94
	    compress="false">
84
	 compress="false"/>
95
      <locale name="ja"/>
96
    </locjar>
97
  </target>
85
  </target>
98
86
99
  <target name="release">
87
  <target name="netbeans" depends="jars,javahelp">
100
  <!--
88
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/tomcat5.jar">
101
    <mkdir dir="netbeans/modules/ext"/>
89
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
102
    <copy todir="netbeans/modules/ext">
90
         <patternset refID="tomcatint/tomcat5.files"/>
103
      <fileset dir="../external">
91
       </fileset>
104
         <include name="mx4j-tools.jar"/>
92
    </genlist>
105
      </fileset>
106
    </copy>
107
    -->
108
  </target>
109
110
  <target name="netbeans" depends="jars,release,javahelp">
111
    <genlist targetname="nbm" outputfiledir="netbeans"/>
112
  </target>
93
  </target>
113
94
114
  <target name="nbm" depends="jars">
95
  <target name="nbm" depends="jars">
115
    <makenbm file="tomcat5.nbm"
96
    <makenbm file="tomcat5.nbm"
116
             topdir="."
97
             productdir="${netbeans.dest.dir}/${cluster.dir}"
117
             module="netbeans/modules/tomcat5.jar"
98
             module="${nb.modules.dir}/tomcat5.jar"
118
	     homepage="http://text.${homepage.base}/"
99
	     homepage="http://text.${homepage.base}/"
119
	     distribution="http://${dist.base}/tomcat5.nbm">
100
	     distribution="http://${dist.base}/tomcat5.nbm">
120
      <license file="${license.file}"/>
101
      <license file="${license.file}"/>
Lines 122-154 Link Here
122
    </makenbm>
103
    </makenbm>
123
  </target>
104
  </target>
124
105
125
    <target name="javadoc" description="Build Javadoc.">
106
  <target name="javadoc" depends="init" description="Build Javadoc.">
126
        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
107
      <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
127
            <property name="javadoc.base" location="."/>
108
          <property name="javadoc.base" location="."/>
128
            <property name="javadoc.name" value="Tomcat5PluginAPI"/>
109
          <property name="javadoc.name" value="Tomcat5PluginAPI"/>
129
            <property name="javadoc.title" value="Tomcat 5 Plugin API"/>
110
          <property name="javadoc.title" value="Tomcat 5 Plugin API"/>
130
            <property name="javadoc.packages" value="org.netbeans.modules.tomcat5,org.netbeans.modules.tomcat5.ide,org.netbeans.modules.tomcat5.nodes,org.netbeans.modules.tomcat5.progress"/>
111
          <property name="javadoc.packages" value="org.netbeans.modules.tomcat5,org.netbeans.modules.tomcat5.ide,org.netbeans.modules.tomcat5.nodes,org.netbeans.modules.tomcat5.progress"/>
131
            <property name="javadoc.classpath" refid="cp"/>
112
          <property name="javadoc.classpath" refid="cp"/>
132
            <!--
113
          <!--
133
            <property name="javadoc.arch" location="../arch/arch-tomcatint-tomcat5.xml"/>
114
          <property name="javadoc.arch" location="../arch/arch-tomcatint-tomcat5.xml"/>
134
            <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
115
          <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
135
            <property name="javadoc.docfiles" location="api/doc"/>
116
          <property name="javadoc.docfiles" location="api/doc"/>
136
            -->
117
          -->
137
        </ant>
118
      </ant>
138
    </target>
119
  </target>
139
  
120
  
140
  <target name="clean">
121
  <target name="clean" depends="init">
141
    <antcall target="clean-ddgen-src"/>  
122
    <antcall target="clean-ddgen-src"/>  
142
    <delete>
123
    <delete>
143
      <fileset dir="src">
124
      <fileset dir="src">
144
        <include name="**/*.class"/>
125
        <include name="**/*.class"/>
145
        <include name="**/*.jar"/>
126
        <include name="**/*.jar"/>
146
      </fileset>
127
      </fileset>
128
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
129
        <patternset refID="tomcatint/tomcat5.files"/>
130
      </fileset>
147
    </delete>
131
    </delete>
148
    <delete file="manifest-subst.mf"/>
132
    <delete file="manifest-subst.mf"/>
149
    <delete file="tomcat5.nbm"/>
133
    <delete file="tomcat5.nbm"/>
150
    <delete dir="netbeans"/>
151
    <delete dir="Info"/>
152
    <delete dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
134
    <delete dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
153
    <delete dir="javadoc"/>
135
    <delete dir="javadoc"/>
154
  </target>
136
  </target>
Lines 166-177 Link Here
166
        <delete dir="${tomcat5_dir}/config"/>
148
        <delete dir="${tomcat5_dir}/config"/>
167
  </target>
149
  </target>
168
  
150
  
169
  <target name="javahelp">
151
  <target name="javahelp" depends="init">
170
    <mkdir dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
152
    <mkdir dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
171
    <jhindexer basedir="javahelp/org/netbeans/modules/tomcat5/docs/"
153
    <jhindexer basedir="javahelp/org/netbeans/modules/tomcat5/docs/"
172
               db="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2">
154
               db="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2">
173
      <classpath>
155
      <classpath>
174
        <fileset dir="${nb_root}/nbbuild/external">
156
        <fileset dir="${nb_all}/nbbuild/external">
175
          <include name="jhall*.jar"/>
157
          <include name="jhall*.jar"/>
176
        </fileset>
158
        </fileset>
177
      </classpath>
159
      </classpath>
Lines 180-191 Link Here
180
      <exclude name="ja/"/>
162
      <exclude name="ja/"/>
181
      <exclude name="credits.html"/>
163
      <exclude name="credits.html"/>
182
    </jhindexer>
164
    </jhindexer>
183
    <mkdir dir="netbeans/modules/docs"/>
165
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
184
    <locjar jarfile="netbeans/modules/docs/tomcat5.jar"
166
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/tomcat5.jar"
185
            compress="true">
167
         compress="true">
186
      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
168
      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
187
      <locale name="ja"/>
169
    </jar>
188
    </locjar>
189
  </target>
170
  </target>
190
  
171
  
191
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
172
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
(-)tomcatint/tomcat5/bundled/build.xml (-44 / +42 lines)
Lines 13-70 Link Here
13
-->
13
-->
14
14
15
<project name="tomcatint-tomcat5-bundled" basedir="." default="netbeans">
15
<project name="tomcatint-tomcat5-bundled" basedir="." default="netbeans">
16
  <import file="../../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../../nbbuild/nbantext.jar"/>
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../../nbbuild/nbantext.jar"/>
20
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../../../nbbuild/nbantext.jar"/>
21
22
  <property name="nb_root" location="../../.."/>
23
  <property name="nbext" location="${nb_root}/nbbuild"/>
24
  <property name="homepage.base" value="netbeans.org"/>
25
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
27
  <property name="nbm_alias" value="nb_ide"/>
28
  <property name="tomcat.filename" value="jakarta-tomcat-5.0.19"/>
18
  <property name="tomcat.filename" value="jakarta-tomcat-5.0.19"/>
29
19
30
  <target name="init">
20
  <target name="init" depends="default.init">
31
    <ant dir="${nb_root}/tomcatint/external" target="unscramble"/>
21
    <ant dir="${nb_all}/tomcatint/external" target="unscramble"/>
22
    <patternset id="tomcatint/tomcat5/bundled.files">
23
      <include name="${nb.modules/eager.dir}/tomacat5-bundled.jar"/>
24
      <include name="${tomcat.filename}"/>
25
    </patternset>
26
    <path id="cp">
27
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
28
        <pathelement location="${tomcatint/tomcat5.dir}/${nb.modules.dir}/tomcat40.jar"/>
29
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
    </path>
32
  </target>
32
  </target>
33
33
34
  <target name="compile">
34
  <target name="compile" depends="init">
35
    <!-- PENDING: code needs to be isolated from plugin
35
    <!-- PENDING: code needs to be isolated from plugin
36
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
36
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
      <include name="org/netbeans/modules/tomcat5/bundled/**" />
37
      <classpath refID="cp"/>
38
      <classpath>
39
        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
40
        <pathelement location="${nb_root}/tomcatint/netbeans/modules/tomcat40.jar"/>
41
        <fileset dir="${nb_root}/openide/netbeans/lib">
42
          <include name="openide*.jar" />
43
        </fileset>
44
      </classpath>
45
    </javac>
38
    </javac>
46
    -->
39
    -->
47
  </target>
40
  </target>
48
41
49
  <target name="jars" depends="compile">
42
  <target name="jars" depends="compile">
50
    <mkdir dir="netbeans/modules"/>
43
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
51
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
52
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
53
    <locjar jarfile="netbeans/modules/eager/tomcat5-bundled.jar"
46
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/tomcat5-bundled.jar"
54
            manifest="manifest-subst.mf"
47
         manifest="manifest-subst.mf"
55
            basedir="src"
48
         basedir="src"
56
            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
49
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
57
            compress="false">
50
         compress="false">
58
      <include name="org/netbeans/modules/tomcat5/bundled/**"/>
51
      <include name="org/netbeans/modules/tomcat5/bundled/**"/>
59
      <locale name="ja"/>
52
    </jar>
60
    </locjar>
61
  </target>
53
  </target>
62
54
63
  <target name="release" depends="init,jars">
55
  <target name="release" depends="init,jars">
64
    <mkdir dir="netbeans"/>
56
    <unzip src="../../external/${tomcat.filename}.zip" dest="${netbeans.dest.dir}/${cluster.dir}" />
65
    <unzip src="../../external/${tomcat.filename}.zip" dest="netbeans" />
66
    <chmod perm="ugo+x">
57
    <chmod perm="ugo+x">
67
      <fileset dir="netbeans/${tomcat.filename}/bin">
58
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/bin">
68
        <include name="*.sh"/>
59
        <include name="*.sh"/>
69
      </fileset>
60
      </fileset>
70
    </chmod>
61
    </chmod>
Lines 76-113 Link Here
76
    <!-- XXX:copy IDE-README.txt
67
    <!-- XXX:copy IDE-README.txt
77
    <copy file="torelease/IDE-README.txt" tofile="netbeans/${tomcat.filename}/IDE-README.txt" includeEmptyDirs="false"/> -->
68
    <copy file="torelease/IDE-README.txt" tofile="netbeans/${tomcat.filename}/IDE-README.txt" includeEmptyDirs="false"/> -->
78
    <!-- copy dummy to empty directories -->
69
    <!-- copy dummy to empty directories -->
79
    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
70
    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
80
    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
71
    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
81
    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
72
    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
82
    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
73
    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
83
  </target>
74
  </target>
84
75
85
  <target name="netbeans" depends="jars,release" description="Builds the module">
76
  <target name="netbeans" depends="jars,release" description="Builds the module">
86
    <genlist targetname="nbm" outputfiledir="netbeans"/>
77
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/tomcat5-bundled.jar">
78
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
79
         <patternset refID="tomcatint/tomcat5/bundled.files"/>
80
       </fileset>
81
    </genlist>
87
  </target>
82
  </target>
88
83
89
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
84
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
90
    <makenbm file="bundledtomcat.nbm"
85
    <makenbm file="bundledtomcat.nbm"
91
             topdir="."
86
           productdir="${netbeans.dest.dir}/${cluster.dir}"
92
           module="netbeans/modules/eager/tomcat5-bundled.jar"
87
           module="${nb.modules/eager.dir}/tomcat5-bundled.jar"
93
           homepage="http://tomcatint.${homepage.base}/"
88
           homepage="http://tomcatint.${homepage.base}/"
94
           distribution="http://${dist.base}/bundledtomcat.nbm">
89
           distribution="http://${dist.base}/bundledtomcat.nbm">
95
      <license name="bundledtomcat-license.txt">
90
      <license name="bundledtomcat-license.txt">
96
        <text>For the integration module:</text>
91
        <text>For the integration module:</text>
97
        <file location="${license.file}"/>
92
        <file location="${license.file}"/>
98
        <text>For Tomcat:</text>
93
        <text>For Tomcat:</text>
99
        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
94
        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
100
      </license>
95
      </license>
101
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
96
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
102
    </makenbm>
97
    </makenbm>
103
  </target>
98
  </target>
104
99
105
  <target name="clean" description="Clean all build products.">
100
  <target name="clean" depends="init" description="Clean all build products.">
106
        <delete file="manifest-subst.mf"/>
101
        <delete file="manifest-subst.mf"/>
107
        <delete dir="netbeans"/>
108
        <delete file="bundledtomcat.nbm"/>
102
        <delete file="bundledtomcat.nbm"/>
109
        <delete dir="Info"/>
110
        <delete dir="test"/>
103
        <delete dir="test"/>
104
        <delete>
105
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
106
            <patternset refID="tomcatint/tomcat5/bundled.files"/>
107
          </fileset>
108
        </delete>
111
<!--
109
<!--
112
        <delete>
110
        <delete>
113
            <fileset dir="src">
111
            <fileset dir="src">
(-)ui/welcome/build.xml (-37 / +41 lines)
Lines 14-63 Link Here
14
-->
14
-->
15
15
16
<project basedir="." default="netbeans" name="welcome">
16
<project basedir="." default="netbeans" name="welcome">
17
    <property name="nbm_alias" value="nb_ide"/>
17
  <import file="../../nbbuild/default.xml"/> 
18
    <property name="homepage.base" value="netbeans.org"/>
18
19
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19
  <target name="init" depends="default.init">
20
    <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
20
    <patternset id="ui/welcome.files">
21
21
      <include name="${nb.modules.dir}/junit.jar"/>
22
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
22
    </patternset>
23
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
23
    <path id="cp">
24
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
25
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
26
    <target name="compile">
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
27
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
28
            <classpath>
28
      <pathelement location="${utilities.dir}/${nb.modules.dir}/utilities.jar"/> <!-- XXX: depends on OpenFile -->
29
                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
29
      <pathelement location="${autoupdate.dir}/${nb.modules.dir}/autoupdate.jar"/>
30
                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
30
      <pathelement location="${core/javahelp.dir}/$[nb.modules/autoload.dir}/javahelp-api.jar"/>
31
                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
31
    </path>
32
                <pathelement location="../../core/netbeans/lib/core.jar"/>
32
  </target>
33
								<pathelement location="../../utilities/netbeans/modules/utilities.jar"/> <!-- XXX: depends on OpenFile -->
33
34
								<pathelement location="../../autoupdate/netbeans/modules/autoupdate.jar"/>
34
35
								<pathelement location="../../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
35
  <target name="compile" depends="init">
36
            </classpath>
36
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
        </javac>
37
      <classpath refID="cp"/>
38
    </target>
38
    </javac>
39
  </target>
39
      
40
      
40
    <target name="jars" depends="compile">
41
  <target name="jars" depends="compile">
41
    <mkdir dir="netbeans/modules"/>
42
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
42
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
    <locjar jarfile="netbeans/modules/welcome.jar"
45
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/welcome.jar"
45
            manifest="manifest-subst.mf"
46
         manifest="manifest-subst.mf"
46
            basedir="src"
47
         basedir="src"
47
	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
48
	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
48
	    compress="false">
49
	 compress="false"/>
49
      <locale name="ja"/>
50
		</locjar>
51
  </target>
50
  </target>
52
51
53
  <target name="netbeans" depends="jars">
52
  <target name="netbeans" depends="jars">
54
    <genlist targetname="nbm" outputfiledir="netbeans"/>
53
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/welcome.jar">
54
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
55
         <patternset refID="ui/welcome.files"/>
56
       </fileset>
57
    </genlist>
55
  </target>
58
  </target>
56
59
57
  <target name="nbm" depends="netbeans">
60
  <target name="nbm" depends="netbeans">
58
    <makenbm file="welcome.nbm"
61
    <makenbm file="welcome.nbm"
59
             topdir="."
62
             productdir="${netbeans.dest.dir}/${cluster.dir}"
60
             module="netbeans/modules/welcome.jar"
63
             module="${nb.modules.dir}/welcome.jar"
61
	     homepage="http://welcome.${homepage.base}/"
64
	     homepage="http://welcome.${homepage.base}/"
62
	     distribution="http://${dist.base}/welcome.nbm">
65
	     distribution="http://${dist.base}/welcome.nbm">
63
      <license file="${license.file}"/>
66
      <license file="${license.file}"/>
Lines 65-80 Link Here
65
    </makenbm>
68
    </makenbm>
66
  </target>
69
  </target>
67
70
68
  <target name="clean">
71
  <target name="clean" depends="init">
69
    <delete>
72
    <delete>
70
      <fileset dir="src">
73
      <fileset dir="src">
71
        <include name="**/*.class"/>
74
        <include name="**/*.class"/>
72
      </fileset>
75
      </fileset>
76
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
77
        <patternset refID="ui/welcome.files"/>
78
      </fileset>
73
    </delete>
79
    </delete>
74
    <delete file="manifest-subst.mf"/>
80
    <delete file="manifest-subst.mf"/>
75
    <delete file="welcome.nbm"/>
81
    <delete file="welcome.nbm"/>
76
    <delete dir="netbeans"/>
77
    <delete dir="Info"/>
78
  </target>
82
  </target>
79
83
80
<!--    <target depends="init" description="Javadoc for my API." name="javadoc">
84
<!--    <target depends="init" description="Javadoc for my API." name="javadoc">
(-)usersguide/build.xml (-50 / +50 lines)
Lines 13-37 Link Here
13
-->
13
-->
14
14
15
<project name="usersguide" default="netbeans" basedir=".">
15
<project name="usersguide" default="netbeans" basedir=".">
16
  <import file="../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="usersguide.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/usersguide.jar"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
      <include name="${nb.modules/docs.dir}/usersguide.jar"/>
21
22
      <include name="${nb.beans.dir}/TimerBean.jar"/>
22
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
23
      <include name="${nb.sources.dir}/org/netbeans/examples/lib/timerbean/**"/>
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
24
    </patternset>
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
25
    <path id="cp">
25
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
    </path>
30
  </target>
26
31
27
  <target name="compile">
32
  <target name="compile" depends="init">
28
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
33
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
      <classpath>
34
      <classpath refID="cp"/>
30
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
31
        <fileset dir="../openide/netbeans/lib">
32
          <include name="openide*.jar" />
33
        </fileset>
34
      </classpath>
35
    </javac>
35
    </javac>
36
    <!-- #24191: always turn on debug info for these sources -->
36
    <!-- #24191: always turn on debug info for these sources -->
37
    <javac destdir="demosrc" srcdir="demosrc" deprecation="true" debug="true">
37
    <javac destdir="demosrc" srcdir="demosrc" deprecation="true" debug="true">
Lines 49-78 Link Here
49
  </target>
49
  </target>
50
50
51
  <target name="jars" depends="tojar">
51
  <target name="jars" depends="tojar">
52
    <mkdir dir="netbeans/modules"/>
52
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
53
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
53
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
54
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
54
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
55
    <locjar jarfile="netbeans/modules/usersguide.jar"
55
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/usersguide.jar"
56
            manifest="manifest-subst.mf"
56
         manifest="manifest-subst.mf"
57
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
57
	 excludesfile="../nbbuild/standard-jar-excludes.txt"
58
	    compress="false"
58
	 compress="false"
59
            basedir="src">
59
         basedir="src"/>
60
      <locale name="ja"/>
61
    </locjar>
62
  </target>
60
  </target>
63
61
64
  <target name="release">
62
  <target name="release" depends="init">
65
    <copy todir="netbeans">
63
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.beans.dir}">
66
      <fileset dir="release"/>
64
      <fileset dir="release/beans"/>
65
    </copy>
66
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.sources.dir}">
67
      <fileset dir="release/sources"/>
67
    </copy>
68
    </copy>
68
  </target>
69
  </target>
69
70
70
  <target name="javahelp">
71
  <target name="javahelp" depends="init">
71
    <mkdir dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
72
    <mkdir dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
72
    <jhindexer basedir="javahelp/org/netbeans/modules/usersguide"
73
    <jhindexer basedir="javahelp/org/netbeans/modules/usersguide"
73
               db="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2">
74
               db="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2">
74
      <classpath>
75
      <classpath>
75
        <fileset dir="../nbbuild/external">
76
        <fileset dir="${nb_all}/nbbuild/external">
76
          <include name="jhall*.jar"/>
77
          <include name="jhall*.jar"/>
77
        </fileset>
78
        </fileset>
78
      </classpath>
79
      </classpath>
Lines 82-89 Link Here
82
      <exclude name="pending.html"/>
83
      <exclude name="pending.html"/>
83
      <exclude name="ja/"/>
84
      <exclude name="ja/"/>
84
    </jhindexer>
85
    </jhindexer>
85
    <mkdir dir="netbeans/modules/docs"/>
86
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
86
    <locjar jarfile="netbeans/modules/docs/usersguide.jar"
87
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/usersguide.jar"
87
	    compress="true">
88
	    compress="true">
88
      <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt">
89
      <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt">
89
        <!-- Temporary files, or preprocessing scripts: -->
90
        <!-- Temporary files, or preprocessing scripts: -->
Lines 95-114 Link Here
95
        <exclude name="**/usergdto.xml"/>
96
        <exclude name="**/usergdto.xml"/>
96
        <exclude name="org/netbeans/modules/usersguide/ide.css"/>
97
        <exclude name="org/netbeans/modules/usersguide/ide.css"/>
97
      </fileset>
98
      </fileset>
98
      <locale name="ja"/>
99
    </jar>
99
    </locjar>
100
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/org/netbeans/modules/usersguide"/>
100
    <mkdir dir="netbeans/docs/org/netbeans/modules/usersguide"/>
101
    <copy file="javahelp/org/netbeans/modules/usersguide/ide.css" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/org/netbeans/modules/usersguide/ide.css"/>
101
    <copy file="javahelp/org/netbeans/modules/usersguide/ide.css" tofile="netbeans/docs/org/netbeans/modules/usersguide/ide.css"/>
102
  </target>
102
  </target>
103
103
104
  <target name="netbeans" depends="jars,release,javahelp">
104
  <target name="netbeans" depends="jars,release,javahelp">
105
    <genlist targetname="nbm" outputfiledir="netbeans"/>
105
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/usersguide.jar">
106
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
107
         <patternset refID="usersguide.files"/>
108
       </fileset>
109
    </genlist>
106
  </target>
110
  </target>
107
111
108
  <target name="nbm" depends="netbeans">
112
  <target name="nbm" depends="netbeans">
109
    <makenbm file="usersguide.nbm"
113
    <makenbm file="usersguide.nbm"
110
             topdir="."
114
             productdir="${netbeans.dest.dir}/${cluster.dir}"
111
             module="netbeans/modules/usersguide.jar"
115
             module="${nb.modules.dir}/usersguide.jar"
112
	     homepage="http://usersguide.${homepage.base}/"
116
	     homepage="http://usersguide.${homepage.base}/"
113
	     distribution="http://${dist.base}/usersguide.nbm">
117
	     distribution="http://${dist.base}/usersguide.nbm">
114
      <license file="${license.file}"/>
118
      <license file="${license.file}"/>
Lines 116-126 Link Here
116
    </makenbm>
120
    </makenbm>
117
  </target>
121
  </target>
118
122
119
  <target name="clean">
123
  <target name="clean" depends="init">
120
    <delete file="manifest-subst.mf"/>
124
    <delete file="manifest-subst.mf"/>
121
    <delete file="usersguide.nbm"/>
125
    <delete file="usersguide.nbm"/>
122
    <delete dir="netbeans"/>
123
    <delete dir="Info"/>
124
    <delete>
126
    <delete>
125
      <fileset dir="src">
127
      <fileset dir="src">
126
        <include name="**/*.class"/>
128
        <include name="**/*.class"/>
Lines 128-133 Link Here
128
      <fileset dir="demosrc">
130
      <fileset dir="demosrc">
129
        <include name="**/*.class"/>
131
        <include name="**/*.class"/>
130
      </fileset>
132
      </fileset>
133
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
134
        <patternset refID="usersguide.files"/>
135
      </fileset>
131
    </delete>
136
    </delete>
132
    <delete dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
137
    <delete dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
133
    <delete file="src/org/netbeans/modules/usersguide/demosrc.zip"/>
138
    <delete file="src/org/netbeans/modules/usersguide/demosrc.zip"/>
Lines 137-144 Link Here
137
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
142
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
138
    <taskdef name="checkhelpsets" classname="org.netbeans.nbbuild.CheckHelpSets">
143
    <taskdef name="checkhelpsets" classname="org.netbeans.nbbuild.CheckHelpSets">
139
      <classpath>
144
      <classpath>
140
        <pathelement location="../nbbuild/nbantext.jar"/>
145
        <pathelement location="${nb_all}/nbbuild/nbantext.jar"/>
141
        <fileset dir="../nbbuild/external">
146
        <fileset dir="${nb_all}/nbbuild/external">
142
          <include name="jhall*.jar"/>
147
          <include name="jhall*.jar"/>
143
        </fileset>
148
        </fileset>
144
      </classpath>
149
      </classpath>
Lines 150-156 Link Here
150
    </checkhelpsets>
155
    </checkhelpsets>
151
  </target>
156
  </target>
152
157
153
  <target name="javadoc" description="Build usersguide module API documentation.">
158
  <target name="javadoc" depends="init" description="Build usersguide module API documentation.">
154
    <tstamp/>
159
    <tstamp/>
155
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
160
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
156
    <echo message="Build usersguide module API documentation..."/>
161
    <echo message="Build usersguide module API documentation..."/>
Lines 169-180 Link Here
169
      <sourcepath>
174
      <sourcepath>
170
        <pathelement location="src"/>
175
        <pathelement location="src"/>
171
      </sourcepath>
176
      </sourcepath>
172
      <classpath>
177
      <classpath refID="cp"/>
173
	<pathelement location="../openide/openide-13javac-workaround.jar"/>
174
        <fileset dir="../openide/netbeans/lib">
175
          <include name="openide*.jar" />
176
        </fileset>
177
      </classpath>
178
    </javadoc>    
178
    </javadoc>    
179
  </target>
179
  </target>
180
180
(-)utilities/build.xml (-42 / +44 lines)
Lines 13-54 Link Here
13
-->
13
-->
14
14
15
<project name="utilities" default="netbeans" basedir=".">
15
<project name="utilities" default="netbeans" basedir=".">
16
16
  <import file="../nbbuild/default.xml"/>
17
  <property name="nbm_alias" value="nb_ide"/>
17
  
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
21
  <property name="javadoc.destdir.default" value="javadoc"/>
18
  <property name="javadoc.destdir.default" value="javadoc"/>
22
  <property name="javadoc.extra.param" value=""/>
19
  <property name="javadoc.extra.param" value=""/>
23
  <property name="javadoc.private" value="false"/>
20
  <property name="javadoc.private" value="false"/>
24
21
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
22
  <target name="init" depends="default.init">
26
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
23
    <patternset id="utilities.files">
27
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
24
      <include name="${nb.modules.dir}/utilities.jar"/>
28
25
      <include name="${nb.lib.dir}/openfile-cli.jar"/>
29
  <target name="init">
26
    </patternset>
30
    <path id="utilities-cp">
27
31
      <pathelement location="../openide/openide-13javac-workaround.jar"/>
28
    <path id="cp">
32
      <pathelement location="../openide/netbeans/lib/openide.jar"/>
29
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
33
      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
34
      <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
31
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
35
      <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
32
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
36
      <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
33
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
34
      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
37
      <pathelement location="clisrc"/>
35
      <pathelement location="clisrc"/>
38
    </path>
36
    </path>
37
    <path id="cli-cp">
38
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
39
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
40
      <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
41
    </path>
39
  </target>
42
  </target>
40
  
43
41
  <target name="compile-cli">
44
  <target name="compile-cli" depends="init">
42
    <javac srcdir="clisrc"
45
    <javac srcdir="clisrc"
43
           destdir="clisrc"
46
           destdir="clisrc"
44
           deprecation="${build.compiler.deprecation}"
47
           deprecation="${build.compiler.deprecation}"
45
           debug="${build.compiler.debug}"
48
           debug="${build.compiler.debug}"
46
           source="1.4">
49
           source="1.4">
47
      <classpath>
50
      <classpath refID="cli-cp"/>
48
        <!-- Compiles against org.netbeans.CLIHandler: -->
49
        <pathelement location="../core/netbeans/lib/ext/boot.jar"/>
50
        <pathelement location="../openide/netbeans/lib/openide.jar"/>
51
      </classpath>
52
    </javac>
51
    </javac>
53
  </target>
52
  </target>
54
53
Lines 58-92 Link Here
58
           deprecation="${build.compiler.deprecation}"
57
           deprecation="${build.compiler.deprecation}"
59
           debug="${build.compiler.debug}"
58
           debug="${build.compiler.debug}"
60
           source="1.4">
59
           source="1.4">
61
      <classpath refid="utilities-cp"/>
60
      <classpath refid="cp"/>
62
    </javac>
61
    </javac>
63
  </target>
62
  </target>
64
63
65
  <target name="jars" depends="compile">
64
  <target name="jars" depends="compile">
66
    <mkdir dir="netbeans/modules"/>
65
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
67
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
66
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
68
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
67
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
69
    <locjar jarfile="netbeans/modules/utilities.jar"
68
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/utilities.jar"
70
            manifest="manifest-subst.mf"
69
         manifest="manifest-subst.mf"
71
            basedir="src"
70
         basedir="src"
72
            excludesfile="../nbbuild/standard-jar-excludes.txt"
71
         excludesfile="../nbbuild/standard-jar-excludes.txt"
73
            compress="false">
72
         compress="false"/>
74
      <locale name="ja"/>
73
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
75
    </locjar>
74
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openfile-cli.jar">
76
    <mkdir dir="netbeans/lib"/>
77
    <jar jarfile="netbeans/lib/openfile-cli.jar">
78
      <fileset dir="clisrc" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
75
      <fileset dir="clisrc" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
79
    </jar>
76
    </jar>
80
  </target>
77
  </target>
81
78
82
  <target name="netbeans" depends="jars" description="Build everything.">
79
  <target name="netbeans" depends="jars" description="Build everything.">
83
    <genlist targetname="nbm" outputfiledir="netbeans"/>
80
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/utilities.jar">
81
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
82
        <patternset refID="utilities.files"/>
83
      </fileset>
84
    </genlist>
84
  </target>
85
  </target>
85
86
86
  <target name="nbm" depends="netbeans" description="Build an NBM.">
87
  <target name="nbm" depends="netbeans" description="Build an NBM.">
87
    <makenbm file="utilities.nbm"
88
    <makenbm file="utilities.nbm"
88
             topdir="."
89
             productdir="${netbeans.dest.dir}/${cluster.dir}"
89
             module="netbeans/modules/utilities.jar"
90
             module="${nb.modules.dir}/utilities.jar"
90
	     homepage="http://utilities.${homepage.base}/"
91
	     homepage="http://utilities.${homepage.base}/"
91
	     distribution="http://${dist.base}/utilities.nbm">
92
	     distribution="http://${dist.base}/utilities.nbm">
92
      <license file="${license.file}"/>
93
      <license file="${license.file}"/>
Lines 94-100 Link Here
94
    </makenbm>
95
    </makenbm>
95
  </target>
96
  </target>
96
97
97
  <target name="clean" description="Clean everything.">
98
  <target name="clean" depends="init" description="Clean everything.">
98
    <delete>
99
    <delete>
99
      <fileset dir="src">
100
      <fileset dir="src">
100
        <include name="**/*.class"/>
101
        <include name="**/*.class"/>
Lines 102-113 Link Here
102
      <fileset dir="clisrc">
103
      <fileset dir="clisrc">
103
        <include name="**/*.class"/>
104
        <include name="**/*.class"/>
104
      </fileset>
105
      </fileset>
106
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
107
        <patternset refID="utilities.files"/>
108
      </fileset>
105
    </delete>
109
    </delete>
106
    <delete file="manifest-subst.mf"/>
110
    <delete file="manifest-subst.mf"/>
107
    <delete file="utilities.nbm"/>
111
    <delete file="utilities.nbm"/>
108
    <delete dir="netbeans"/>
109
    <delete dir="${javadoc.destdir.default}"/>
112
    <delete dir="${javadoc.destdir.default}"/>
110
    <delete dir="Info"/>
111
  </target>
113
  </target>
112
114
113
  <target name="check-javadoc-destdir-overridden"
115
  <target name="check-javadoc-destdir-overridden"
Lines 172-178 Link Here
172
        <pathelement location="loaderswitcher/src"/>
174
        <pathelement location="loaderswitcher/src"/>
173
        <pathelement location="group/src"/>
175
        <pathelement location="group/src"/>
174
      </sourcepath>
176
      </sourcepath>
175
      <classpath refid="utilities-cp"/>
177
      <classpath refid="cp"/>
176
      <classpath>
178
      <classpath>
177
        <fileset dir="..">
179
        <fileset dir="..">
178
          <patternset includes="openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
180
          <patternset includes="openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
(-)utilities/group/build.xml (-29 / +32 lines)
Lines 13-64 Link Here
13
-->
13
-->
14
14
15
<project name="utilities/group" default="netbeans" basedir=".">
15
<project name="utilities/group" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/>
17
  
16
18
17
    <property name="nbroot" location="../.."/>
19
    <target name="init" depends="default.init">
18
20
      <patternset id="utilities/group.files">
19
    <property name="nbm_alias" value="nb_ide"/>
21
        <include name="${nb.modules.dir}/group.jar"/>
20
    <property name="homepage.base" value="netbeans.org"/>
22
      </patternset>
21
    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
22
    <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24
      <path id="cp">
23
25
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
27
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
28
      </path>
29
    </target>
27
30
28
    <target name="compile">
31
    <target name="compile" depends="init">
29
        <javac srcdir="src"
32
        <javac srcdir="src"
30
               destdir="src"
33
               destdir="src"
31
               deprecation="${build.compiler.deprecation}"
34
               deprecation="${build.compiler.deprecation}"
32
               debug="${build.compiler.debug}"
35
               debug="${build.compiler.debug}"
33
               source="1.4">
36
               source="1.4">
34
            <classpath>
37
            <classpath refID="cp"/>
35
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
36
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
37
            </classpath>
38
        </javac>
38
        </javac>
39
    </target>
39
    </target>
40
40
41
    <target name="jars" depends="compile">
41
    <target name="jars" depends="compile">
42
        <mkdir dir="netbeans/modules"/>
42
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
43
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
43
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
44
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
44
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
45
        <locjar jarfile="netbeans/modules/group.jar"
45
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/group.jar"
46
                manifest="manifest-subst.mf"
46
             manifest="manifest-subst.mf"
47
                basedir="src"
47
             basedir="src"
48
                excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
48
             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
49
                compress="false">
49
             compress="false"/>
50
            <locale name="ja"/>
51
        </locjar>
52
    </target>
50
    </target>
53
51
54
    <target name="netbeans" depends="jars">
52
    <target name="netbeans" depends="jars">
55
        <genlist targetname="nbm" outputfiledir="netbeans"/>
53
        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/group.jar">
54
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
55
                <patternset refID="utilities/group.files"/>
56
            </fileset>
57
        </genlist>
56
    </target>
58
    </target>
57
59
58
    <target name="nbm" depends="netbeans">
60
    <target name="nbm" depends="netbeans">
59
        <makenbm file="group.nbm"
61
        <makenbm file="group.nbm"
60
                 topdir="."
62
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
61
                 module="netbeans/modules/group.jar"
63
                 module="${nb.modules.dir}/group.jar"
62
                 homepage="http://${homepage.base}/#group"
64
                 homepage="http://${homepage.base}/#group"
63
                 distribution="http://${dist.base}/group.nbm">
65
                 distribution="http://${dist.base}/group.nbm">
64
            <license file="${license.file}"/>
66
            <license file="${license.file}"/>
Lines 66-81 Link Here
66
        </makenbm>
68
        </makenbm>
67
    </target>
69
    </target>
68
70
69
    <target name="clean">
71
    <target name="clean" depends="init">
70
        <delete>
72
        <delete>
71
          <fileset dir="src">
73
          <fileset dir="src">
72
              <include name="**/*.class"/>
74
              <include name="**/*.class"/>
73
          </fileset>
75
          </fileset>
76
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
77
              <patternset refID="utilities/group.files"/>
78
          </fileset>
74
        </delete>
79
        </delete>
75
        <delete file="manifest-subst.mf"/>
80
        <delete file="manifest-subst.mf"/>
76
        <delete file="group.nbm"/>
81
        <delete file="group.nbm"/>
77
        <delete dir="netbeans"/>
78
        <delete dir="Info"/>
79
    </target>
82
    </target>
80
83
81
</project>
84
</project>
(-)vcscore/build.xml (-34 / +33 lines)
Lines 15-67 Link Here
15
<!-- Special targets: vcs-apis -->
15
<!-- Special targets: vcs-apis -->
16
16
17
<project name="vcscore" default="netbeans" basedir=".">
17
<project name="vcscore" default="netbeans" basedir=".">
18
  <import file="../nbbuild/default.xml"/> 
18
19
19
  <property name="nbroot" value=".."/>
20
  <target name="init" depends="default.init">
20
  <property name="nbm_alias" value="nb_ide"/>
21
    <patternset id="vcscore.files">
21
  <property name="homepage.base" value="netbeans.org"/>
22
      <include name="${nb.modules/autoload.dir}/vcscore.jar"/>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
    </patternset>
23
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
24
    <path id="cp">
24
25
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
26
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
27
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
28
29
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
29
  <path id="cp">
30
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
30
    <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
31
    </path>
31
    <pathelement location="../openide/openide-13javac-workaround.jar"/>
32
  </target>
32
    <pathelement location="../openide/netbeans/lib/openide.jar"/>
33
    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
34
    <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
35
    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
36
  </path>
37
33
38
  <target name="compile">
34
  <target name="compile" depends="init">
39
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
40
      <classpath refid="cp"/>
36
      <classpath refid="cp"/>
41
    </javac>
37
    </javac>
42
  </target>
38
  </target>
43
39
44
  <target name="jars" depends="compile">
40
  <target name="jars" depends="compile">
45
    <mkdir dir="netbeans/modules/autoload"/>
41
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
46
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
47
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
48
    <locjar jarfile="netbeans/modules/autoload/vcscore.jar"
44
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/vcscore.jar"
49
            manifest="manifest-subst.mf"
45
         manifest="manifest-subst.mf"
50
            basedir="src"
46
         basedir="src"
51
	    excludesfile="../nbbuild/standard-jar-excludes.txt"
47
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
52
	    compress="false">
48
	 compress="false"/>
53
      <locale name="ja"/>
54
    </locjar>
55
  </target>
49
  </target>
56
50
57
  <target name="netbeans" depends="jars">
51
  <target name="netbeans" depends="jars">
58
    <genlist targetname="nbm" outputfiledir="netbeans"/>
52
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/vcscore.jar">
53
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
         <patternset refID="vcscore.files"/>
55
       </fileset>
56
    </genlist>
59
  </target>
57
  </target>
60
58
61
  <target name="nbm" depends="netbeans">
59
  <target name="nbm" depends="netbeans">
62
    <makenbm file="vcscore.nbm"
60
    <makenbm file="vcscore.nbm"
63
             topdir="."
61
             productdir="${netbeans.dest.dir}/${cluster.dir}"
64
             module="netbeans/modules/autoload/vcscore.jar"
62
             module="${nb.modules/autoload.dir}/vcscore.jar"
65
	     homepage="http://vcscore.${homepage.base}/"
63
	     homepage="http://vcscore.${homepage.base}/"
66
	     distribution="http://${dist.base}/vcscore.nbm">
64
	     distribution="http://${dist.base}/vcscore.nbm">
67
      <license file="${license.file}"/>
65
      <license file="${license.file}"/>
Lines 69-75 Link Here
69
    </makenbm>
67
    </makenbm>
70
  </target>
68
  </target>
71
69
72
  <target name="javadoc" description="Build Javadoc.">
70
  <target name="javadoc" depends="init" description="Build Javadoc.">
73
    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
71
    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
74
      <property name="javadoc.base" location="."/>
72
      <property name="javadoc.base" location="."/>
75
      <property name="javadoc.name" value="VCSAPI"/>
73
      <property name="javadoc.name" value="VCSAPI"/>
Lines 82-98 Link Here
82
    </ant>
80
    </ant>
83
  </target>
81
  </target>
84
82
85
  <target name="clean">
83
  <target name="clean" depends="init">
86
    <delete>
84
    <delete>
87
      <fileset dir="src">
85
      <fileset dir="src">
88
        <include name="**/*.class"/>
86
        <include name="**/*.class"/>
89
      </fileset>
87
      </fileset>
88
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
89
        <patternset refID="vcscore.files"/>
90
      </fileset>
90
    </delete>
91
    </delete>
91
    <delete file="manifest-subst.mf"/>
92
    <delete file="manifest-subst.mf"/>
92
    <delete file="vcscore.nbm"/>
93
    <delete file="vcscore.nbm"/>
93
    <delete dir="netbeans"/>
94
    <delete dir="javadoc"/>
94
    <delete dir="javadoc"/>
95
    <delete dir="Info"/>
96
  </target>
95
  </target>
97
96
98
</project>
97
</project>
(-)vcscvs/compat/build.xml (-47 / +38 lines)
Lines 12-65 Link Here
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
14
15
<project name="vcscvs" default="netbeans" basedir=".">
15
<project name="vcscvs/compat" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <property name="nbm_alias" value="nb_ide"/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
    <patternset id="vcscvs/compat.files">
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
      <include name="${nb.modules.dir}/cvscompat.jar"/>
20
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
21
    </patternset>
21
22
    <path id="cp">
22
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
23
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
27
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
28
      <fileset dir="${nb_all}/libs/external">
29
        <include name="regexp*.jar" />
30
      </fileset>
31
    </path>
32
  </target>
25
33
26
  <target name="compile">
34
  <target name="compile" depends="init">
27
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
28
      <classpath>
36
      <classpath refID="cp"/>
29
        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
30
        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
31
	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
32
        <fileset dir="../../openide/netbeans/lib">
33
          <include name="openide*.jar" />
34
        </fileset>
35
        <fileset dir="../../libs/external">
36
          <include name="regexp*.jar" />
37
        </fileset>
38
      </classpath>
39
    </javac>
37
    </javac>
40
  </target>
38
  </target>
41
39
42
  <target name="jars" depends="compile">
40
  <target name="jars" depends="compile">
43
    <mkdir dir="netbeans/modules"/>
41
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
44
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
45
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
46
    <locjar jarfile="netbeans/modules/cvscompat.jar"
44
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/cvscompat.jar"
47
            manifest="manifest-subst.mf"
45
         manifest="manifest-subst.mf"
48
            basedir="src"
46
         basedir="src"
49
	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
47
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
50
	    compress="false">
48
	 compress="false"/>
51
      <locale name="ja"/>
52
    </locjar>
53
  </target>
49
  </target>
54
50
55
  <target name="netbeans" depends="jars">
51
  <target name="netbeans" depends="jars">
56
    <genlist targetname="nbm" outputfiledir="netbeans"/>
52
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/cvscompat.jar">
53
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
54
         <patternset refID="vcscvs/compat.files"/>
55
       </fileset>
56
    </genlist>
57
  </target>
57
  </target>
58
58
59
  <target name="nbm" depends="netbeans">
59
  <target name="nbm" depends="netbeans">
60
    <makenbm file="vcscvscompat.nbm"
60
    <makenbm file="vcscvscompat.nbm"
61
             topdir="."
61
             productdir="${netbeans.dest.dir}/${cluster.dir}"
62
             module="netbeans/modules/cvscompat.jar"
62
             module="${nb.modules.dir}/cvscompat.jar"
63
	     homepage="http://vcscvs.${homepage.base}/"
63
	     homepage="http://vcscvs.${homepage.base}/"
64
	     distribution="http://${dist.base}/vcscvscompat.nbm">
64
	     distribution="http://${dist.base}/vcscvscompat.nbm">
65
      <license file="${license.file}"/>
65
      <license file="${license.file}"/>
Lines 67-85 Link Here
67
    </makenbm>
67
    </makenbm>
68
  </target>
68
  </target>
69
69
70
  <target name="clean">
70
  <target name="clean" depends="init">
71
    <delete>
71
    <delete>
72
      <fileset dir="src">
72
      <fileset dir="src">
73
        <include name="**/*.class"/>
73
        <include name="**/*.class"/>
74
      </fileset>
74
      </fileset>
75
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
76
        <patternset refID="vcscvs/compat.files"/>
77
      </fileset>
75
    </delete>
78
    </delete>
76
    <delete file="manifest-subst.mf"/>
79
    <delete file="manifest-subst.mf"/>
77
    <delete file="vcscvscompat.nbm"/>
80
    <delete file="vcscvscompat.nbm"/>
78
    <delete dir="netbeans"/>
79
    <delete dir="Info"/>
80
  </target>
81
  </target>
81
82
82
  <target name="javadoc" description="Build vcscvs compat module API documentation.">
83
  <target name="javadoc" depends="init" description="Build vcscvs compat module API documentation.">
83
    <tstamp/>
84
    <tstamp/>
84
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
85
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
85
    <echo message="Build vcscvs compat module API documentation..."/>
86
    <echo message="Build vcscvs compat module API documentation..."/>
Lines 98-114 Link Here
98
      <sourcepath>
99
      <sourcepath>
99
        <pathelement location="src"/>
100
        <pathelement location="src"/>
100
      </sourcepath>
101
      </sourcepath>
101
      <classpath>
102
      <classpath refID="cp"/>
102
        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
103
        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
104
	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
105
        <fileset dir="../../openide/netbeans/lib">
106
          <include name="openide*.jar" />
107
        </fileset>
108
        <fileset dir="../../libs/external">
109
          <include name="regexp*.jar" />
110
        </fileset>
111
      </classpath>
112
    </javadoc>    
103
    </javadoc>    
113
  </target>
104
  </target>
114
105
(-)vcsgeneric/build.xml (-76 / +36 lines)
Lines 14-55 Link Here
14
14
15
15
16
<project name="vcsgeneric" default="netbeans" basedir=".">
16
<project name="vcsgeneric" default="netbeans" basedir=".">
17
17
  <import file="../nbbuild/default.xml"/> 
18
  <property name="nbroot" location=".."/>
19
  <property name="nbext" location="${nbroot}/nbbuild"/>
20
  <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
  <property name="nbm_alias" value="nb_ide"/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
25
18
26
  <property name="stdprofiles" value="cvsprofiles, pvcs, vss"/>
19
  <property name="stdprofiles" value="cvsprofiles, pvcs, vss"/>
20
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
27
21
28
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
22
  <target name="init" depends="default.init">
29
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
23
    <patternset id="vcsgeneric.files">
30
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
24
      <include name="${nb.modules.dir}/vcsgen.jar"/>
31
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
25
    </patternset>
32
  <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
26
    <path id="cp">
33
  <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="${nbext}/nbantext.jar"/>
27
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
28
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
32
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
33
      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
34
    </path>
35
  </target>
34
36
35
  <target name="compile">
37
  <target name="compile" depends="init">
36
    <javac srcdir="src" 
38
    <javac srcdir="src" 
37
        deprecation="${build.compiler.deprecation}" 
39
        deprecation="${build.compiler.deprecation}" 
38
        debug="${build.compiler.debug}"
40
        debug="${build.compiler.debug}"
39
        destdir="src"
41
        destdir="src"
40
        excludes="org/netbeans/modules/vcs/advanced/config/">
42
        excludes="org/netbeans/modules/vcs/advanced/config/">
41
      <classpath>        
43
      <classpath refID="cp"/>
42
	      <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
43
        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
44
        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
        <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
46
	      <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
47
	      <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
48
        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
49
      </classpath>
50
    </javac>
44
    </javac>
51
    <!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->
52
    <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
53
  </target>
45
  </target>
54
46
55
  <target name="jars" depends="compile">
47
  <target name="jars" depends="compile">
Lines 74-90 Link Here
74
    <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/advanced/config/layer-includes-resources.xml" absolutepath="true">
66
    <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/advanced/config/layer-includes-resources.xml" absolutepath="true">
75
       <include name="org/netbeans/modules/vcs/profiles/resources/*.*"/>
67
       <include name="org/netbeans/modules/vcs/profiles/resources/*.*"/>
76
    </makelayer>
68
    </makelayer>
77
    <mkdir dir="netbeans/modules"/>
69
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
78
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
70
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
79
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
71
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
80
    <locjar jarfile="netbeans/modules/vcsgen.jar"
72
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/vcsgen.jar"
81
         manifest="manifest-subst.mf"
73
         manifest="manifest-subst.mf"
82
         basedir="src"
74
         basedir="src"
83
         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
75
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
84
	 excludes="org/netbeans/modules/vcs/advanced/config/mf-layer_XX.xml" 
76
	 excludes="org/netbeans/modules/vcs/advanced/config/mf-layer_XX.xml" 
85
         compress="false">
77
         compress="false">
86
      <locale name="ja"/>
78
      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
87
      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
88
        <include name="org/netbeans/modules/vcs/profiles/**/*"/>
79
        <include name="org/netbeans/modules/vcs/profiles/**/*"/>
89
	<exclude name="org/netbeans/modules/vcs/profiles/config/*_XX.*"/>
80
	<exclude name="org/netbeans/modules/vcs/profiles/config/*_XX.*"/>
90
      </fileset>
81
      </fileset>
Lines 92-124 Link Here
92
        <include name="org/netbeans/modules/vcs/profiles/**/*.java"/>
83
        <include name="org/netbeans/modules/vcs/profiles/**/*.java"/>
93
        <include name="org/netbeans/modules/vcs/profiles/**/*.form"/>
84
        <include name="org/netbeans/modules/vcs/profiles/**/*.form"/>
94
      </fileset>
85
      </fileset>
95
    </locjar>
86
    </jar>
96
    <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
97
<!--    <nbmerge dest="netbeans" topdir="profiles" modules="${stdprofiles}" targetprefix="profile-"/>-->
98
   <!--
99
    <patternset id="stdprofilesFolders" includes="${stdprofiles}"/>
100
    <copy todir="netbeans/modules" flatten="true" includeEmptyDirs="false">
101
      <fileset dir="profiles">
102
        <patternset refid="stdprofilesFolders">
103
          <include name="**/*.jar"/>
104
          <exclude name="**/*_??.jar"/>
105
        </patternset>
106
      </fileset>
107
    </copy>
108
   -->
109
   <!--
110
    <copydir src="profiles" dest="netbeans/modules" flatten="true" includes="${stdprofiles}">
111
      <patternset id="stdprofiles.jars">
112
        <include name="**/*.jar"/>
113
        <exclude name="**/*_??.jar"/>
114
      </patternset>
115
    </copydir>
116
    <copydir src="profiles" dest="netbeans/modules/locale" flatten="true" includes="${stdprofiles}">
117
      <patternset id="stdprofiles.jars">
118
        <include name="**/*_??.jar"/>
119
      </patternset>
120
    </copydir>
121
  -->
122
  </target>
87
  </target>
123
88
124
  <target name="profile-cvsprofiles">
89
  <target name="profile-cvsprofiles">
Lines 135-147 Link Here
135
  </target>
100
  </target>
136
101
137
  <target name="netbeans" depends="jars">
102
  <target name="netbeans" depends="jars">
138
    <genlist targetname="nbm" outputfiledir="netbeans"/>
103
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/vcsgen.jar">
104
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
105
         <patternset refID="vcsgeneric.files"/>
106
       </fileset>
107
    </genlist>
139
  </target>
108
  </target>
140
109
141
  <target name="nbm" depends="netbeans">
110
  <target name="nbm" depends="netbeans">
142
    <makenbm file="vcsgen.nbm"
111
    <makenbm file="vcsgen.nbm"
143
             topdir="."
112
             productdir="${netbeans.dest.dir}/${cluster.dir}"
144
             module="netbeans/modules/vcsgen.jar"
113
             module="${nb.modules.dir}/vcsgen.jar"
145
	     homepage="http://vcsgeneric.${homepage.base}/"
114
	     homepage="http://vcsgeneric.${homepage.base}/"
146
	     distribution="http://${dist.base}/vcsgen.nbm">
115
	     distribution="http://${dist.base}/vcsgen.nbm">
147
      <license file="${license.file}"/>
116
      <license file="${license.file}"/>
Lines 149-170 Link Here
149
    </makenbm>
118
    </makenbm>
150
  </target>
119
  </target>
151
120
152
  <target name="clean">
121
  <target name="clean" depends="init">
153
    <delete>
122
    <delete>
154
      <fileset dir="src">
123
      <fileset dir="src">
155
        <include name="**/*.class"/>
124
        <include name="**/*.class"/>
156
        <include name="**/*.jar"/>
125
        <include name="**/*.jar"/>
157
        <include name="org/netbeans/modules/vcs/advanced/config/layer-include*.xml"/>
126
        <include name="org/netbeans/modules/vcs/advanced/config/layer-include*.xml"/>
158
      </fileset>
127
      </fileset>
128
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
129
        <patternset refID="vcsgeneric.files"/>
130
      </fileset>
159
    </delete>
131
    </delete>
160
    <delete file="manifest-subst.mf"/>
132
    <delete file="manifest-subst.mf"/>
161
    <delete file="vcsgen.nbm"/>
133
    <delete file="vcsgen.nbm"/>
162
    <delete dir="netbeans"/>
163
    <delete dir="javadoc"/>
134
    <delete dir="javadoc"/>
164
    <delete dir="Info"/>
165
  </target>
135
  </target>
166
136
167
  <target name="javadoc" description="Build vcsgeneric module API documentation.">
137
  <target name="javadoc" depends="init" description="Build vcsgeneric module API documentation.">
168
    <tstamp/>
138
    <tstamp/>
169
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
139
    <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
170
    <echo message="Build vcsgeneric module API documentation..."/>
140
    <echo message="Build vcsgeneric module API documentation..."/>
Lines 188-204 Link Here
188
        <pathelement location="profiles/starteam/common"/>
158
        <pathelement location="profiles/starteam/common"/>
189
        <pathelement location="profiles/vss/src"/>
159
        <pathelement location="profiles/vss/src"/>
190
      </sourcepath>
160
      </sourcepath>
191
      <classpath>
161
      <classpath refID="cp"/>
192
	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
193
        <!--<pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>-->
194
        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
195
        <fileset dir="${nbroot}/openide/netbeans/lib">
196
          <include name="openide*.jar" />
197
        </fileset>
198
	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
199
	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
200
        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
201
      </classpath>
202
    </javadoc>    
162
    </javadoc>    
203
  </target>
163
  </target>
204
164
(-)vcsgeneric/profiles/cvsprofiles/build.xml (-33 / +36 lines)
Lines 14-47 Link Here
14
14
15
15
16
<project name="vcsgeneric/profiles/cvsprofiles" default="netbeans" basedir=".">
16
<project name="vcsgeneric/profiles/cvsprofiles" default="netbeans" basedir=".">
17
  <import file="../../../nbbuild/default.xml"/>
17
18
18
  <property name="nbroot" location="../../.."/>
19
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
19
  <property name="nbext" location="${nbroot}/nbbuild"/>
20
  <property name="nbm_alias" value="nb_ide"/>
21
  <property name="homepage.base" value="netbeans.org"/>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
25
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
26
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
27
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
28
20
29
  <target name="compile">
21
  <target name="init" depends="default.init">
22
    <patternset id="vcsgeneric/profiles/cvsprofiles.files">
23
      <include name="${nb.modules.dir}/cvs-profile.jar"/>
24
    </patternset>
25
    <path id="cp">
26
      <pathelement location="${nb_all}/openide-13javac-workaround.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
30
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
31
      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
32
      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
33
      <pathelement location="${javacvs/libmodule.dir}/${nb.modules/autoload.dir}/cvslib.jar"/>
34
    </path>
35
  </target>
36
37
  <target name="compile" depends="init">
30
    <!--<echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}, nbext1 = ${nbext1}"/>-->
38
    <!--<echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}, nbext1 = ${nbext1}"/>-->
31
    <javac srcdir="src" 
39
    <javac srcdir="src" 
32
        deprecation="${build.compiler.deprecation}" 
40
        deprecation="${build.compiler.deprecation}" 
33
        debug="${build.compiler.debug}"
41
        debug="${build.compiler.debug}"
34
        destdir="src">
42
        destdir="src">
35
      <classpath>        
43
      <classpath refID="cp"/>
36
				<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
37
        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
38
        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
39
	      <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
40
	      <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
41
	      <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
42
        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
43
        <pathelement location="${nbroot}/javacvs/libmodule/netbeans/modules/autoload/cvslib.jar"/>
44
      </classpath>
45
    </javac>
44
    </javac>
46
  </target>
45
  </target>
47
46
Lines 76-92 Link Here
76
       <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.java"/>
75
       <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.java"/>
77
       <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.properties"/>
76
       <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.properties"/>
78
    </makelayer>
77
    </makelayer>
79
    <mkdir dir="netbeans/modules"/>
78
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
80
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
79
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
81
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
80
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
82
    <locjar jarfile="netbeans/modules/cvs-profile.jar"
81
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/cvs-profile.jar"
83
         manifest="manifest-subst.mf"
82
         manifest="manifest-subst.mf"
84
         basedir="src"
83
         basedir="src"
85
         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
84
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
86
	 excludes="src/org/netbeans/modules/vcs/profiles/cvsprofiles/mf-layer_XX.xml" 
85
	 excludes="src/org/netbeans/modules/vcs/profiles/cvsprofiles/mf-layer_XX.xml" 
87
         compress="false">
86
         compress="false">
88
      <locale name="ja"/>
87
      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
89
      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
90
        <include name="**/*"/>
88
        <include name="**/*"/>
91
	<exclude name="src/org/netbeans/modules/vcs/profiles/cvsprofiles/**/*_XX.*"/>
89
	<exclude name="src/org/netbeans/modules/vcs/profiles/cvsprofiles/**/*_XX.*"/>
92
      </fileset>
90
      </fileset>
Lines 94-110 Link Here
94
        <include name="**/*.java"/>
92
        <include name="**/*.java"/>
95
        <include name="**/*.form"/>
93
        <include name="**/*.form"/>
96
      </fileset>
94
      </fileset>
97
    </locjar>
95
    </jar>
98
  </target>
96
  </target>
99
97
100
  <target name="netbeans" depends="jars">
98
  <target name="netbeans" depends="jars">
101
    <genlist targetname="nbm" outputfiledir="netbeans"/>
99
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/cvs-profile.jar">
100
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
101
        <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
102
      </fileset>
103
    </genlist>
102
  </target>
104
  </target>
103
105
104
  <target name="nbm" depends="netbeans">
106
  <target name="nbm" depends="netbeans">
105
    <makenbm file="cvs-profile.nbm"
107
    <makenbm file="cvs-profile.nbm"
106
             topdir="."
108
             productdir="${netbeans.dest.dir}/${cluster.dir}"
107
             module="netbeans/modules/cvs-profile.jar"
109
             module="${nb.modules.dir}/cvs-profile.jar"
108
	     homepage="http://vcsgeneric.${homepage.base}/"
110
	     homepage="http://vcsgeneric.${homepage.base}/"
109
	     distribution="http://${dist.base}/cvs-profile.nbm">
111
	     distribution="http://${dist.base}/cvs-profile.nbm">
110
      <license file="${license.file}"/>
112
      <license file="${license.file}"/>
Lines 112-129 Link Here
112
    </makenbm>
114
    </makenbm>
113
  </target>
115
  </target>
114
116
115
  <target name="clean">
117
  <target name="clean" depends="init">
116
    <delete>
118
    <delete>
117
      <fileset dir="src">
119
      <fileset dir="src">
118
        <include name="**/*.class"/>
120
        <include name="**/*.class"/>
119
        <include name="**/*.jar"/>
121
        <include name="**/*.jar"/>
120
        <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/layer-include*.xml"/>
122
        <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/layer-include*.xml"/>
121
      </fileset>
123
      </fileset>
124
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
125
        <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
126
      </fileset>
122
    </delete>
127
    </delete>
123
    <delete file="manifest-subst.mf"/>
128
    <delete file="manifest-subst.mf"/>
124
    <delete file="cvs-profile.nbm"/>
129
    <delete file="cvs-profile.nbm"/>
125
    <delete dir="netbeans"/>
126
    <delete dir="Info"/>
127
  </target>
130
  </target>
128
131
129
</project>
132
</project>
(-)vcsgeneric/profiles/pvcs/build.xml (-33 / +36 lines)
Lines 14-47 Link Here
14
14
15
15
16
<project name="vcsgeneric/profiles/pvcs" default="netbeans" basedir=".">
16
<project name="vcsgeneric/profiles/pvcs" default="netbeans" basedir=".">
17
  <import file="../../../nbbuild/default.xml"/>
17
18
18
  <property name="nbroot" location="../../.."/>
19
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
19
  <property name="nbext" location="${nbroot}/nbbuild"/>
20
  <property name="nbm_alias" value="nb_ide"/>
21
  <property name="homepage.base" value="netbeans.org"/>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
26
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
27
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
28
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
29
20
30
  <target name="compile">
21
  <target name="init" depends="default.init">
22
    <patternset id="vcsgeneric/profiles/pvcs.files">
23
      <include name="${nb.modules.dir}/pvcs-profile.jar"/>
24
    </patternset>
25
    <path id="cp">
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
30
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
31
      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
32
      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
33
      <pathelement location="${javacvs/libmodule.dir}/${nb.modules/autoload.dir}/cvslib.jar"/>
34
    </path>
35
  </target>
36
37
  <target name="compile" depends="init">
31
    <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
38
    <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
32
    <javac srcdir="src" 
39
    <javac srcdir="src" 
33
        deprecation="${build.compiler.deprecation}" 
40
        deprecation="${build.compiler.deprecation}" 
34
        debug="${build.compiler.debug}"
41
        debug="${build.compiler.debug}"
35
        destdir="src">
42
        destdir="src">
36
      <classpath>        
43
      <classpath refID="cp"/>
37
	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
38
        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
39
        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
40
	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
41
	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
42
	<pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
43
        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
44
      </classpath>
45
    </javac>
44
    </javac>
46
  </target>
45
  </target>
47
46
Lines 68-84 Link Here
68
       <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.java"/>
67
       <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.java"/>
69
       <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.properties"/>
68
       <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.properties"/>
70
    </makelayer>
69
    </makelayer>
71
    <mkdir dir="netbeans/modules"/>
70
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
72
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
71
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
73
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
72
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
74
    <locjar jarfile="netbeans/modules/pvcs-profile.jar"
73
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/pvcs-profile.jar"
75
         manifest="manifest-subst.mf"
74
         manifest="manifest-subst.mf"
76
         basedir="src"
75
         basedir="src"
77
         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
76
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
78
	 excludes="org/netbeans/modules/vcs/profiles/pvcs/mf-layer_XX.xml"
77
	 excludes="org/netbeans/modules/vcs/profiles/pvcs/mf-layer_XX.xml"
79
         compress="false">
78
         compress="false">
80
      <locale name="ja"/>
79
      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
81
      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
82
        <include name="**/*"/>
80
        <include name="**/*"/>
83
	<exclude name="org/netbeans/modules/vcs/profiles/pvcs/config/*_XX.*"/>
81
	<exclude name="org/netbeans/modules/vcs/profiles/pvcs/config/*_XX.*"/>
84
      </fileset>
82
      </fileset>
Lines 86-102 Link Here
86
        <include name="**/*.java"/>
84
        <include name="**/*.java"/>
87
        <include name="**/*.form"/>
85
        <include name="**/*.form"/>
88
      </fileset>
86
      </fileset>
89
    </locjar>
87
    </jar>
90
  </target>
88
  </target>
91
89
92
  <target name="netbeans" depends="jars">
90
  <target name="netbeans" depends="jars">
93
    <genlist targetname="nbm" outputfiledir="netbeans"/>
91
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/pvcs-profile.jar">
92
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
93
        <patternset refID="vcsgeneric/profiles/pvcs.files"/>
94
      </fileset>
95
    </genlist>
94
  </target>
96
  </target>
95
97
96
  <target name="nbm" depends="netbeans">
98
  <target name="nbm" depends="netbeans">
97
    <makenbm file="pvcs-profile.nbm"
99
    <makenbm file="pvcs-profile.nbm"
98
             topdir="."
100
             productdir="${netbeans.dest.dir}/${cluster.dir}"
99
             module="netbeans/modules/pvcs-profile.jar"
101
             module="${nb.modules.dir}/pvcs-profile.jar"
100
	     homepage="http://vcsgeneric.${homepage.base}/"
102
	     homepage="http://vcsgeneric.${homepage.base}/"
101
	     distribution="http://${dist.base}/pvcs-profile.nbm">
103
	     distribution="http://${dist.base}/pvcs-profile.nbm">
102
      <license file="${license.file}"/>
104
      <license file="${license.file}"/>
Lines 104-121 Link Here
104
    </makenbm>
106
    </makenbm>
105
  </target>
107
  </target>
106
108
107
  <target name="clean">
109
  <target name="clean" depends="init">
108
    <delete>
110
    <delete>
109
      <fileset dir="src">
111
      <fileset dir="src">
110
        <include name="**/*.class"/>
112
        <include name="**/*.class"/>
111
        <include name="**/*.jar"/>
113
        <include name="**/*.jar"/>
112
        <include name="org/netbeans/modules/vcs/profiles/pvcs/layer-include*.xml"/>
114
        <include name="org/netbeans/modules/vcs/profiles/pvcs/layer-include*.xml"/>
113
      </fileset>
115
      </fileset>
116
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
117
        <patternset refID="vcsgeneric/profiles/pvcs.files"/>
118
      </fileset>
114
    </delete>
119
    </delete>
115
    <delete file="manifest-subst.mf"/>
120
    <delete file="manifest-subst.mf"/>
116
    <delete file="pvcs-profile.nbm"/>
121
    <delete file="pvcs-profile.nbm"/>
117
    <delete dir="netbeans"/>
118
    <delete dir="Info"/>
119
  </target>
122
  </target>
120
123
121
</project>
124
</project>
(-)vcsgeneric/profiles/vss/build.xml (-35 / +34 lines)
Lines 14-49 Link Here
14
14
15
15
16
<project name="vcsgeneric/profiles/vss" default="netbeans" basedir=".">
16
<project name="vcsgeneric/profiles/vss" default="netbeans" basedir=".">
17
  <import file="../../../nbbuild/default.xml"/>
17
18
18
  <property name="nbroot" value="../../.."/>
19
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
19
  <property name="nbext" value="${nbroot}/nbbuild"/>
20
  <property name="nbm_alias" value="nb_ide"/>
21
  <property name="homepage.base" value="netbeans.org"/>
22
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23
  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24
25
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
26
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
27
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
28
  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
29
20
30
  <target name="compile">
21
  <target name="init" depends="default.init">
22
    <patternset id="vcsgeneric/profiles/vss.files">
23
      <include name="${nb.modules.dir}/vss-profile.jar"/>
24
    </patternset>
25
    <path id="cp">
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
28
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
29
      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
30
      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
31
      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
32
    </path>
33
  </target>
34
35
  <target name="compile" depends="init">
31
    <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
36
    <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
32
    <javac srcdir="src" 
37
    <javac srcdir="src" 
33
        deprecation="${build.compiler.deprecation}" 
38
        deprecation="${build.compiler.deprecation}" 
34
        debug="${build.compiler.debug}"
39
        debug="${build.compiler.debug}"
35
        destdir="src">
40
        destdir="src">
36
      <classpath>        
41
      <classpath refID="cp"/>
37
	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
38
        <!--<pathelement location="${nbroot1}/openide/netbeans/lib/openide.jar"/>-->
39
        <fileset dir="${nbroot}/openide/netbeans/lib">
40
          <include name="openide*.jar" />
41
        </fileset>
42
        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
43
	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
44
	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
45
	<pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
46
      </classpath>
47
    </javac>
42
    </javac>
48
  </target>
43
  </target>
49
44
Lines 72-88 Link Here
72
       <include name="org/netbeans/modules/vcs/profiles/vss/list/*.properties"/>
67
       <include name="org/netbeans/modules/vcs/profiles/vss/list/*.properties"/>
73
       <exclude name="org/netbeans/modules/vcs/profiles/vss/list/*_ja.properties"/>
68
       <exclude name="org/netbeans/modules/vcs/profiles/vss/list/*_ja.properties"/>
74
    </makelayer>
69
    </makelayer>
75
    <mkdir dir="netbeans/modules"/>
70
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
76
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
71
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
77
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
72
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
78
    <locjar jarfile="netbeans/modules/vss-profile.jar"
73
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/vss-profile.jar"
79
         manifest="manifest-subst.mf"
74
         manifest="manifest-subst.mf"
80
         basedir="src"
75
         basedir="src"
81
         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
76
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
82
	 excludes="org/netbeans/modules/vcs/profiles/vss/mf-layer_XX.xml"
77
	 excludes="org/netbeans/modules/vcs/profiles/vss/mf-layer_XX.xml"
83
         compress="false">
78
         compress="false">
84
      <locale name="ja"/>
79
      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
85
      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
86
        <include name="**/*"/>
80
        <include name="**/*"/>
87
	<exclude name="org/netbeans/modules/vcs/profiles/vss/config/*_XX.*"/>
81
	<exclude name="org/netbeans/modules/vcs/profiles/vss/config/*_XX.*"/>
88
      </fileset>
82
      </fileset>
Lines 90-106 Link Here
90
        <include name="**/*.java"/>
84
        <include name="**/*.java"/>
91
        <include name="**/*.form"/>
85
        <include name="**/*.form"/>
92
      </fileset>
86
      </fileset>
93
    </locjar>
87
    </jar>
94
  </target>
88
  </target>
95
89
96
  <target name="netbeans" depends="jars">
90
  <target name="netbeans" depends="jars">
97
    <genlist targetname="nbm" outputfiledir="netbeans"/>
91
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/vss-profile.jar">
92
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
93
        <patternset refID="vcsgeneric/profiles/vss.files"/>
94
      </fileset>
95
    </genlist>
98
  </target>
96
  </target>
99
97
100
  <target name="nbm" depends="netbeans">
98
  <target name="nbm" depends="netbeans">
101
    <makenbm file="vss-profile.nbm"
99
    <makenbm file="vss-profile.nbm"
102
             topdir="."
100
             productdir="${netbeans.dest.dir}/${cluster.dir}"
103
             module="netbeans/modules/vss-profile.jar"
101
             module="${nb.modules.dir}/vss-profile.jar"
104
	     homepage="http://vcsgeneric.${homepage.base}/"
102
	     homepage="http://vcsgeneric.${homepage.base}/"
105
	     distribution="http://${dist.base}/vss-profile.nbm">
103
	     distribution="http://${dist.base}/vss-profile.nbm">
106
      <license file="${license.file}"/>
104
      <license file="${license.file}"/>
Lines 108-125 Link Here
108
    </makenbm>
106
    </makenbm>
109
  </target>
107
  </target>
110
108
111
  <target name="clean">
109
  <target name="clean" depends="init">
112
    <delete>
110
    <delete>
113
      <fileset dir="src">
111
      <fileset dir="src">
114
        <include name="**/*.class"/>
112
        <include name="**/*.class"/>
115
        <include name="**/*.jar"/>
113
        <include name="**/*.jar"/>
116
        <include name="org/netbeans/modules/vcs/profiles/vss/layer-include*.xml"/>
114
        <include name="org/netbeans/modules/vcs/profiles/vss/layer-include*.xml"/>
117
      </fileset>
115
      </fileset>
116
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
117
        <patternset refID="vcsgeneric/profiles/vss.files"/>
118
      </fileset>
118
    </delete>
119
    </delete>
119
    <delete file="manifest-subst.mf"/>
120
    <delete file="manifest-subst.mf"/>
120
    <delete file="vss-profile.nbm"/>
121
    <delete file="vss-profile.nbm"/>
121
    <delete dir="netbeans"/>
122
    <delete dir="Info"/>
123
  </target>
122
  </target>
124
123
125
</project>
124
</project>
(-)web/advanced/build.xml (-51 / +48 lines)
Lines 13-80 Link Here
13
-->
13
-->
14
14
15
<project name="web_advanced" default="netbeans" basedir=".">
15
<project name="web_advanced" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <property name="nb_root" location="../.."/>
18
  <target name="init" depends="default.init">
18
  <property name="homepage.base" value="netbeans.org"/>
19
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
21
  <property name="nbm_alias" value="nb_ide"/>
22
23
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
24
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
25
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_root}/nbbuild/nbantext.jar"/>
26
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_root}/nbbuild/nbantext.jar"/>
27
28
  <target name="init">
29
    <property name="ddapi.implementation.version" value="${buildnumber}"/>
19
    <property name="ddapi.implementation.version" value="${buildnumber}"/>
30
    <filter token="DDAPI_BUILD_NUMBER_SUBST"  value="${ddapi.implementation.version}"/>
20
    <filter token="DDAPI_BUILD_NUMBER_SUBST"  value="${ddapi.implementation.version}"/>
21
    <ant dir="../external" target="unscramble"/>
22
    <patternset id="web/advanced.files">
23
      <include name="${nb.modules.dir}/jspie.jar"/>
24
      <include name="${nb.modules/docs.dir}/jspie.jar"/>
25
    </patternset>
26
    <path id="cp">
27
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
28
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
29
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
30
      <pathelement location="${openidex.dir}/{nb.modules/autoload.dir}/openidex.jar"/>
31
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
32
      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
33
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
34
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
35
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
36
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
37
      <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar" />
38
      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
39
    </path>
31
  </target>
40
  </target>
32
  
41
  
33
  <target name="compile" depends="init">
42
  <target name="compile" depends="init">
34
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
43
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
35
      <classpath>
44
      <classpath refID="cp"/>
36
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
37
         <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
38
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
39
         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
40
         <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
41
         <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
42
         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
43
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
44
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
46
        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
47
        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar"/>
48
        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
49
      </classpath>
50
    </javac>
45
    </javac>
51
  </target>
46
  </target>
52
47
53
  <target name="jars" depends="compile">
48
  <target name="jars" depends="compile">
54
    <mkdir dir="netbeans/modules"/>
49
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
55
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
50
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
56
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
51
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
57
    <locjar jarfile="netbeans/modules/jspie.jar"
52
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jspie.jar"
58
            manifest="manifest-subst.mf"
53
         manifest="manifest-subst.mf"
59
            basedir="src"
54
         basedir="src"
60
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
55
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
61
	    compress="false">
56
	 compress="false">
62
      <include name="org/netbeans/modules/web/"/>
57
      <include name="org/netbeans/modules/web/"/>
63
      <locale name="ja"/>
64
      <fileset dir="src">
58
      <fileset dir="src">
65
        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
59
        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
66
          <include name="**/org/netbeans/modules/web/**"/>
60
          <include name="**/org/netbeans/modules/web/**"/>
67
        </patternset>
61
        </patternset>
68
      </fileset>
62
      </fileset>
69
    </locjar>
63
    </jar>
70
  </target>
64
  </target>
71
65
72
  <target name="javahelp">
66
  <target name="javahelp" depends="init">
73
    <mkdir dir="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2"/>
67
    <mkdir dir="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2"/>
74
    <jhindexer basedir="javahelp/org/netbeans/modules/web/ie/docs/"
68
    <jhindexer basedir="javahelp/org/netbeans/modules/web/ie/docs/"
75
               db="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2">
69
               db="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2">
76
      <classpath>
70
      <classpath>
77
        <fileset dir="${nb_root}/nbbuild/external">
71
        <fileset dir="${nb_all}/nbbuild/external">
78
          <include name="jhall*.jar"/>
72
          <include name="jhall*.jar"/>
79
        </fileset>
73
        </fileset>
80
      </classpath>
74
      </classpath>
Lines 83-94 Link Here
83
      <exclude name="ja/"/>
77
      <exclude name="ja/"/>
84
      <exclude name="credits.html"/>
78
      <exclude name="credits.html"/>
85
    </jhindexer>
79
    </jhindexer>
86
    <mkdir dir="netbeans/modules/docs"/>
80
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
87
    <locjar jarfile="netbeans/modules/docs/jspie.jar"
81
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/jspie.jar"
88
            compress="true">
82
         compress="true">
89
      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
83
      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
90
      <locale name="ja"/>
84
    </jar>
91
    </locjar>
92
  </target>
85
  </target>
93
86
94
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
87
  <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
Lines 108-121 Link Here
108
  </target>
101
  </target>
109
102
110
  <target name="netbeans" depends="jars,javahelp">
103
  <target name="netbeans" depends="jars,javahelp">
111
    <genlist targetname="nbm" outputfiledir="netbeans"/>
104
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jspie.jar">
105
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
106
        <patternset refID="web/advanced.files"/>
107
      </fileset>
108
    </genlist>
112
  </target>
109
  </target>
113
110
114
  <target name="nbm" depends="netbeans">
111
  <target name="nbm" depends="netbeans">
115
    <delete dir="Info"/>
116
    <makenbm file="jspie.nbm"
112
    <makenbm file="jspie.nbm"
117
             topdir="."
113
             productdir="${netbeans.dest.dir}/${cluster.dir}"
118
             module="netbeans/modules/jspie.jar"
114
             module="${nb.modules.dir}/jspie.jar"
119
	     homepage="http://web.${homepage.base}/"
115
	     homepage="http://web.${homepage.base}/"
120
	     distribution="http://${dist.base}/jspie.nbm">
116
	     distribution="http://${dist.base}/jspie.nbm">
121
      <license file="${license.file}"/>
117
      <license file="${license.file}"/>
Lines 123-139 Link Here
123
    </makenbm>
119
    </makenbm>
124
  </target>
120
  </target>
125
121
126
  <target name="clean">
122
  <target name="clean" depends="init">
127
    <delete>
123
    <delete>
128
      <fileset dir="src">
124
      <fileset dir="src">
129
        <include name="**/*.class"/>
125
        <include name="**/*.class"/>
130
      </fileset>
126
      </fileset>
127
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
128
        <patternset refID="web/advanced.files"/>
129
      </fileset>
131
    </delete>
130
    </delete>
132
    <delete file="manifest-subst.mf"/>
131
    <delete file="manifest-subst.mf"/>
133
    <delete file="jspie.nbm"/>
132
    <delete file="jspie.nbm"/>
134
    <delete dir="Info"/>
135
    <delete dir="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2"/>
133
    <delete dir="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2"/>
136
    <delete dir="netbeans"/>
137
  </target>
134
  </target>
138
135
139
  <!-- This target will only work *inside* the IDE! -->
136
  <!-- This target will only work *inside* the IDE! -->
(-)web/core/build.xml (-58 / +57 lines)
Lines 13-100 Link Here
13
-->
13
-->
14
14
15
<project name="web_core" default="netbeans" basedir=".">
15
<project name="web_core" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
27
  <target name="init">
28
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
20
    <patternset id="web/core.files">
21
      <include name="${nb.modules.dir}/jsp.jar"/>
22
      <include name="${nb.docs.dir}/servlet24-docs.zip"/>
23
      <include name="${nb.docs.dir}/jsp20-docs.zip"/>
24
    </patternset>
25
    <path id="cp">
26
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
27
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- XXX: ExLocalFileSystem in UnpackWarAction -->
28
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
29
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
30
      <pathelement location="${openidex.dir}/{nb.modules/autoload.dir}/openidex.jar"/>
31
      <pathelement location="${html.dir}/${nb.modules.dir}/html.jar"/>
32
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
33
      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
34
      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
35
      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
36
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
37
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
38
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
39
      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
40
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
41
      <pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
42
      <pathelement location="${projects.dir}/${nb.modules.dir}/projects.jar"/>
43
      <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar" />
44
      <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar" />
45
      <pathelement location="${xml/catalog.dir}/${nb.modules.dir}/xml-catalog.jar"/>
46
      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/jsp-parser.jar" />
47
      <pathelement location="${web/jspsyntax.dir}/${nb.modules/autoload.dir}/jsp-syntax.jar" />
48
      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar" />
49
      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar" />
50
      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
51
    </path>
29
  </target>
52
  </target>
30
53
31
  <target name="compile" depends="init">
54
  <target name="compile" depends="init">
32
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
55
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
33
      <classpath>
56
      <classpath refID="cp"/>
34
        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
35
        <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/> <!-- XXX: ExLocalFileSystem in UnpackWarAction -->
36
        <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
37
        <pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
38
        <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
39
        <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
40
        <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
41
        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
42
        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
43
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
44
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
        <pathelement location="${nb_root}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX: Needed for compilation ServletDO extends JDO that implements ElementCookie -->
46
        <pathelement location="${nb_root}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
47
        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
48
        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
49
        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
50
        <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
51
        <pathelement location="${nb_root}/projects/netbeans/modules/projects.jar"/>
52
        <pathelement path="${nb_root}/xml/api/netbeans/modules/autoload/xml-api.jar" />
53
        <pathelement path="${nb_root}/xml/core/netbeans/modules/autoload/xml-core.jar" />
54
        <pathelement location="${nb_root}/xml/catalog/netbeans/modules/xml-catalog.jar"/>
55
        <pathelement path="${nb_root}/web/jspparser/netbeans/modules/autoload/jsp-parser.jar" />
56
        <pathelement path="${nb_root}/web/jspsyntax/netbeans/modules/autoload/jsp-syntax.jar" />
57
        <pathelement path="${nb_root}/web/servletapi24/netbeans/modules/autoload/ext/jsp-api-2.0.jar" />
58
        <pathelement path="${nb_root}/web/servletapi24/netbeans/modules/autoload/ext/servlet-api-2.4.jar" />
59
        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar" />
60
      </classpath>
61
    </javac>
57
    </javac>
62
  </target>
58
  </target>
63
59
64
  <target name="jars" depends="compile">
60
  <target name="jars" depends="compile">
65
    <property file="${nb_root}/web/spec-vers.properties"/>
61
    <property file="${nb_all}/web/spec-vers.properties"/>
66
    <property file="${nb_root}/xml/spec-vers.properties"/>
62
    <property file="${nb_all}/xml/spec-vers.properties"/>
67
    <mkdir dir="netbeans/modules"/>
63
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
68
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
64
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
69
    <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
65
    <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
70
    <filter token="XML_CORE_IMPL_VERSION" value="${xml.common.impl.version}"/>
66
    <filter token="XML_CORE_IMPL_VERSION" value="${xml.common.impl.version}"/>
71
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
67
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
72
    <locjar jarfile="netbeans/modules/jsp.jar"
68
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jsp.jar"
73
            manifest="manifest-subst.mf"
69
         manifest="manifest-subst.mf"
74
            basedir="src"
70
         basedir="src"
75
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
71
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
76
	    compress="false">
72
         compress="false">
77
      <include name="org/netbeans/modules/web/"/>
73
      <include name="org/netbeans/modules/web/"/>
78
      <include name="META-INF/"/>
74
      <include name="META-INF/"/>
79
      <locale name="ja"/>
75
    </jar>
80
    </locjar>
81
  </target>
76
  </target>
82
77
83
  <target name="release" depends="init">
78
  <target name="release" depends="init">
84
    <!-- javadoc -->
79
    <!-- javadoc -->
85
    <copy file="../external/servlet24-docs.zip" todir="netbeans/docs"/>
80
    <copy file="../external/servlet24-docs.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
86
    <copy file="../external/jsp20-docs.zip" todir="netbeans/docs"/>
81
    <copy file="../external/jsp20-docs.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
87
  </target>
82
  </target>
88
83
89
  <target name="netbeans" depends="jars,release">
84
  <target name="netbeans" depends="jars,release">
90
    <genlist targetname="nbm" outputfiledir="netbeans"/>
85
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jsp.jar">
86
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
87
        <patternset refID="web/core.files"/>
88
      </fileset>
89
    </genlist>
91
  </target>
90
  </target>
92
91
93
  <target name="nbm" depends="netbeans">
92
  <target name="nbm" depends="netbeans">
94
    <delete dir="Info"/>
95
    <makenbm file="web-jsp.nbm"
93
    <makenbm file="web-jsp.nbm"
96
             topdir="."
94
             productdir="${netbeans.dest.dir}/${cluster.dir}"
97
             module="netbeans/modules/jsp.jar"
95
             module="${nb.modules.dir}/jsp.jar"
98
	     homepage="http://web.${homepage.base}/"
96
	     homepage="http://web.${homepage.base}/"
99
	     distribution="http://${dist.base}/web-jsp.nbm">
97
	     distribution="http://${dist.base}/web-jsp.nbm">
100
      <license file="${license.file}"/>
98
      <license file="${license.file}"/>
Lines 102-117 Link Here
102
    </makenbm>
100
    </makenbm>
103
  </target>
101
  </target>
104
102
105
  <target name="clean">
103
  <target name="clean" depends="init">
106
    <delete>
104
    <delete>
107
      <fileset dir="src">
105
      <fileset dir="src">
108
        <include name="**/*.class"/>
106
        <include name="**/*.class"/>
109
      </fileset>
107
      </fileset>
108
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
109
        <patternset refID="web/core.files"/>
110
      </fileset>
110
    </delete>
111
    </delete>
111
    <delete file="manifest-subst.mf"/>
112
    <delete file="manifest-subst.mf"/>
112
    <delete file="web-jsp.nbm"/>
113
    <delete file="web-jsp.nbm"/>
113
    <delete dir="Info"/>
114
    <delete dir="netbeans"/>
115
  </target>
114
  </target>
116
115
117
  <!-- This target will only work *inside* the IDE! -->
116
  <!-- This target will only work *inside* the IDE! -->
(-)web/ddapi/build.xml (-48 / +36 lines)
Lines 13-38 Link Here
13
-->
13
-->
14
14
15
<project name="web_core" default="netbeans" basedir=".">
15
<project name="web_core" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
  <property name="s2b_root_2_3" location="src/org/netbeans/modules/web/dd/impl/model_2_3"/>
18
  <property name="s2b_root_2_3" location="src/org/netbeans/modules/web/dd/impl/model_2_3"/>
27
  <property name="s2b_root_2_4" location="src/org/netbeans/modules/web/dd/impl/model_2_4"/>
19
  <property name="s2b_root_2_4" location="src/org/netbeans/modules/web/dd/impl/model_2_4"/>
28
  <property name="s2b_res_root" location="src/org/netbeans/modules/web/dd/impl/resources"/>
20
  <property name="s2b_res_root" location="src/org/netbeans/modules/web/dd/impl/resources"/>
29
21
30
  <target name="s2binit">
22
  <target name="init" depends="default.init">
23
    <patternset id="web/ddapi.files">
24
      <include name="${nb.modules/autoload.dir}/ddapi.jar"/>
25
    </patternset>
26
    <path id="cp">
27
      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
28
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
29
    </path>
30
  </target>
31
32
  <target name="s2binit" depends="init">
31
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
33
	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
32
	  <classpath>
34
	  <classpath>
33
		<pathelement path="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
35
		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
34
		<pathelement path="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
36
		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
35
		<pathelement path="${nb_root}/schema2beans/anttask/s2banttask.jar"/>
37
		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
36
	  </classpath>
38
	  </classpath>
37
	</taskdef>
39
	</taskdef>
38
  </target>
40
  </target>
Lines 58-103 Link Here
58
	  <!--<delete file="${s2b_root_2_4}/WebAppType.java"/>-->
60
	  <!--<delete file="${s2b_root_2_4}/WebAppType.java"/>-->
59
  </target>
61
  </target>
60
62
61
  <target name="compile" depends="dd2beansgen">
63
  <target name="compile" depends="init,dd2beansgen">
62
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
64
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
63
      <classpath>
65
      <classpath refID="cp"/>
64
        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
65
        <pathelement location="${nb_root}/openide/fs/netbeans/lib/openide-fs.jar"/>
66
        <pathelement location="${nb_root}/openide/util/netbeans/lib/openide-util.jar"/>
67
      </classpath>
68
    </javac>
66
    </javac>
69
  </target>
67
  </target>
70
68
71
  <target name="jars" depends="compile">
69
  <target name="jars" depends="compile">
72
    <property file="${nb_root}/web/spec-vers.properties"/>
70
    <property file="${nb_all}/web/spec-vers.properties"/>
73
    <mkdir dir="netbeans/modules"/>
71
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
74
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
72
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
75
    <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
73
    <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
76
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
74
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
77
    <locjar jarfile="netbeans/modules/autoload/ddapi.jar"
75
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ddapi.jar"
78
            manifest="manifest-subst.mf"
76
         manifest="manifest-subst.mf"
79
	    compress="false">
77
         basedir="src"
80
      <fileset dir="src" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
78
	 compress="false"
81
      <locale name="ja"/>
79
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
82
    </locjar>
83
  </target>
84
85
  <target name="release">
86
  </target>
87
  
88
  <target name="javahelp">
89
    <!-- No one provided. -->
90
  </target>
80
  </target>
91
81
92
  <target name="netbeans" depends="jars">
82
  <target name="netbeans" depends="jars">
93
    <genlist targetname="nbm" outputfiledir="netbeans"/>
83
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/ddapi.jar">
84
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
85
         <patternset refID="web/ddapi.files"/>
86
       </fileset>
87
    </genlist>
94
  </target>
88
  </target>
95
89
96
  <target name="nbm" depends="netbeans">
90
  <target name="nbm" depends="netbeans">
97
    <delete dir="Info"/>
98
    <makenbm file="ddapi.nbm"
91
    <makenbm file="ddapi.nbm"
99
             topdir="."
92
             productdir="${netbeans.dest.dir}/${cluster.dir}"
100
             module="netbeans/modules/autoload/ddapi.jar"
93
             module="${nb.modules/autoload.dir}/ddapi.jar"
101
	     homepage="http://web.${homepage.base}/"
94
	     homepage="http://web.${homepage.base}/"
102
	     distribution="http://${dist.base}/ddapi.nbm">
95
	     distribution="http://${dist.base}/ddapi.nbm">
103
      <license file="${license.file}"/>
96
      <license file="${license.file}"/>
Lines 105-120 Link Here
105
    </makenbm>
98
    </makenbm>
106
  </target>
99
  </target>
107
100
108
  <target name="clean" depends="clean-ddgen-src, clean-javadoc">
101
  <target name="clean" depends="init,clean-ddgen-src, clean-javadoc">
109
    <delete>
102
    <delete>
110
      <fileset dir="src">
103
      <fileset dir="src">
111
        <include name="**/*.class"/>
104
        <include name="**/*.class"/>
112
      </fileset>
105
      </fileset>
106
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
107
        <patternset refID="web/ddapi.files"/>
108
      </fileset>
113
    </delete>
109
    </delete>
114
    <delete file="manifest-subst.mf"/>
110
    <delete file="manifest-subst.mf"/>
115
    <delete file="ddapi.nbm"/>
111
    <delete file="ddapi.nbm"/>
116
    <delete dir="Info"/>
117
    <delete dir="netbeans"/>
118
  </target>
112
  </target>
119
113
120
  <target name="clean-ddgen-src">
114
  <target name="clean-ddgen-src">
Lines 134-140 Link Here
134
        <delete dir="${s2b_root_2_4}"/>
128
        <delete dir="${s2b_root_2_4}"/>
135
  </target>
129
  </target>
136
  
130
  
137
  <target name="javadoc" description="Build Javadoc."> 
131
  <target name="javadoc" depends="init" description="Build Javadoc."> 
138
      <property name="_cp" refid="cp"/> 
132
      <property name="_cp" refid="cp"/> 
139
      <ant dir="${nb_root}/nbbuild/javadoctools" antfile="template.xml" target="javadoc"> 
133
      <ant dir="${nb_root}/nbbuild/javadoctools" antfile="template.xml" target="javadoc"> 
140
       <property name="javadoc.base" location="."/> 
134
       <property name="javadoc.base" location="."/> 
Lines 155-166 Link Here
155
  <target name="clean-javadoc">
149
  <target name="clean-javadoc">
156
  	<delete dir="javadoc"/>
150
  	<delete dir="javadoc"/>
157
  </target>
151
  </target>
158
159
  <path id="cp">
160
	 <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
161
	 <pathelement location="${nb_root}/openide/fs/netbeans/lib/openide-fs.jar"/> 
162
	 <pathelement location="${nb_root}/openide/util/netbeans/lib/openide-util.jar"/>
163
  </path>
164
152
165
  <!-- This target will only work *inside* the IDE! -->
153
  <!-- This target will only work *inside* the IDE! -->
166
  <target depends="jars" description="Test the module inside the running IDE." name= "test">
154
  <target depends="jars" description="Test the module inside the running IDE." name= "test">
(-)web/jspdebug/build.xml (-50 / +50 lines)
Lines 13-82 Link Here
13
-->
13
-->
14
14
15
<project name="web_jspdebug" default="netbeans" basedir=".">
15
<project name="web_jspdebug" default="netbeans" basedir=".">
16
16
  <import file="../../nbbuild/default.xml"/> 
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
  <property name="webbeans_root" location="src/org/netbeans/modules/web/dd/model"/>
17
  <property name="webbeans_root" location="src/org/netbeans/modules/web/dd/model"/>
27
18
28
  <target name="compile">
19
  <target name="init" depends="default.init">
29
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
20
    <patternset id="web/jspdebug.files">
30
      <classpath>
21
      <include name="${nb.modules.dir}/jspdebug.jar"/>
31
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
22
    </patternset>
32
         <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/>
23
    <path id="cp">
33
         <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
24
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
34
         <pathelement location="${nb_root}/editor/netbeans/modules/editor.jar"/>
25
        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
35
         <pathelement location="${nb_root}/editor/netbeans/modules/ext/nb-editor.jar"/>
26
        <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
36
         <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
27
        <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
37
         <pathelement location="${nb_root}/debuggerjpda/netbeans/modules/jpdaDebugger.jar"/>
28
        <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
38
         <pathelement location="${nb_root}/java/api/netbeans/modules/autoload/java-api.jar"/>
29
        <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
39
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
30
        <pathelement location="${debuggerjpda.dir}/${nb.modules.dir}/jpdaDebugger.jar"/>
40
         <pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
31
        <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
41
         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
32
        <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
42
         <pathelement location="${nb_root}/web/jspsyntax/netbeans/modules/jsp-syntax.jar"/>
33
        <pathelement location="${html.dir}/${nb.modules.dir}/html.jar"/>
43
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
34
        <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar"/>
44
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
35
        <pathelement location="${web/jspsyntax.dir}/${nb.modules.dir}/jsp-syntax.jar"/>
45
        <pathelement location="${nb_root}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
36
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
46
        <pathelement location="${nb_root}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
37
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
47
        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
38
        <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/> <!-- XXX -->
48
        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
39
        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
49
        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
40
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
50
        <!-- Hopefully set up by nbbuild/build.xml: -->
41
        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
42
        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
51
        <pathelement location="${jdkhome}/lib/tools.jar"/>
43
        <pathelement location="${jdkhome}/lib/tools.jar"/>
52
	<pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
44
	<pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
53
      </classpath>
45
    </path>
46
  </target>
47
48
  <target name="compile" depends="init">
49
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
50
      <classpath refID="cp"/>
54
    </javac>
51
    </javac>
55
  </target>
52
  </target>
56
53
57
  <target name="jars" depends="compile">
54
  <target name="jars" depends="compile">
58
    <mkdir dir="netbeans/modules"/>
55
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
59
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
56
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
60
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
57
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
61
    <locjar jarfile="netbeans/modules/jspdebug.jar"
58
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jspdebug.jar"
62
            manifest="manifest-subst.mf"
59
         manifest="manifest-subst.mf"
63
            basedir="src"
60
         basedir="src"
64
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
61
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
65
	    compress="false">
62
         compress="false">
66
      <include name="org/netbeans/modules/web/"/>
63
      <include name="org/netbeans/modules/web/"/>
67
      <locale name="ja"/>
64
    </jar>
68
    </locjar>
69
  </target>
65
  </target>
70
66
71
  <target name="netbeans" depends="jars">
67
  <target name="netbeans" depends="jars">
72
    <genlist targetname="nbm" outputfiledir="netbeans"/>
68
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jspdebug.jar">
69
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
70
        <patternset refID="web/jspdebug.files"/>
71
      </fileset>
72
    </genlist>
73
  </target>
73
  </target>
74
74
75
  <target name="nbm" depends="netbeans">
75
  <target name="nbm" depends="netbeans">
76
    <delete dir="Info"/>
77
    <makenbm file="jspdebug.nbm"
76
    <makenbm file="jspdebug.nbm"
78
             topdir="."
77
             productdir="${netbeans.dest.dir}/${cluster.dir}"
79
             module="netbeans/modules/jspdebug.jar"
78
             module="${nb.modules.dir}/jspdebug.jar"
80
	     homepage="http://web.${homepage.base}/"
79
	     homepage="http://web.${homepage.base}/"
81
	     distribution="http://${dist.base}/jspdebug.nbm">
80
	     distribution="http://${dist.base}/jspdebug.nbm">
82
      <license file="${license.file}"/>
81
      <license file="${license.file}"/>
Lines 84-99 Link Here
84
    </makenbm>
83
    </makenbm>
85
  </target>
84
  </target>
86
85
87
  <target name="clean">
86
  <target name="clean" depends="init">
88
    <delete>
87
    <delete>
89
      <fileset dir="src">
88
      <fileset dir="src">
90
        <include name="**/*.class"/>
89
        <include name="**/*.class"/>
91
      </fileset>
90
      </fileset>
91
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
92
        <patternset refID="web/jspdebug.files"/>
93
      </fileset>
92
    </delete>
94
    </delete>
93
    <delete file="manifest-subst.mf"/>
95
    <delete file="manifest-subst.mf"/>
94
    <delete file="jspdebug.nbm"/>
96
    <delete file="jspdebug.nbm"/>
95
    <delete dir="Info"/>
96
    <delete dir="netbeans"/>
97
  </target>
97
  </target>
98
98
99
  <!-- This target will only work *inside* the IDE! -->
99
  <!-- This target will only work *inside* the IDE! -->
(-)web/jspparser/build.xml (-52 / +49 lines)
Lines 13-37 Link Here
13
-->
13
-->
14
14
15
<project name="web_jspparser" default="netbeans" basedir=".">
15
<project name="web_jspparser" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="core_root" location="../core"/>
23
  <property name="homepage.base" value="netbeans.org"/>
24
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
25
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
26
  <property name="nbm_alias" value="nb_ide"/>
27
28
  <target name="init">
29
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
30
    <property file="../spec-vers.properties"/>
20
    <property file="../spec-vers.properties"/>
31
    <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
21
    <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
32
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
22
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
33
    <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
23
    <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
34
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
24
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
25
    <patternset id="web/jspparser.files">
26
      <include name="${nb.modules/autoload.dir}/jsp-parser.jar"/>
27
      <include name="${nb.modules/autoload.dir}/ext/jsp-parser-ext.jar"/>
28
      <include name="${nb.modules/autoload.dir}/ext/jasper-compiler-5.0.19.jar"/>
29
      <include name="${nb.modules/autoload.dir}/ext/jasper-runtime-5.0.19.jar"/>
30
      <include name="${nb.modules/autoload.dir}/ext/commons-logging-api.jar"/>
31
      <include name="${nb.modules/autoload.dir}/ext/commons-el.jar"/>
32
    </patternset>
33
    <path id="cp">
34
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
35
      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
36
      <pathelement location="../external/jsp-api-2.0.jar"/>
37
      <pathelement location="../external/jasper-compiler-5.0.19.jar"/>
38
      <pathelement location="../external/jasper-runtime-5.0.19.jar"/>
39
      <pathelement location="../external/commons-logging-api.jar"/>
40
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
41
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
42
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> <!-- used only indirectly -->
43
    </path>
35
  </target>
44
  </target>
36
45
37
  <target name="compile" depends="init">
46
  <target name="compile" depends="init">
Lines 40-88 Link Here
40
      <include name="org/netbeans/modules/web/jsps/"/>
49
      <include name="org/netbeans/modules/web/jsps/"/>
41
      <include name="org/netbeans/modules/web/jspparser_ext/"/>
50
      <include name="org/netbeans/modules/web/jspparser_ext/"/>
42
      <include name="org/apache/jasper/"/>
51
      <include name="org/apache/jasper/"/>
43
      <classpath>
52
      <classpath refID="cp"/>
44
        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
45
        <fileset dir="${nb_root}/core/external">
46
          <include name="xml-apis*.jar"/>
47
        </fileset>
48
        <pathelement location="../external/jsp-api-2.0.jar"/>
49
        <pathelement location="../external/servlet-api-2.4.jar"/>
50
        <pathelement location="../external/jasper-compiler-5.0.19.jar"/>
51
        <pathelement location="../external/jasper-runtime-5.0.19.jar"/>
52
        <pathelement location="../external/commons-logging-api.jar"/>
53
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
54
	<pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
55
        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/> <!-- used only indirectly -->
56
       <!-- <pathelement location="${nb_root}/openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/> -->
57
      </classpath>
58
    </javac>
53
    </javac>
59
  </target>
54
  </target>
60
55
61
  <target name="jars" depends="compile">
56
  <target name="jars" depends="compile">
62
    <mkdir dir="netbeans/modules/autoload/ext"/>
57
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
63
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
58
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
64
    <locjar jarfile="netbeans/modules/autoload/jsp-parser.jar"
59
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jsp-parser.jar"
65
            manifest="manifest-subst.mf"
60
         manifest="manifest-subst.mf"
66
            basedir="src"
61
         basedir="src"
67
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
62
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
68
	    compress="false">
63
         compress="false">
69
      <include name="org/netbeans/modules/web/jspparser/"/>
64
      <include name="org/netbeans/modules/web/jspparser/"/>
70
      <include name="org/netbeans/modules/web/jsps/"/>
65
      <include name="org/netbeans/modules/web/jsps/"/>
71
      <locale name="ja"/>
66
    </jar>
72
    </locjar>
67
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/jsp-parser-ext.jar"
73
    <locjar jarfile="netbeans/modules/autoload/ext/jsp-parser-ext.jar"
68
         basedir="src"
74
            basedir="src"
69
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
75
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
70
         compress="false">
76
	    compress="false">
77
      <include name="org/netbeans/modules/web/jspparser_ext/"/>
71
      <include name="org/netbeans/modules/web/jspparser_ext/"/>
78
      <include name="org/apache/jasper/"/>
72
      <include name="org/apache/jasper/"/>
79
      <locale name="ja"/>
73
    </jar>
80
    </locjar>
81
  </target>
74
  </target>
82
75
83
  <target name="release">
76
  <target name="release" depends="init">
84
    <mkdir dir="netbeans/modules/autoload/ext"/>
77
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
85
    <copy todir="netbeans/modules/autoload/ext">
78
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
86
      <fileset dir="../external">
79
      <fileset dir="../external">
87
        <include name="jasper-compiler-5.0.19.jar"/>
80
        <include name="jasper-compiler-5.0.19.jar"/>
88
        <include name="jasper-runtime-5.0.19.jar"/>
81
        <include name="jasper-runtime-5.0.19.jar"/>
Lines 93-128 Link Here
93
  </target>
86
  </target>
94
87
95
  <target name="netbeans" depends="jars,release">
88
  <target name="netbeans" depends="jars,release">
96
    <genlist targetname="nbm" outputfiledir="netbeans"/>
89
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jsp-parser.jar">
90
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
91
        <patternset refID="web/jspparser.files"/>
92
      </fileset>
93
    </genlist>
97
  </target>
94
  </target>
98
95
99
  <target name="nbm" depends="netbeans">
96
  <target name="nbm" depends="netbeans">
100
    <delete dir="Info"/>
101
    <makenbm file="web-jspparser.nbm"
97
    <makenbm file="web-jspparser.nbm"
102
             topdir="."
98
             productdir="${netbeans.dest.dir}/${cluster.dir}"
103
             module="netbeans/modules/autoload/jsp-parser.jar"
99
             module="${nb.modules/autoload.dir}/jsp-parser.jar"
104
	     homepage="http://web.${homepage.base}/"
100
	     homepage="http://web.${homepage.base}/"
105
	     distribution="http://${dist.base}/web-jspparser.nbm">
101
	     distribution="http://${dist.base}/web-jspparser.nbm">
106
      <license name="jspparser-license.txt">
102
      <license name="jspparser-license.txt">
107
        <text>For the JSP Parser module:</text>
103
        <text>For the JSP Parser module:</text>
108
        <file location="${license.file}"/>
104
        <file location="${license.file}"/>
109
        <text>For the Jasper compiler and runtime:</text>
105
        <text>For the Jasper compiler and runtime:</text>
110
        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
106
        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
111
      </license>
107
      </license>
112
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
108
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
113
    </makenbm>
109
    </makenbm>
114
  </target>
110
  </target>
115
111
116
  <target name="clean">
112
  <target name="clean" depends="init">
117
    <delete>
113
    <delete>
118
      <fileset dir="src">
114
      <fileset dir="src">
119
        <include name="**/*.class"/>
115
        <include name="**/*.class"/>
120
      </fileset>
116
      </fileset>
117
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
118
        <patternset refID="web/jspparser.files"/>
119
      </fileset>
121
    </delete>
120
    </delete>
122
    <delete file="manifest-subst.mf"/>
121
    <delete file="manifest-subst.mf"/>
123
    <delete file="web-jspparser.nbm"/>
122
    <delete file="web-jspparser.nbm"/>
124
    <delete dir="Info"/>
125
    <delete dir="netbeans"/>
126
  </target>
123
  </target>
127
124
128
  <target name="test-build" depends="compile">
125
  <target name="test-build" depends="compile">
(-)web/jspsyntax/build.xml (-45 / +42 lines)
Lines 13-91 Link Here
13
-->
13
-->
14
14
15
<project name="web_jspsyntax" default="netbeans" basedir=".">
15
<project name="web_jspsyntax" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init"> 
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="core_root" location="../core"/>
23
  <property name="homepage.base" value="netbeans.org"/>
24
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
25
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
26
  <property name="nbm_alias" value="nb_ide"/>
27
28
  <target name="init">
29
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
30
    <property file="../spec-vers.properties"/>
20
    <property file="../spec-vers.properties"/>
31
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
21
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
22
    <patternset id="web/jspsyntax.files">
23
      <include name="${nb.modules/autoload.dir}/jsp-syntax.jar"/>
24
      <include name="${nb.system.dir}/ParserDB/jsp20.jc?"/>
25
      <include name="${nb.system.dir}/ParserDB/servlet24.jc?"/>
26
    </patternset>
27
    <path id="cp">
28
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
32
      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
33
      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/jsp-parser.jar"/>
34
      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
35
      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
36
      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/editor-lib.jar"/>
37
      <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
38
      <pathelement location="${xml/text-edit.dir}/${nb.modules.dir}/xml-text-edit.jar"/>
39
    </path>
32
  </target>
40
  </target>
33
41
34
  <target name="compile" depends="init">
42
  <target name="compile" depends="init">
35
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
43
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
36
      <classpath>
44
      <classpath refID="cp"/>
37
        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
38
        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
39
        <pathelement location="${nb_root}/editor/netbeans/modules/ext/nb-editor.jar"/>
40
        <pathelement location="${nb_root}/editor/netbeans/modules/ext/editor-lib.jar"/>
41
        <pathelement location="${nb_root}/editor/netbeans/modules/editor.jar"/>
42
        <pathelement location="${nb_root}/xml/text-edit/netbeans/modules/xml-text-edit.jar"/>
43
        <pathelement location="../external/servlet-api-2.4.jar"/>
44
        <pathelement location="../external/jsp-api-2.0.jar"/>
45
        <pathelement location="${nb_root}/web/jspparser/netbeans/modules/autoload/jsp-parser.jar"/>
46
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
47
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
48
        <!--<pathelement location="${nb_root}/openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/>-->
49
      </classpath>
50
    </javac>
45
    </javac>
51
46
52
  </target>
47
  </target>
53
48
54
  <target name="jars" depends="compile">
49
  <target name="jars" depends="compile">
55
    <mkdir dir="netbeans/modules/autoload"/>
50
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
56
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
51
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
57
    <!--<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>-->
52
    <!--<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>-->
58
    <property file="${nb_root}/xml/spec-vers.properties"/>
53
    <property file="${nb_all}/xml/spec-vers.properties"/>
59
    <copy file="manifest.mf" tofile="manifest-subst.mf">
54
    <copy file="manifest.mf" tofile="manifest-subst.mf">
60
      <filterchain>
55
      <filterchain>
61
        <expandproperties/>
56
        <expandproperties/>
62
      </filterchain>
57
      </filterchain>
63
    </copy>
58
    </copy>
64
    <locjar jarfile="netbeans/modules/autoload/jsp-syntax.jar"
59
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jsp-syntax.jar"
65
            manifest="manifest-subst.mf"
60
         manifest="manifest-subst.mf"
66
            basedir="src"
61
         basedir="src"
67
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
62
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
68
	    compress="false">
63
	 compress="false"/>
69
      <locale name="ja"/>
70
    </locjar>
71
  </target>
64
  </target>
72
65
73
  <target name="release">
66
  <target name="release">
74
    <!-- parser database -->
67
    <!-- parser database -->
75
    <copy todir="netbeans">
68
    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}">
76
      <fileset dir="release" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
69
      <fileset dir="release/system" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
77
    </copy>
70
    </copy>
78
  </target>
71
  </target>
79
72
80
  <target name="netbeans" depends="jars,release">
73
  <target name="netbeans" depends="jars,release">
81
    <genlist targetname="nbm" outputfiledir="netbeans"/>
74
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jsp-syntax.jar">
75
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
76
        <patternset refID="web/jspsyntax.files"/>
77
      </fileset>
78
    </genlist>
82
  </target>
79
  </target>
83
80
84
  <target name="nbm" depends="netbeans">
81
  <target name="nbm" depends="netbeans">
85
    <delete dir="Info"/>
86
    <makenbm file="web-jspsyntax.nbm"
82
    <makenbm file="web-jspsyntax.nbm"
87
             topdir="."
83
             productdir="${netbeans.dest.dir}/${cluster.dir}"
88
             module="netbeans/modules/autoload/jsp-syntax.jar"
84
             module="${nb.modules/autoload.dir}/jsp-syntax.jar"
89
	     homepage="http://web.${homepage.base}/"
85
	     homepage="http://web.${homepage.base}/"
90
	     distribution="http://${dist.base}/web-jspsyntax.nbm">
86
	     distribution="http://${dist.base}/web-jspsyntax.nbm">
91
      <license file="${license.file}"/>
87
      <license file="${license.file}"/>
Lines 93-108 Link Here
93
    </makenbm>
89
    </makenbm>
94
  </target>
90
  </target>
95
91
96
  <target name="clean">
92
  <target name="clean" depends="init">
97
    <delete>
93
    <delete>
98
      <fileset dir="src">
94
      <fileset dir="src">
99
        <include name="**/*.class"/>
95
        <include name="**/*.class"/>
100
      </fileset>
96
      </fileset>
97
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
98
        <patternset refID="web/jspsyntax.files"/>
99
      </fileset>
101
    </delete>
100
    </delete>
102
    <delete file="manifest-subst.mf"/>
101
    <delete file="manifest-subst.mf"/>
103
    <delete file="web-jspsyntax.nbm"/>
102
    <delete file="web-jspsyntax.nbm"/>
104
    <delete dir="Info"/>
105
    <delete dir="netbeans"/>
106
  </target>
103
  </target>
107
104
108
  <target name="real-clean" depends="clean">
105
  <target name="real-clean" depends="clean">
Lines 117-123 Link Here
117
    <locjar jarfile="reload/jsp-syntax.jar"
114
    <locjar jarfile="reload/jsp-syntax.jar"
118
            manifest="manifest-subst.mf"
115
            manifest="manifest-subst.mf"
119
            basedir="src"
116
            basedir="src"
120
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
117
	    excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
121
	    compress="false">
118
	    compress="false">
122
      <include name="org/netbeans/modules/web/core/syntax/"/>
119
      <include name="org/netbeans/modules/web/core/syntax/"/>
123
      <locale name="ja"/>
120
      <locale name="ja"/>
(-)web/servletapi23/build.xml (-28 / +27 lines)
Lines 13-61 Link Here
13
-->
13
-->
14
14
15
<project name="servletapi23" basedir="." default="netbeans">
15
<project name="servletapi23" basedir="." default="netbeans">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
27
  <target name="init">
28
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
20
    <patternset id="web/servletapi23.files">
21
      <include name="${nb.modules/autoload.dir}/servletapi23.jar"/>
22
      <include name="${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
23
    </patternset>
29
  </target>
24
  </target>
30
25
31
  <target name="jars">
26
  <target name="jars" depends="init">
32
    <mkdir dir="netbeans/modules/autoload"/>
27
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
33
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
28
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
34
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
29
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
35
    <locjar jarfile="netbeans/modules/autoload/servletapi23.jar"
30
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi23.jar"
36
            manifest="manifest-subst.mf"
31
         manifest="manifest-subst.mf"
37
            basedir="src"
32
         basedir="src"
38
            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
33
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
39
            compress="false">
34
         compress="false">
40
      <include name="org/netbeans/modules/servletapi23/"/>
35
      <include name="org/netbeans/modules/servletapi23/"/>
41
      <locale name="ja"/>
36
    </jar>
42
    </locjar>
43
  </target>
37
  </target>
44
38
45
  <target name="release" depends="init">
39
  <target name="release" depends="init">
46
    <mkdir dir="netbeans/modules/autoload/ext"/>
40
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
47
    <copy file="../external/servlet-2.3.jar"
41
    <copy file="../external/servlet-2.3.jar"
48
          tofile="netbeans/modules/autoload/ext/servlet-2.3.jar"/>
42
          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
49
  </target>
43
  </target>
50
44
51
  <target name="netbeans" depends="jars,release" description="Builds the module">
45
  <target name="netbeans" depends="jars,release" description="Builds the module">
52
    <genlist targetname="nbm" outputfiledir="netbeans"/>
46
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi23.jar">
47
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
48
        <patternset refID="web/servletapi23.files"/>
49
      </fileset>
50
    </genlist>
53
  </target>
51
  </target>
54
52
55
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
53
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
56
    <makenbm file="servletapi23.nbm"
54
    <makenbm file="servletapi23.nbm"
57
             topdir="."
55
           productdir="${netbeans.dest.dir}/${cluster.dir}"
58
           module="netbeans/modules/autoload/servletapi23.jar"
56
           module="${nb.modules/autoload.dir}/servletapi23.jar"
59
           homepage="http://web.${homepage.base}/"
57
           homepage="http://web.${homepage.base}/"
60
           distribution="http://${dist.base}/servletapi23.nbm">
58
           distribution="http://${dist.base}/servletapi23.nbm">
61
      <license file="${license.file}"/>
59
      <license file="${license.file}"/>
Lines 69-83 Link Here
69
    </makenbm>
67
    </makenbm>
70
  </target>
68
  </target>
71
69
72
  <target name="clean" description="Clean all build products.">
70
  <target name="clean" depends="init" description="Clean all build products.">
73
        <delete>
71
        <delete>
74
            <fileset dir="src">
72
            <fileset dir="src">
75
                <include name="org/netbeans/modules/servletapi23/**/*.class"/>
73
                <include name="org/netbeans/modules/servletapi23/**/*.class"/>
76
            </fileset>
74
            </fileset>
75
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
76
                <patternset refID="web/servletapi23.files"/>
77
            </fileset>
77
        </delete>
78
        </delete>
78
        <delete file="manifest-subst.mf"/>
79
        <delete file="manifest-subst.mf"/>
79
        <delete dir="netbeans"/>
80
        <delete dir="Info"/>
81
        <delete file="servletapi23.nbm"/>
80
        <delete file="servletapi23.nbm"/>
82
  </target>
81
  </target>
83
82
(-)web/servletapi24/build.xml (-29 / +29 lines)
Lines 13-68 Link Here
13
-->
13
-->
14
14
15
<project name="servletapi24" basedir="." default="netbeans">
15
<project name="servletapi24" basedir="." default="netbeans">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
18
  <target name="init" depends="default.init">
18
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
20
21
  <property name="nb_root" location="../.."/>
22
  <property name="homepage.base" value="netbeans.org"/>
23
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
24
  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
25
  <property name="nbm_alias" value="nb_ide"/>
26
27
  <target name="init">
28
    <ant dir="../external" target="unscramble"/>
19
    <ant dir="../external" target="unscramble"/>
29
    <property file="../spec-vers.properties"/>
20
    <property file="../spec-vers.properties"/>
30
    <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
21
    <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
31
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
22
    <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
32
    <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
23
    <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
33
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
24
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
25
    <patternset id="web/servletapi24.files">
26
      <include name="${nb.modules/autoload.dir}/servletapi24.jar"/>
27
      <include name="${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
28
      <include name="${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
29
    </patternset>
34
  </target>
30
  </target>
35
31
36
  <target name="jars" depends="init">
32
  <target name="jars" depends="init">
37
    <mkdir dir="netbeans/modules/autoload"/>
33
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
38
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
34
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
39
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
35
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
40
    <locjar jarfile="netbeans/modules/autoload/servletapi24.jar"
36
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi24.jar"
41
            manifest="manifest-subst.mf"
37
         manifest="manifest-subst.mf"
42
            basedir="src"
38
         basedir="src"
43
            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
39
         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
44
            compress="false">
40
         compress="false">
45
      <include name="org/netbeans/modules/servletapi24/"/>
41
      <include name="org/netbeans/modules/servletapi24/"/>
46
      <locale name="ja"/>
42
    </jar>
47
    </locjar>
48
  </target>
43
  </target>
49
44
50
  <target name="release" depends="init">
45
  <target name="release" depends="init">
51
    <mkdir dir="netbeans/modules/autoload/ext"/>
46
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
52
    <copy file="../external/servlet-api-2.4.jar"
47
    <copy file="../external/servlet-api-2.4.jar"
53
          tofile="netbeans/modules/autoload/ext/servlet-api-2.4.jar"/>
48
          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
54
    <copy file="../external/jsp-api-2.0.jar"
49
    <copy file="../external/jsp-api-2.0.jar"
55
          tofile="netbeans/modules/autoload/ext/jsp-api-2.0.jar"/>
50
          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
56
  </target>
51
  </target>
57
52
58
  <target name="netbeans" depends="jars,release" description="Builds the module">
53
  <target name="netbeans" depends="jars,release" description="Builds the module">
59
    <genlist targetname="nbm" outputfiledir="netbeans"/>
54
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi24.jar">
55
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
56
        <patternset refID="web/servletapi24.files"/>
57
      </fileset>
58
    </genlist>
60
  </target>
59
  </target>
61
60
62
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
61
  <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
63
    <makenbm file="servletapi24.nbm"
62
    <makenbm file="servletapi24.nbm"
64
             topdir="."
63
           productdir="${netbeans.dest.dir}/${cluster.dir}"
65
           module="netbeans/modules/autoload/servletapi24.jar"
64
           module="${nb.modules/autoload.dir}/servletapi24.jar"
66
           homepage="http://web.${homepage.base}/"
65
           homepage="http://web.${homepage.base}/"
67
           distribution="http://${dist.base}/servletapi24.nbm">
66
           distribution="http://${dist.base}/servletapi24.nbm">
68
      <license file="${license.file}"/>
67
      <license file="${license.file}"/>
Lines 70-90 Link Here
70
        <text>For the integration module:</text>
69
        <text>For the integration module:</text>
71
        <file location="${license.file}"/>
70
        <file location="${license.file}"/>
72
        <text>For the Servlet library:</text>
71
        <text>For the Servlet library:</text>
73
        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
72
        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
74
      </license>
73
      </license>
75
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
74
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
76
    </makenbm>
75
    </makenbm>
77
  </target>
76
  </target>
78
77
79
  <target name="clean" description="Clean all build products.">
78
  <target name="clean" depends="init" description="Clean all build products.">
80
        <delete>
79
        <delete>
81
            <fileset dir="src">
80
            <fileset dir="src">
82
                <include name="org/netbeans/modules/servletapi24/**/*.class"/>
81
                <include name="org/netbeans/modules/servletapi24/**/*.class"/>
83
            </fileset>
82
            </fileset>
83
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
84
                <patternset refID="web/servletapi24.files"/>
85
            </fileset>
84
        </delete>
86
        </delete>
85
        <delete file="manifest-subst.mf"/>
87
        <delete file="manifest-subst.mf"/>
86
        <delete dir="netbeans"/>
87
        <delete dir="Info"/>
88
        <delete file="servletapi24.nbm"/>
88
        <delete file="servletapi24.nbm"/>
89
  </target>
89
  </target>
90
90
(-)web/taglibed/build.xml (-44 / +41 lines)
Lines 14-42 Link Here
14
14
15
15
16
<project name="web_taglibed" default="netbeans" basedir=".">
16
<project name="web_taglibed" default="netbeans" basedir=".">
17
  <import file="../../nbbuild/default.xml"/> 
17
18
18
  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
19
  <target name="init" depends="default.init">
19
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
20
    <patternset id="web/taglibed.files">
20
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
21
      <include name="${nb.modules.dir}/taglibed.jar"/>
21
  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../../nbbuild/nbantext.jar"/>
22
    </patternset>
22
	   
23
    <path id="cp">
23
24
      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
24
  <property name="nb_root" location="../.."/>
25
      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
25
  <property name="homepage.base" value="netbeans.org"/>
26
      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
26
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
27
      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
27
  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
28
      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
28
  <property name="nbm_alias" value="nb_ide"/>
29
      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
30
      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
31
      <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar" />
32
      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
33
      <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
34
      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
35
      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
36
    </path>
37
  </target>
29
38
30
  <!-- These are the primary targets. -->
39
  <!-- These are the primary targets. -->
31
  <target name="netbeans" depends="jars">
40
  <target name="netbeans" depends="jars">
32
    <genlist targetname="nbm" outputfiledir="netbeans"/>
41
    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/taglibed.jar">
42
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
43
        <patternset refID="web/taglibed.files"/>
44
      </fileset>
45
    </genlist>
33
  </target>
46
  </target>
34
47
35
  <target name="nbm" depends="netbeans">
48
  <target name="nbm" depends="netbeans">
36
    <delete dir="Info"/>
37
    <makenbm file="web-taglibed.nbm"
49
    <makenbm file="web-taglibed.nbm"
38
             topdir="."
50
             productdir="${netbeans.dest.dir}/${cluster.dir}"
39
	     module="netbeans/modules/taglibed.jar"
51
	     module="${nb.modules.dir}/taglibed.jar"
40
	     homepage="http://web.${homepage.base}/"
52
	     homepage="http://web.${homepage.base}/"
41
	     distribution="http://${dist.base}/web-taglibed.nbm">
53
	     distribution="http://${dist.base}/web-taglibed.nbm">
42
      <license file="${license.file}" />
54
      <license file="${license.file}" />
Lines 44-60 Link Here
44
    </makenbm>
56
    </makenbm>
45
  </target>
57
  </target>
46
58
47
  <target name="clean">
59
  <target name="clean" depends="init">
48
    <delete>
60
    <delete>
49
      <fileset dir="src">
61
      <fileset dir="src">
50
        <include name="**/*.class"/>
62
        <include name="**/*.class"/>
51
      </fileset>
63
      </fileset>
64
      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
65
        <patternset refID="web/taglibed.files"/>
66
      </fileset>
52
    </delete>
67
    </delete>
53
    <delete dir="netbeans"/>
54
    <delete dir="reload"/>
68
    <delete dir="reload"/>
55
    <delete file="manifest-subst.mf"/>
69
    <delete file="manifest-subst.mf"/>
56
    <delete file="web-taglibed.nbm"/>
70
    <delete file="web-taglibed.nbm"/>
57
    <delete dir="Info"/>
58
  </target>
71
  </target>
59
72
60
  <!-- These are the secondary targets. -->
73
  <!-- These are the secondary targets. -->
Lines 62-107 Link Here
62
  <target name="javahelp">
75
  <target name="javahelp">
63
  </target>
76
  </target>
64
77
65
  <target name="compile">
78
  <target name="compile" depends="init">
66
    <javac srcdir="src" destdir="src"
79
    <javac srcdir="src" destdir="src"
67
       deprecation="${build.compiler.deprecation}" 
80
       deprecation="${build.compiler.deprecation}" 
68
       debug="${build.compiler.debug}">
81
       debug="${build.compiler.debug}">
69
       <classpath>
82
       <classpath refID="cp"/>
70
         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
71
72
         <!-- PENDING: Invalid dependency on core -->
73
	 <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/>
74
         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
75
         <pathelement location="${nb_root}/java/api/netbeans/modules/autoload/java-api.jar"/>
76
         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
77
78
         <pathelement location="${nb_root}/httpserver/external/servlet-2.2.jar"/>
79
         <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
80
        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
81
        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
82
        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
83
        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
84
       </classpath>
85
     </javac>
83
     </javac>
86
  </target>
84
  </target>
87
85
88
86
89
  <target name="jars" depends="compile">
87
  <target name="jars" depends="compile">
90
    <mkdir dir="netbeans/modules"/>
88
    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
91
    <property file="${nb_root}/xml/spec-vers.properties"/>
89
    <property file="${nb_all}/xml/spec-vers.properties"/>
92
    <copy file="manifest.mf" tofile="manifest-subst.mf">
90
    <copy file="manifest.mf" tofile="manifest-subst.mf">
93
      <filterchain>
91
      <filterchain>
94
        <expandproperties/>
92
        <expandproperties/>
95
      </filterchain>
93
      </filterchain>
96
    </copy>
94
    </copy>
97
    <locjar jarfile="netbeans/modules/taglibed.jar"
95
    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/taglibed.jar"
98
            manifest="manifest-subst.mf"
96
         manifest="manifest-subst.mf"
99
            basedir="src"
97
         basedir="src"
100
	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
98
	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
101
	    compress="false">
99
	 compress="false">
102
      <include name="org/netbeans/modules/web/"/>
100
      <include name="org/netbeans/modules/web/"/>
103
      <locale name="ja"/>
101
    </jar>
104
    </locjar>
105
  </target>
102
  </target>
106
103
107
  <target name="test-build" depends="compile">
104
  <target name="test-build" depends="compile">
(-)xml/api/build.xml (-41 / +33 lines)
Lines 13-74 Link Here
13
-->
13
-->
14
14
15
<project name="xml/api" default="netbeans" basedir=".">
15
<project name="xml/api" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <target name="init" depends="default.init">
18
19
      <patternset id="xml/api.files">
19
    <property name="nbroot" location="${xml_root}/.."/>
20
        <include name="${nb.modules/autoload.dir}/xml-api.jar"/>
20
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
21
      </patternset>
21
22
      <path id="cp">
22
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
23
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
23
    <property name="homepage.base" value="netbeans.org"/>
24
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
24
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
25
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
25
    <property name="nbm_alias" value="nb_ide"/>
26
      </path>
26
27
    </target>
27
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
28
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
29
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
30
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
31
28
32
    <property name="build.compiler.debug" value="on"/>
29
    <property name="xml_root" location=".."/>
33
30
34
    <target name="compile"> 
31
    <target name="compile" depends="init"> 
35
        <echo message="Compiling XML tools API classes..."/>
32
        <echo message="Compiling XML tools API classes..."/>
36
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
33
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
37
            <classpath>
34
            <classpath refID="cp"/>
38
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
39
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
40
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
41
            </classpath>
42
        </javac>
35
        </javac>
43
    </target>
36
    </target>
44
37
45
    <target name="jars" depends="compile">
38
    <target name="jars" depends="compile">
46
        <mkdir dir="netbeans/modules"/>
39
       <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
47
        <property file="${xml_root}/spec-vers.properties"/>
40
        <property file="${xml_root}/spec-vers.properties"/>
48
        <copy file="manifest.mf" tofile="manifest-subst.mf">
41
        <copy file="manifest.mf" tofile="manifest-subst.mf">
49
            <filterchain>
42
            <filterchain>
50
                <expandproperties/>
43
                <expandproperties/>
51
            </filterchain>
44
            </filterchain>
52
        </copy>
45
        </copy>
53
        <locjar jarfile="netbeans/modules/autoload/xml-api.jar"
46
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-api.jar"
54
                manifest="manifest-subst.mf"
47
                manifest="manifest-subst.mf"
55
                compress="false">
48
                compress="false">
56
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
49
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
57
            <locale name="ja"/>
50
        </jar>    
58
        </locjar>    
59
    </target>
51
    </target>
60
52
61
    <target name="netbeans" depends="jars">
53
    <target name="netbeans" depends="jars">
62
        <genlist targetname="nbm" outputfiledir="netbeans"/>
54
      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-api.jar">
55
         <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
56
           <patternset refID="xml/api.files"/>
57
         </fileset>
58
      </genlist>
63
    </target>
59
    </target>
64
60
65
        
61
        
66
    <target name="nbm" depends="netbeans">
62
    <target name="nbm" depends="netbeans">
67
        <delete dir="Info"/>
63
        <makenbm file="xml-api.nbm"
68
        <makenbm file="../xml-api.nbm"
64
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
69
                 topdir="."
70
                 needsrestart="false"
65
                 needsrestart="false"
71
                 module="netbeans/modules/autoload/xml-api.jar"
66
                 module="${nb.modules/autoload.dir}/xml-api.jar"
72
                 homepage="http://xml.${homepage.base}/api/"
67
                 homepage="http://xml.${homepage.base}/api/"
73
                 distribution="http://${dist.base}/xml-api.nbm">
68
                 distribution="http://${dist.base}/xml-api.nbm">
74
            <license file="${license.file}"/>
69
            <license file="${license.file}"/>
Lines 76-91 Link Here
76
        </makenbm>
71
        </makenbm>
77
    </target>
72
    </target>
78
73
79
    <target name="clean">
74
    <target name="clean" depends="init">
80
        <delete>
75
        <delete>
81
            <fileset dir="src">
76
            <fileset dir="src">
82
                <include name="**/*.class"/>
77
                <include name="**/*.class"/>
83
            </fileset>
78
            </fileset>
79
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
80
              <patternset refID="xml/api.files"/>
81
            </fileset>
84
        </delete>
82
        </delete>
85
        <delete file="manifest-subst.mf"/>
83
        <delete file="manifest-subst.mf"/>
86
        <delete file="../xml-api.nbm"/>
84
        <delete file="xml-api.nbm"/>
87
        <delete dir="netbeans"/>
88
        <delete dir="Info"/>
89
        <delete dir="javadoc"/>
85
        <delete dir="javadoc"/>
90
        <delete dir="XML-APIs"/>
86
        <delete dir="XML-APIs"/>
91
        <delete file="XML-APIs.zip"/>
87
        <delete file="XML-APIs.zip"/>
Lines 108-114 Link Here
108
        </copy>
104
        </copy>
109
    </target>
105
    </target>
110
106
111
    <target name="xml-apis">
107
    <target name="xml-apis" depends="init">
112
        <delete dir="XML-APIs"/>
108
        <delete dir="XML-APIs"/>
113
        <mkdir dir="XML-APIs"/>
109
        <mkdir dir="XML-APIs"/>
114
        
110
        
Lines 129-139 Link Here
129
                <pathelement location="doc"/> <!-- doc-files -->
125
                <pathelement location="doc"/> <!-- doc-files -->
130
                <pathelement location="src"/>
126
                <pathelement location="src"/>
131
            </sourcepath>        
127
            </sourcepath>        
132
            <classpath>        
128
            <classpath refID="cp"/>        
133
                <fileset dir="${nbroot}/openide/netbeans/lib">
134
                    <include name="openide*.jar"/>
135
                </fileset>
136
            </classpath>                       
137
            
129
            
138
            <link href="${jdk-docs-location}"
130
            <link href="${jdk-docs-location}"
139
                  offline="true"
131
                  offline="true"
(-)xml/catalog/build.xml (-62 / +47 lines)
Lines 13-90 Link Here
13
-->
13
-->
14
14
15
<project name="xml/catalog" default="netbeans" basedir=".">
15
<project name="xml/catalog" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="core_root" location="${xml_root}/core"/>
20
    <property name="core_root" location="${xml_root}/core"/>
21
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
20
22
21
    <property name="nbroot" location="${xml_root}/.."/>
23
    <target name="init" depends="default.init">
22
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
24
        <ant dir="${nb_all}/xml/external" target="unscramble"/>
23
25
        <patternset id="xml/catalog.files">
24
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
26
          <include name="${nb.modules.dir}/xml-catalog.jar"/>
25
    <property name="homepage.base" value="netbeans.org"/>
27
          <include name="${nb.modules.dir}/ext/resolver-1_1_nb.jar"/>
26
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
28
        </patternset>
27
    <property name="nbm_alias" value="nb_ide"/>
29
        <path id="cp">
28
30
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
31
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
32
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
33
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
35
          <fileset dir="${nb_all}/xml/external">
34
36
            <include name="resolver*.jar"/>
35
    <property name="build.compiler.debug" value="on"/>
37
          </fileset>
36
38
        </path>
37
38
    <target name="init">
39
        <ant dir="${nbroot}/xml/external" target="unscramble"/>
40
    </target>
39
    </target>
41
40
42
    <target name="compile" depends="init">
41
    <target name="compile" depends="init">
43
        <echo message="Compiling XML catalog module classes..."/>
42
        <echo message="Compiling XML catalog module classes..."/>
44
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
43
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
45
            <classpath>
44
            <classpath refID="cp"/>
46
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
47
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
48
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
49
                <fileset dir="${nbroot}/xml/external">
50
                    <include name="resolver*.jar"/>
51
                </fileset>
52
                <pathelement location="${core_root}/src/"/>
53
                <pathelement location="${api_root}/src/"/>
54
            </classpath>
55
        </javac>
45
        </javac>
56
46
57
        <for-each locations="compat"/>
47
        <for-each locations="compat"/>
58
    </target>
48
    </target>
59
49
60
    <target name="jars" depends="compile">
50
    <target name="jars" depends="compile">
61
        <mkdir dir="netbeans/modules"/>
51
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
62
        <property file="${xml_root}/spec-vers.properties"/>
52
        <property file="${xml_root}/spec-vers.properties"/>
63
        <copy file="manifest.mf" tofile="manifest-subst.mf">
53
        <copy file="manifest.mf" tofile="manifest-subst.mf">
64
            <filterchain>
54
            <filterchain>
65
                <expandproperties/>
55
                <expandproperties/>
66
            </filterchain>
56
            </filterchain>
67
        </copy>
57
        </copy>
68
        <locjar jarfile="netbeans/modules/xml-catalog.jar"
58
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-catalog.jar"
69
                manifest="manifest-subst.mf"
59
             manifest="manifest-subst.mf"
70
                compress="false">
60
             compress="false">
71
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
61
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
72
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
62
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
73
            <locale name="ja"/>
63
        </jar>    
74
        </locjar>    
75
    </target>
64
    </target>
76
65
77
    <target name="release" depends="init">
66
    <target name="release" depends="init">
78
        <mkdir dir="netbeans/modules/ext"/>
67
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
79
        <copy file="${nbroot}/xml/external/resolver-1_1_nb.jar" tofile="netbeans/modules/ext/resolver-1_1_nb.jar"/>
68
        <copy file="${nb_all}/xml/external/resolver-1_1_nb.jar" 
80
    </target>
69
              tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/resolver-1_1_nb.jar"/>
81
82
    <target name="javahelp">
83
        <!-- It is a part of core module now. -->
84
    </target>
70
    </target>
85
71
86
    <target name="netbeans" depends="jars,release,javahelp">
72
    <target name="netbeans" depends="jars,release">
87
        <genlist targetname="nbm" outputfiledir="netbeans"/>
73
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-catalog.jar">
74
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
75
             <patternset refID="xml/catalog.files"/>
76
          </fileset>
77
       </genlist>
88
    </target>
78
    </target>
89
    
79
    
90
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
80
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 98-108 Link Here
98
    </target>
88
    </target>
99
    
89
    
100
    <target name="nbm" depends="netbeans">
90
    <target name="nbm" depends="netbeans">
101
        <delete dir="Info"/>
91
        <makenbm file="xml-catalog.nbm"
102
        <makenbm file="../xml-catalog.nbm"
92
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
103
                 topdir="."
104
                 needsrestart="false"
93
                 needsrestart="false"
105
                 module="netbeans/modules/xml-catalog.jar"
94
                 module="${nb.modules.dir}/xml-catalog.jar"
106
                 homepage="http://xml.${homepage.base}/catalog/"
95
                 homepage="http://xml.${homepage.base}/catalog/"
107
                 distribution="http://${dist.base}/xml-catalog.nbm">
96
                 distribution="http://${dist.base}/xml-catalog.nbm">
108
            <license file="${license.file}"/>
97
            <license file="${license.file}"/>
Lines 110-131 Link Here
110
                 <text>For the XML Entity Catalog module itself:</text>
99
                 <text>For the XML Entity Catalog module itself:</text>
111
                 <file location="${license.file}"/>
100
                 <file location="${license.file}"/>
112
                 <text>For the XML Resolver library:</text>
101
                 <text>For the XML Resolver library:</text>
113
                 <file location="${nbroot}/xml/external/resolver-license.txt"/>
102
                 <file location="${nb_all}/xml/external/resolver-license.txt"/>
114
            </license>
103
            </license>
115
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
104
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
116
        </makenbm>
105
        </makenbm>
117
    </target>
106
    </target>
118
107
119
    <target name="clean">
108
    <target name="clean" depends="init">
120
        <delete>
109
        <delete>
121
            <fileset dir="src">
110
            <fileset dir="src">
122
                <include name="**/*.class"/>
111
                <include name="**/*.class"/>
123
            </fileset>
112
            </fileset>
113
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
114
              <patternset refID="xml/catalog.files"/>
115
            </fileset>
124
        </delete>
116
        </delete>
125
        <delete file="manifest-subst.mf"/>
117
        <delete file="manifest-subst.mf"/>
126
        <delete file="../xml-catalog.nbm"/>
118
        <delete file="xml-catalog.nbm"/>
127
        <delete dir="netbeans"/>
128
        <delete dir="Info"/>
129
119
130
        <for-each locations="compat"/>
120
        <for-each locations="compat"/>
131
    </target>
121
    </target>
Lines 138-144 Link Here
138
128
139
    <target name="all" depends="clean,nbm"/>
129
    <target name="all" depends="clean,nbm"/>
140
130
141
    <target name="javadoc">
131
    <target name="javadoc" depends="init">
142
        <delete dir="javadoc"/>
132
        <delete dir="javadoc"/>
143
        <mkdir dir="javadoc"/>
133
        <mkdir dir="javadoc"/>
144
134
Lines 156-168 Link Here
156
            <sourcepath>
146
            <sourcepath>
157
                <pathelement location="src"/>
147
                <pathelement location="src"/>
158
            </sourcepath>        
148
            </sourcepath>        
159
            <classpath>        
149
            <classpath refID="cp"/>
160
                <fileset dir="${nbroot}/openide/netbeans/lib">
150
           
161
                    <include name="openide*.jar"/>
162
                </fileset>
163
                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
164
            </classpath>
165
            
166
            <link href="${jdk-docs-location}"
151
            <link href="${jdk-docs-location}"
167
                  offline="true"
152
                  offline="true"
168
                  packagelistLoc="${api_root}/doc/external/jdk"
153
                  packagelistLoc="${api_root}/doc/external/jdk"
(-)xml/catalog/compat/build.xml (-10 / +4 lines)
Lines 13-36 Link Here
13
-->
13
-->
14
14
15
<project name="xml/catalog/compat" default="compile" basedir=".">
15
<project name="xml/catalog/compat" default="compile" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="catalog_root" location=".."/>
18
    <property name="catalog_root" location=".."/>
18
    <property name="xml_root" location="${catalog_root}/.."/>
19
    <property name="xml_root" location="${catalog_root}/.."/>
19
20
20
    <property name="nbroot" location="${xml_root}/.."/>
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
22
23
    <property name="build.compiler.debug" value="on"/>
24
25
26
    <target name="compile">
21
    <target name="compile">
27
        <echo message="Compiling backward compatibility Catalog module classes..."/>
22
        <echo message="Compiling backward compatibility Catalog module classes..."/>
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
23
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
            <classpath>
24
            <classpath>
30
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
25
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
                <fileset dir="${nbroot}/openide/netbeans/lib">
26
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
                    <include name="openide*.jar"/>
27
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
                </fileset>
34
                <pathelement location="${catalog_root}/src/"/>
28
                <pathelement location="${catalog_root}/src/"/>
35
            </classpath>
29
            </classpath>
36
        </javac>
30
        </javac>
(-)xml/core/build.xml (-58 / +49 lines)
Lines 13-79 Link Here
13
-->
13
-->
14
14
15
<project name="xml/core" default="netbeans" basedir=".">
15
<project name="xml/core" default="netbeans" basedir=".">
16
  <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="tax_root" location="${xml_root}/tax"/>
20
    <property name="tax_root" location="${xml_root}/tax"/>
20
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
22
22
    <property name="nbroot" location="${xml_root}/.."/>
23
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
23
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
24
24
25
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
25
    <target name="init" depends="default.init">
26
    <property name="homepage.base" value="netbeans.org"/>
26
      <patternset id="xml/core.files">
27
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
27
        <include name="${nb.modules/autoload.dir}/xml-core.jar"/>
28
    <property name="nbm_alias" value="nb_ide"/>
28
      </patternset>
29
29
      <path id="cp">
30
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
30
        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
31
        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
32
        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
33
        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
34
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
34
        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
35
35
        <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
36
    <property name="build.compiler.debug" value="on"/>
36
      </path>
37
    </target>
37
38
38
    <target name="compile">
39
    <target name="compile" depends="init">
39
        <echo message="Compiling XML core module classes..."/>
40
        <echo message="Compiling XML core module classes..."/>
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath>        
42
            <classpath refID="cp"/>
42
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
43
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
44
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
                <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
46
                <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
47
                <pathelement location="${api_root}/src/"/>
48
            </classpath>
49
        </javac>
43
        </javac>
50
44
51
        <for-each locations="compat"/>
45
        <for-each locations="compat"/>
52
    </target>
46
    </target>
53
47
54
    <target name="jars" depends="compile">
48
    <target name="jars" depends="compile">
55
        <mkdir dir="netbeans/modules"/>
49
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
56
        <property file="${xml_root}/spec-vers.properties"/>
50
        <property file="${xml_root}/spec-vers.properties"/>
57
        <copy file="manifest.mf" tofile="manifest-subst.mf">
51
        <copy file="manifest.mf" tofile="manifest-subst.mf">
58
            <filterchain>
52
            <filterchain>
59
                <expandproperties/>
53
                <expandproperties/>
60
            </filterchain>
54
            </filterchain>
61
        </copy>
55
        </copy>
62
        <locjar jarfile="netbeans/modules/autoload/xml-core.jar"
56
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-core.jar"
63
                manifest="manifest-subst.mf"
57
             manifest="manifest-subst.mf"
64
                compress="false">
58
             compress="false">
65
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
59
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
66
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
60
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
67
            <locale name="ja"/>
61
        </jar>
68
        </locjar>
69
    </target>
62
    </target>
70
63
71
    <target name="javahelp">
64
    <target name="javahelp" depends="init">
72
        <mkdir dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
65
        <mkdir dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
73
        <jhindexer basedir="javahelp/org/netbeans/modules/xml/core/docs/"
66
        <jhindexer basedir="javahelp/org/netbeans/modules/xml/core/docs/"
74
                   db="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch">
67
                   db="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch">
75
            <classpath>
68
            <classpath>
76
                <fileset dir="${nbroot}/nbbuild/external">
69
                <fileset dir="${nb_all}/nbbuild/external">
77
                    <include name="jhall*.jar"/>
70
                    <include name="jhall*.jar"/>
78
                </fileset>
71
                </fileset>
79
            </classpath>
72
            </classpath>
Lines 81-96 Link Here
81
            <exclude name="JavaHelpSearch/"/>
74
            <exclude name="JavaHelpSearch/"/>
82
        </jhindexer>
75
        </jhindexer>
83
76
84
        <mkdir dir="netbeans/modules/docs"/>
77
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
85
        <locjar jarfile="netbeans/modules/autoload/docs/xml-core.jar"
78
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}/xml-core.jar"
86
                compress="true">
79
             compress="true">
87
            <fileset dir="javahelp" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
80
            <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
88
            <locale name="ja"/>
81
        </jar>
89
        </locjar>
90
    </target>
82
    </target>
91
83
92
    <target name="netbeans" depends="jars,javahelp">
84
    <target name="netbeans" depends="jars,javahelp">
93
        <genlist targetname="nbm" outputfiledir="netbeans"/>
85
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-core.jar">
86
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
87
             <patternset refID="xml/core.files"/>
88
          </fileset>
89
       </genlist>
94
    </target>
90
    </target>
95
91
96
    
92
    
Lines 99-117 Link Here
99
95
100
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
96
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
101
        <jar jarfile="test/xml-core-test.jar" manifest="manifest-subst.mf" compress="false">
97
        <jar jarfile="test/xml-core-test.jar" manifest="manifest-subst.mf" compress="false">
102
            <fileset dir="src" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
98
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
103
            <fileset dir="javahelp" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
99
            <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
104
        </jar>
100
        </jar>
105
        <nbinstaller module="test/xml-core-test.jar" action="reinstall"/>
101
        <nbinstaller module="test/xml-core-test.jar" action="reinstall"/>
106
    </target>
102
    </target>
107
    
103
    
108
    
104
    
109
    <target name="nbm" depends="netbeans">
105
    <target name="nbm" depends="netbeans">
110
        <delete dir="Info"/>
106
        <makenbm file="xml-core.nbm"
111
        <makenbm file="../xml-core.nbm"
107
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
112
                 topdir="."
113
                 needsrestart="false"
108
                 needsrestart="false"
114
                 module="netbeans/modules/autoload/xml-core.jar"
109
                 module="${nb.modules/autoload.dir}/xml-core.jar"
115
                 homepage="http://xml.${homepage.base}/core/"
110
                 homepage="http://xml.${homepage.base}/core/"
116
                 distribution="http://${dist.base}/xml-core.nbm">
111
                 distribution="http://${dist.base}/xml-core.nbm">
117
            <license file="${license.file}"/>
112
            <license file="${license.file}"/>
Lines 119-134 Link Here
119
        </makenbm>
114
        </makenbm>
120
    </target>
115
    </target>
121
116
122
    <target name="clean">
117
    <target name="clean" depends="init">
123
        <delete>
118
        <delete>
124
            <fileset dir="src">
119
            <fileset dir="src">
125
                <include name="**/*.class"/>
120
                <include name="**/*.class"/>
126
            </fileset>
121
            </fileset>
122
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
123
                <patternset refID="xml/core.files"/>
124
            </fileset>
127
        </delete>
125
        </delete>
128
        <delete file="manifest-subst.mf"/>
126
        <delete file="manifest-subst.mf"/>
129
        <delete file="../xml-core.nbm"/>
127
        <delete file="xml-core.nbm"/>
130
        <delete dir="netbeans"/>
131
        <delete dir="Info"/>
132
        <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
128
        <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
133
129
134
        <for-each locations="compat"/>
130
        <for-each locations="compat"/>
Lines 142-148 Link Here
142
138
143
    <target name="all" depends="clean,nbm"/>
139
    <target name="all" depends="clean,nbm"/>
144
140
145
    <target name="javadoc">
141
    <target name="javadoc" depends="init">
146
        <delete dir="javadoc"/>
142
        <delete dir="javadoc"/>
147
        <mkdir dir="javadoc"/>
143
        <mkdir dir="javadoc"/>
148
144
Lines 159-171 Link Here
159
        >
155
        >
160
            <sourcepath>
156
            <sourcepath>
161
                <pathelement location="src"/>
157
                <pathelement location="src"/>
162
            </sourcepath>        
158
            </sourcepath>
163
            <classpath>        
159
            <classpath refID="cp"/>
164
                <fileset dir="${nbroot}/openide/netbeans/lib">
165
                    <include name="openide*.jar"/>
166
                </fileset>
167
            </classpath>
168
            
169
            <link href="${jdk-docs-location}"
160
            <link href="${jdk-docs-location}"
170
                  offline="true"
161
                  offline="true"
171
                  packagelistLoc="${api_root}/doc/external/jdk"
162
                  packagelistLoc="${api_root}/doc/external/jdk"
(-)xml/core/compat/build.xml (-11 / +4 lines)
Lines 13-37 Link Here
13
-->
13
-->
14
14
15
<project name="xml/core/compat" default="compile" basedir=".">
15
<project name="xml/core/compat" default="compile" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="core_root" location=".."/>
18
    <property name="core_root" location=".."/>
18
    <property name="xml_root" location="${core_root}/.."/>
19
    <property name="xml_root" location="${core_root}/.."/>
19
20
20
    <property name="nbroot" location="${xml_root}/.."/>
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
22
23
    <property name="build.compiler.debug" value="on"/>
24
25
26
    <target name="compile">
21
    <target name="compile">
27
        <echo message="Compiling backward compatibility Core module classes..."/>
22
        <echo message="Compiling backward compatibility Core module classes..."/>
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
23
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
            <classpath>
24
            <classpath>
30
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
25
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
                <fileset dir="${nbroot}/openide/netbeans/lib">
26
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
                    <include name="openide*.jar"/>
27
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
                </fileset>
34
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
35
                <pathelement location="${core_root}/src/"/>
28
                <pathelement location="${core_root}/src/"/>
36
                <pathelement location="${xml_root}/tax/lib/src" /> <!-- makes AspectJ ajc happy -->
29
                <pathelement location="${xml_root}/tax/lib/src" /> <!-- makes AspectJ ajc happy -->
37
            </classpath>
30
            </classpath>
(-)xml/css/build.xml (-55 / +46 lines)
Lines 13-94 Link Here
13
-->
13
-->
14
14
15
<project name="xml/css" default="netbeans" basedir=".">
15
<project name="xml/css" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
20
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
19
21
20
    <property name="nbroot" location="${xml_root}/.."/>
22
    <target name="init" depends="default.init">
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
23
        <ant dir="${nb_all}/xml/external" target="unscramble"/>
22
24
        <patternset id="xml/css.files">
23
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
25
          <include name="${nb.modules.dir}/css.jar"/>
24
    <property name="homepage.base" value="netbeans.org"/>
26
          <include name="${nb.modules.dir}/ext/sac.jar"/>
25
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
27
          <include name="${nb.modules.dir}/ext/flute.jar"/>
26
    <property name="nbm_alias" value="nb_ide"/>
28
        </patternset>
27
29
        <path id="cp">
28
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
30
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
29
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
31
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
30
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
31
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
32
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
33
35
          <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
34
    <property name="build.compiler.debug" value="on"/>
36
          <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
35
37
          <pathelement location="${nb_all}/xml/external/sac.jar"/>
36
38
          <pathelement location="${nb_all}/xml/external/flute.jar"/>
37
    <target name="init">
39
        </path>
38
        <ant dir="${nbroot}/xml/external" target="unscramble"/>
39
    </target>
40
    </target>
40
41
41
    <target name="compile" depends="init">
42
    <target name="compile" depends="init">
42
        <echo message="Compiling CSS module classes..."/>
43
        <echo message="Compiling CSS module classes..."/>
43
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
            <classpath>        
45
            <classpath refID="cp"/>
45
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
46
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
47
                <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
48
                <pathelement location="${api_root}/src/"/>
49
                <pathelement location="${nbroot}/editor/netbeans/modules/ext/nb-editor.jar"/>
50
                <pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
51
                <pathelement location="${nbroot}/xml/external/sac.jar"/>
52
                <pathelement location="${nbroot}/xml/external/flute.jar"/>
53
            </classpath>
54
        </javac>
46
        </javac>
55
47
56
        <for-each locations="compat"/>
48
        <for-each locations="compat"/>
57
    </target>
49
    </target>
58
50
59
    <target name="jars" depends="compile">
51
    <target name="jars" depends="compile">
60
        <mkdir dir="netbeans/modules"/>
52
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
61
        <property file="${xml_root}/spec-vers.properties"/>
53
        <property file="${xml_root}/spec-vers.properties"/>
62
        <copy file="manifest.mf" tofile="manifest-subst.mf">
54
        <copy file="manifest.mf" tofile="manifest-subst.mf">
63
            <filterchain>
55
            <filterchain>
64
                <expandproperties/>
56
                <expandproperties/>
65
            </filterchain>
57
            </filterchain>
66
        </copy>
58
        </copy>
67
        <locjar jarfile="netbeans/modules/css.jar"
59
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/css.jar"
68
                manifest="manifest-subst.mf"
60
             manifest="manifest-subst.mf"
69
                compress="false">
61
             compress="false">
70
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
62
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
71
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
63
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
72
            <locale name="ja"/>
64
        </jar>    
73
        </locjar>    
74
    </target>
65
    </target>
75
66
76
    <target name="release" depends="init">
67
    <target name="release" depends="init">
77
        <mkdir dir="netbeans/modules/ext"/>
68
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
78
        <copy todir="netbeans/modules/ext">
69
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
79
            <fileset dir="${nbroot}/xml/external">
70
            <fileset dir="${nb_all}/xml/external">
80
                <include name="flute*.jar"/>
71
                <include name="flute*.jar"/>
81
                <include name="sac*.jar"/>
72
                <include name="sac*.jar"/>
82
            </fileset>
73
            </fileset>
83
        </copy>
74
        </copy>
84
    </target>
75
    </target>
85
76
86
    <target name="javahelp">
77
    <target name="netbeans" depends="jars,release">
87
        <!-- It is a part of core module now. -->
78
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/css.jar">
88
    </target>
79
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
89
80
             <patternset refID="xml/css.files"/>
90
    <target name="netbeans" depends="jars,release,javahelp">
81
          </fileset>
91
        <genlist targetname="nbm" outputfiledir="netbeans"/>
82
       </genlist>
92
    </target>
83
    </target>
93
84
94
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
85
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 102-112 Link Here
102
    
93
    
103
    
94
    
104
    <target name="nbm" depends="netbeans">
95
    <target name="nbm" depends="netbeans">
105
        <delete dir="Info"/>
96
        <makenbm file="css.nbm"
106
        <makenbm file="../css.nbm"
97
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
107
                 topdir="."
108
                 needsrestart="false"
98
                 needsrestart="false"
109
                 module="netbeans/modules/css.jar"
99
                 module="${nb.modules.dir}/css.jar"
110
                 homepage="http://xml.${homepage.base}/css/"
100
                 homepage="http://xml.${homepage.base}/css/"
111
                 distribution="http://${dist.base}/css.nbm">
101
                 distribution="http://${dist.base}/css.nbm">
112
            <license name="css-license.txt">
102
            <license name="css-license.txt">
Lines 114-135 Link Here
114
                 <file location="${license.file}"/>
104
                 <file location="${license.file}"/>
115
                 <text>For the W3C's SAC and Flute libraries:</text>
105
                 <text>For the W3C's SAC and Flute libraries:</text>
116
                 <!-- XXX better to include text not HTML -->
106
                 <!-- XXX better to include text not HTML -->
117
                 <file location="${nbroot}/xml/external/flute-sac-license.html"/>
107
                 <file location="${nb_all}/xml/external/flute-sac-license.html"/>
118
            </license>            
108
            </license>            
119
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
109
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
120
        </makenbm>
110
        </makenbm>
121
    </target>
111
    </target>
122
112
123
    <target name="clean">
113
    <target name="clean" depends="init">
124
        <delete>
114
        <delete>
125
            <fileset dir="src">
115
            <fileset dir="src">
126
                <include name="**/*.class"/>
116
                <include name="**/*.class"/>
127
            </fileset>
117
            </fileset>
118
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
119
              <patternset refID="xml/css.files"/>
120
            </fileset>
128
        </delete>
121
        </delete>
129
        <delete file="manifest-subst.mf"/>
122
        <delete file="manifest-subst.mf"/>
130
        <delete file="../css.nbm"/>
123
        <delete file="css.nbm"/>
131
        <delete dir="netbeans"/>
132
        <delete dir="Info"/>
133
124
134
        <for-each locations="compat"/>
125
        <for-each locations="compat"/>
135
    </target>
126
    </target>
(-)xml/css/manifest.mf (-2 / +1 lines)
Lines 17-23 Link Here
17
17
18
Name: org/netbeans/modules/css/CSSLoader.class
18
Name: org/netbeans/modules/css/CSSLoader.class
19
OpenIDE-Module-Class: Loader
19
OpenIDE-Module-Class: Loader
20
Install-After: org.netbeans.modules.xml.core.XMLDataObject
20
Install-After: org.netbeans.modules.xml.core.XMLDataObject, org.netbeans.modules.xml.core.DTDDataObject
21
Install-After: org.netbeans.modules.xml.core.DTDDataObject
22
Install-Before: org.netbeans.modules.text.TXTDataObject
21
Install-Before: org.netbeans.modules.text.TXTDataObject
23
22
(-)xml/css/compat/build.xml (-10 / +4 lines)
Lines 13-36 Link Here
13
-->
13
-->
14
14
15
<project name="xml/css/compat" default="compile" basedir=".">
15
<project name="xml/css/compat" default="compile" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="css_root" location=".."/>
18
    <property name="css_root" location=".."/>
18
    <property name="xml_root" location="${css_root}/.."/>
19
    <property name="xml_root" location="${css_root}/.."/>
19
20
20
    <property name="nbroot" location="${xml_root}/.."/>
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
22
23
    <property name="build.compiler.debug" value="on"/>
24
25
26
    <target name="compile">
21
    <target name="compile">
27
        <echo message="Compiling backward compatibility CSS module classes..."/>
22
        <echo message="Compiling backward compatibility CSS module classes..."/>
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
23
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
            <classpath>
24
            <classpath>
30
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
25
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
                <fileset dir="${nbroot}/openide/netbeans/lib">
26
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
                    <include name="openide*.jar"/>
27
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
                </fileset>
34
                <pathelement location="${css_root}/src/"/>
28
                <pathelement location="${css_root}/src/"/>
35
            </classpath>
29
            </classpath>
36
        </javac>
30
        </javac>
(-)xml/schema/build.xml (-44 / +36 lines)
Lines 13-75 Link Here
13
-->
13
-->
14
14
15
<project name="xml/schema" default="netbeans" basedir=".">
15
<project name="xml/schema" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="tax_root" location="${xml_root}/tax"/>
20
    <property name="tax_root" location="${xml_root}/tax"/>
20
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
22
22
    <property name="nbroot" location="${xml_root}/.."/>
23
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
23
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
24
24
25
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
25
    <target name="init" depends="default.init">
26
    <property name="homepage.base" value="netbeans.org"/>
26
        <patternset id="xml/schema.files">
27
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
27
          <include name="${nb.modules.dir}/xml-schema.jar"/>
28
    <property name="nbm_alias" value="nb_ide"/>
28
        </patternset>
29
29
        <path id="cp">
30
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
30
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
31
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
34
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
35
35
        </path>
36
    <property name="build.compiler.debug" value="on"/>
36
    </target>
37
37
38
    <target name="compile">
38
    <target name="compile" depends="init">
39
        <echo message="Compiling XML schema module classes..."/>
39
        <echo message="Compiling XML schema module classes..."/>
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath>        
41
            <classpath refID="cp"/>
42
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
43
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
44
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
                <pathelement location="${api_root}/src/"/>
46
                <pathelement location="${xml_root}/core/src/"/>
47
            </classpath>
48
        </javac>
42
        </javac>
49
    </target>
43
    </target>
50
44
51
    <target name="jars" depends="compile">
45
    <target name="jars" depends="compile">
52
        <mkdir dir="netbeans/modules"/>
46
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
53
        <property file="${xml_root}/spec-vers.properties"/>
47
        <property file="${xml_root}/spec-vers.properties"/>
54
        <copy file="manifest.mf" tofile="manifest-subst.mf">
48
        <copy file="manifest.mf" tofile="manifest-subst.mf">
55
            <filterchain>
49
            <filterchain>
56
                <expandproperties/>
50
                <expandproperties/>
57
            </filterchain>
51
            </filterchain>
58
        </copy>
52
        </copy>
59
        <locjar jarfile="netbeans/modules/xml-schema.jar"
53
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-schema.jar"
60
                manifest="manifest-subst.mf"
54
             manifest="manifest-subst.mf"
61
                compress="false">
55
             compress="false">
62
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
56
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
63
            <locale name="ja"/>
57
        </jar>    
64
        </locjar>    
65
    </target>
58
    </target>
66
59
67
    <target name="release">
60
    <target name="netbeans" depends="jars">
68
    </target>
61
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-schema.jar">
69
62
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
70
63
             <patternset refID="xml/schema.files"/>
71
    <target name="netbeans" depends="jars,release">
64
          </fileset>
72
        <genlist targetname="nbm" outputfiledir="netbeans"/>
65
       </genlist>
73
    </target>
66
    </target>
74
   
67
   
75
    <target name="javahelp" description="Please use xml/core javahelp target instead." />
68
    <target name="javahelp" description="Please use xml/core javahelp target instead." />
Lines 86-96 Link Here
86
    
79
    
87
    
80
    
88
    <target name="nbm" depends="netbeans">
81
    <target name="nbm" depends="netbeans">
89
        <delete dir="Info"/>
82
        <makenbm file="xml-schema.nbm"
90
        <makenbm file="../xml-schema.nbm"
83
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
91
                 topdir="."
92
                 needsrestart="false"
84
                 needsrestart="false"
93
                 module="netbeans/modules/xml-schema.jar"
85
                 module="${nb.modules.dir}/xml-schema.jar"
94
                 homepage="http://xml.${homepage.base}/schema/"
86
                 homepage="http://xml.${homepage.base}/schema/"
95
                 distribution="http://${dist.base}/xml-schema.nbm">
87
                 distribution="http://${dist.base}/xml-schema.nbm">
96
            <license file="${license.file}"/>
88
            <license file="${license.file}"/>
Lines 98-115 Link Here
98
        </makenbm>
90
        </makenbm>
99
    </target>
91
    </target>
100
92
101
    <target name="clean">
93
    <target name="clean" depends="init">
102
        <delete>
94
        <delete>
103
            <fileset dir="src">
95
            <fileset dir="src">
104
                <include name="**/*.class"/>
96
                <include name="**/*.class"/>
105
            </fileset>
97
            </fileset>
98
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
99
                <patternset refID="xml/schema.files"/>
100
            </fileset>
106
        </delete>
101
        </delete>
107
        <delete file="manifest-subst.mf"/>
102
        <delete file="manifest-subst.mf"/>
108
        <delete file="../xml-schema.nbm"/>
103
        <delete file="xml-schema.nbm"/>
109
        <delete dir="netbeans"/>
110
        <delete dir="Info"/>
111
        <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
104
        <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
112
113
    </target>
105
    </target>
114
106
115
    <target name="real-clean" depends="clean">
107
    <target name="real-clean" depends="clean">
(-)xml/tax/build.xml (-49 / +44 lines)
Lines 13-51 Link Here
13
-->
13
-->
14
14
15
<project name="xml/tax" default="netbeans" basedir=".">
15
<project name="xml/tax" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="lib_root" location="lib"/>
18
    <property name="lib_root" location="lib"/>
18
    <property name="xml_root" location=".."/>
19
    <property name="xml_root" location=".."/>
19
    <property name="api_root" location="${xml_root}/api"/>
20
    <property name="api_root" location="${xml_root}/api"/>
20
21
21
    <property name="nbroot" location="${xml_root}/.."/>
22
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
22
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
23
23
24
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24
    <target name="init" depends="default.init">
25
    <property name="homepage.base" value="netbeans.org"/>
25
      <patternset id="xml/tax.files">
26
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
26
        <include name="${nb.modules/autoload.dir}/xml-tax.jar"/>
27
    <property name="nbm_alias" value="nb_ide"/>
27
        <include name="${nb.modules/autoload.dir}/ext/tax.jar"/>
28
28
        <include name="${nb.modules/autoload.dir}/ext/xerces2.jar"/>
29
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
29
      </patternset>
30
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
30
      <path id="cp">
31
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
31
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
32
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
32
         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
33
33
         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
34
    <property name="build.compiler.debug" value="on"/>
34
         <pathelement location="${lib_root}/src"/>
35
         <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
36
         <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
37
      </path>
38
    </target>
35
39
36
    <target name="compile">
40
    <target name="compile" depends="init">
37
        <for-each locations="lib"/>
41
        <for-each locations="lib"/>
38
42
39
        <echo message="Compiling TAX module classes..."/>
43
        <echo message="Compiling TAX module classes..."/>
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath>        
45
            <classpath refID="cp"/>
42
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
43
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
44
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
45
                <pathelement location="${lib_root}/src"/>
46
                <pathelement location="${api_root}/src/"/>
47
                <pathelement location="../core/src/"/>
48
            </classpath>
49
        </javac>
46
        </javac>
50
47
51
        <for-each locations="compat"/>
48
        <for-each locations="compat"/>
Lines 53-86 Link Here
53
50
54
    <target name="jars" depends="compile">
51
    <target name="jars" depends="compile">
55
        <for-each locations="lib"/>
52
        <for-each locations="lib"/>
56
        <mkdir dir="netbeans/modules/autoload"/>   
53
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
57
        <property file="${xml_root}/spec-vers.properties"/>
54
        <property file="${xml_root}/spec-vers.properties"/>
58
        <copy file="manifest.mf" tofile="manifest-subst.mf">
55
        <copy file="manifest.mf" tofile="manifest-subst.mf">
59
            <filterchain>
56
            <filterchain>
60
                <expandproperties/>
57
                <expandproperties/>
61
            </filterchain>
58
            </filterchain>
62
        </copy>
59
        </copy>
63
        <locjar jarfile="netbeans/modules/autoload/xml-tax.jar"
60
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-tax.jar"
64
                manifest="manifest-subst.mf"
61
             manifest="manifest-subst.mf"
65
                compress="false">
62
             compress="false">
66
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
63
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
67
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
64
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
68
            <locale name="ja"/>
65
        </jar>
69
        </locjar>
70
    </target>
66
    </target>
71
67
72
    <target name="release">
68
    <target name="release">
73
        <for-each locations="lib"/>
69
        <for-each locations="lib"/>
74
    </target>
70
    </target>
75
71
76
    <target name="javahelp">
72
    <target name="netbeans" depends="jars,release">
77
        <!-- It is a part of core module now. -->
73
       <for-each locations="lib"/>
78
    </target>
74
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-tax.jar">
79
75
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
80
    <target name="netbeans" depends="jars,release,javahelp">
76
             <patternset refID="xml/tax.files"/>
81
        <for-each locations="lib"/>
77
          </fileset>
82
78
       </genlist>
83
        <genlist targetname="nbm" outputfiledir="netbeans"/>
84
    </target>
79
    </target>
85
80
86
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
81
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 88-130 Link Here
88
83
89
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
84
        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
90
        <jar jarfile="test/xml-tax-test.jar" manifest="manifest-subst.mf" compress="false">
85
        <jar jarfile="test/xml-tax-test.jar" manifest="manifest-subst.mf" compress="false">
91
            <fileset dir="src" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
86
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
92
            <fileset dir="${lib_root}/src" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
87
            <fileset dir="${lib_root}/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
93
        </jar>
88
        </jar>
94
        <nbinstaller module="test/xml-tax-test.jar" action="reinstall"/>
89
        <nbinstaller module="test/xml-tax-test.jar" action="reinstall"/>
95
    </target>
90
    </target>
96
    
91
    
97
    
92
    
98
    <target name="nbm" depends="netbeans">
93
    <target name="nbm" depends="netbeans">
99
        <delete dir="Info"/>
94
        <makenbm file="xml-tax.nbm"
100
        <makenbm file="../xml-tax.nbm"
95
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
101
                 topdir="."
102
                 needsrestart="false"
96
                 needsrestart="false"
103
                 module="netbeans/modules/autoload/xml-tax.jar"
97
                 module="${nb.modules/autoload.dir}/xml-tax.jar"
104
                 homepage="http://xml.${homepage.base}/tax/"
98
                 homepage="http://xml.${homepage.base}/tax/"
105
                 distribution="http://${dist.base}/xml-tax.nbm">
99
                 distribution="http://${dist.base}/xml-tax.nbm">
106
             <license name="xml-tax-license.txt">
100
             <license name="xml-tax-license.txt">
107
                 <text>For the Tree API for XML ("TAX") module itself:</text>
101
                 <text>For the Tree API for XML ("TAX") module itself:</text>
108
                 <file location="${license.file}"/>
102
                 <file location="${license.file}"/>
109
                 <text>For the Apache's XML Parser (Xerces):</text>
103
                 <text>For the Apache's XML Parser (Xerces):</text>
110
                 <file location="${nbroot}/nbbuild/external/apache-license.txt"/>
104
                 <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
111
            </license>
105
            </license>
112
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
106
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
113
        </makenbm>
107
        </makenbm>
114
    </target>
108
    </target>
115
109
116
    <target name="clean">
110
    <target name="clean" depends="init">
117
        <for-each locations="lib"/>
111
        <for-each locations="lib"/>
118
112
119
        <delete>
113
        <delete>
120
            <fileset dir="src">
114
            <fileset dir="src">
121
                <include name="**/*.class"/>
115
                <include name="**/*.class"/>
122
            </fileset>
116
            </fileset>
117
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
118
              <patternset refID="xml/tax.files"/>
119
            </fileset>
123
        </delete>
120
        </delete>
124
        <delete file="manifest-subst.mf"/>
121
        <delete file="manifest-subst.mf"/>
125
        <delete file="../xml-tax.nbm"/>
122
        <delete file="xml-tax.nbm"/>
126
        <delete dir="netbeans"/>
127
        <delete dir="Info"/>
128
123
129
        <for-each locations="compat"/>
124
        <for-each locations="compat"/>
130
    </target>
125
    </target>
(-)xml/tax/compat/build.xml (-10 / +4 lines)
Lines 13-37 Link Here
13
-->
13
-->
14
14
15
<project name="xml/tax/compat" default="compile" basedir=".">
15
<project name="xml/tax/compat" default="compile" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="tax_root" location=".."/>
18
    <property name="tax_root" location=".."/>
18
    <property name="lib_root" location="${lib_root}/lib"/>
19
    <property name="lib_root" location="${lib_root}/lib"/>
19
    <property name="xml_root" location="${tax_root}/.."/>
20
    <property name="xml_root" location="${tax_root}/.."/>
20
21
21
    <property name="nbroot" location="${xml_root}/.."/>
22
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
23
24
    <property name="build.compiler.debug" value="on"/>
25
26
27
    <target name="compile">
22
    <target name="compile">
28
        <echo message="Compiling backward compatibility TAX module classes..."/>
23
        <echo message="Compiling backward compatibility TAX module classes..."/>
29
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
24
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
30
            <classpath>
25
            <classpath>
31
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
26
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
32
                <fileset dir="${nbroot}/openide/netbeans/lib">
27
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
33
                    <include name="openide*.jar"/>
28
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
34
                </fileset>
35
                <pathelement location="${lib_root}/src/"/>
29
                <pathelement location="${lib_root}/src/"/>
36
            </classpath>
30
            </classpath>
37
        </javac>
31
        </javac>
(-)xml/tax/lib/build.xml (-23 / +11 lines)
Lines 13-33 Link Here
13
-->
13
-->
14
14
15
<project name="xml/tax/lib" default="jars" basedir=".">
15
<project name="xml/tax/lib" default="jars" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="tax_root" location=".."/>
18
    <property name="tax_root" location=".."/>
18
    <property name="xml_root" location="${tax_root}/.."/>
19
    <property name="xml_root" location="${tax_root}/.."/>
19
20
20
    <property name="nbroot" location="${xml_root}/.."/>
21
    <property name="xerces2_jar" location="${nb_all}/xml/external/xerces2.jar"/> <!-- Apache's XNI API - parser implementation used internally by module -->
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
22
23
    <property name="xerces2_jar" location="${nbroot}/xml/external/xerces2.jar"/> <!-- Apache's XNI API - parser implementation used internally by module -->
24
25
    <property name="build.compiler.debug" value="on"/>
26
27
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
28
22
29
    <target name="init">
23
    <target name="init">
30
        <ant dir="${nbroot}/xml/external" target="unscramble"/>
24
        <ant dir="${nb_all}/xml/external" target="unscramble"/>
31
    </target>
25
    </target>
32
26
33
    <target name="compile" depends="init">
27
    <target name="compile" depends="init">
Lines 40-71 Link Here
40
    </target>
34
    </target>
41
35
42
    <target name="jars" depends="compile">
36
    <target name="jars" depends="compile">
43
        <mkdir dir="netbeans/modules/autoload/ext"/>
37
        <mkdir dir="${xml/tax.dir}/${nb.modules/autoload.dir}/ext"/>
44
        <property file="${xml_root}/spec-vers.properties"/>
38
        <property file="${xml_root}/spec-vers.properties"/>
45
        <copy file="manifest.mf" tofile="manifest-subst.mf">
39
        <copy file="manifest.mf" tofile="manifest-subst.mf">
46
            <filterchain>
40
            <filterchain>
47
                <expandproperties/>
41
                <expandproperties/>
48
            </filterchain>
42
            </filterchain>
49
        </copy>
43
        </copy>
50
        <locjar jarfile="netbeans/modules/autoload/ext/tax.jar"
44
        <jar jarfile="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/tax.jar"
51
             manifest="manifest-subst.mf"
45
             manifest="manifest-subst.mf"
52
             compress="false">
46
             compress="false">
53
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
47
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
54
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
48
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
55
            <locale name="ja"/>
49
        </jar>
56
        </locjar>
57
    </target>
50
    </target>
58
51
59
    <target name="release" depends="init">
52
    <target name="release" depends="init">
60
        <mkdir dir="netbeans/modules/autoload/ext"/>
53
        <mkdir dir="${xml/tax.dir}/${nb.modules/autoload.dir}/ext"/>
61
        <copy file="${nbroot}/xml/external/xerces2.jar" tofile="netbeans/modules/autoload/ext/xerces2.jar"/>
54
        <copy file="${nb_all}/xml/external/xerces2.jar" tofile="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/xerces2.jar"/>
62
    </target>
55
    </target>
63
56
64
    <target name="netbeans" depends="jars,release">
57
    <target name="netbeans" depends="release,jars"/>
65
        <copy todir="../netbeans">
66
            <fileset dir="netbeans"/>
67
        </copy>
68
    </target>
69
58
70
    <target name="clean">
59
    <target name="clean">
71
        <delete>
60
        <delete>
Lines 73-79 Link Here
73
                <include name="**/*.class"/>
62
                <include name="**/*.class"/>
74
            </fileset>
63
            </fileset>
75
        </delete>
64
        </delete>
76
        <delete dir="netbeans"/>
77
        <delete>
65
        <delete>
78
            <fileset dir="library">
66
            <fileset dir="library">
79
                <include name="*.jar"/>
67
                <include name="*.jar"/>
(-)xml/text-edit/build.xml (-49 / +39 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="xml/text-edit" default="netbeans" basedir=".">
15
<project name="xml/text-edit" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
Lines 20-84 Link Here
20
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="core_root" location="${xml_root}/core"/>
22
    <property name="core_root" location="${xml_root}/core"/>
22
23
23
    <property name="nbroot" location="${xml_root}/.."/>
24
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
24
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
25
25
26
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
26
    <target name="init" depends="default.init">
27
    <property name="homepage.base" value="netbeans.org"/>
27
        <patternset id="xml/text-edit.files">
28
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
28
          <include name="${nb.modules.dir}/xml-text-edit.jar"/>
29
    <property name="nbm_alias" value="nb_ide"/>
29
        </patternset>
30
30
        <path id="cp">
31
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
31
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
32
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
33
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
34
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
35
    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
35
          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
36
36
          <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
37
    <property name="build.compiler.debug" value="on"/>
37
          <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
38
        </path>
39
    </target>
38
40
39
    <target name="compile">
41
    <target name="compile" depends="init">
40
        <echo message="Compiling XML text-edit module classes..."/>
42
        <echo message="Compiling XML text-edit module classes..."/>
41
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
43
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
42
            <classpath>        
44
            <classpath refID="cp"/>
43
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
44
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
45
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
46
                <pathelement location="${nbroot}/editor/netbeans/modules/ext/nb-editor.jar"/>
47
                <pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
48
                <pathelement location="${core_root}/src/"/>
49
                <pathelement location="${api_root}/src/"/>
50
            </classpath>
51
        </javac>
45
        </javac>
52
46
53
        <for-each locations="compat"/>
47
        <for-each locations="compat"/>
54
    </target>
48
    </target>
55
49
56
    <target name="jars" depends="compile">
50
    <target name="jars" depends="compile">
57
        <mkdir dir="netbeans/modules"/>
51
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
58
        <property file="${xml_root}/spec-vers.properties"/>
52
        <property file="${xml_root}/spec-vers.properties"/>
59
        <copy file="manifest.mf" tofile="manifest-subst.mf">
53
        <copy file="manifest.mf" tofile="manifest-subst.mf">
60
            <filterchain>
54
            <filterchain>
61
                <expandproperties/>
55
                <expandproperties/>
62
            </filterchain>
56
            </filterchain>
63
        </copy>
57
        </copy>
64
        <locjar jarfile="netbeans/modules/xml-text-edit.jar"
58
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-text-edit.jar"
65
                manifest="manifest-subst.mf"
59
             manifest="manifest-subst.mf"
66
                compress="false">
60
             compress="false">
67
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
61
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
68
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
62
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
69
            <locale name="ja"/>
63
        </jar>    
70
        </locjar>    
71
    </target>
72
73
    <target name="release">
74
    </target>
64
    </target>
75
65
76
    <target name="javahelp">
66
    <target name="netbeans" depends="jars">
77
        <!-- It is a part of core module now. -->
67
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-text-edit.jar">
78
    </target>
68
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
79
69
             <patternset refID="xml/text-edit.files"/>
80
    <target name="netbeans" depends="jars,release,javahelp">
70
          </fileset>
81
        <genlist targetname="nbm" outputfiledir="netbeans"/>
71
       </genlist>
82
    </target>
72
    </target>
83
73
84
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
74
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 93-103 Link Here
93
    
83
    
94
    
84
    
95
    <target name="nbm" depends="netbeans">
85
    <target name="nbm" depends="netbeans">
96
        <delete dir="Info"/>
86
        <makenbm file="xml-text-edit.nbm"
97
        <makenbm file="../xml-text-edit.nbm"
87
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
98
                 topdir="."
99
                 needsrestart="false"
88
                 needsrestart="false"
100
                 module="netbeans/modules/xml-text-edit.jar"
89
                 module="${nb.modules.dir}/xml-text-edit.jar"
101
                 homepage="http://xml.${homepage.base}/text-edit/"
90
                 homepage="http://xml.${homepage.base}/text-edit/"
102
                 distribution="http://${dist.base}/xml-text-edit.nbm">
91
                 distribution="http://${dist.base}/xml-text-edit.nbm">
103
            <license file="${license.file}"/>
92
            <license file="${license.file}"/>
Lines 105-120 Link Here
105
        </makenbm>
94
        </makenbm>
106
    </target>
95
    </target>
107
96
108
    <target name="clean">
97
    <target name="clean" depends="init">
109
        <delete>
98
        <delete>
110
            <fileset dir="src">
99
            <fileset dir="src">
111
                <include name="**/*.class"/>
100
                <include name="**/*.class"/>
112
            </fileset>
101
            </fileset>
102
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
103
              <patternset refID="xml/text-edit.files"/>
104
            </fileset>
113
        </delete>
105
        </delete>
114
        <delete file="manifest-subst.mf"/>
106
        <delete file="manifest-subst.mf"/>
115
        <delete file="../xml-text-edit.nbm"/>
107
        <delete file="xml-text-edit.nbm"/>
116
        <delete dir="netbeans"/>
117
        <delete dir="Info"/>
118
108
119
        <for-each locations="compat"/>
109
        <for-each locations="compat"/>
120
    </target>
110
    </target>
(-)xml/text-edit/compat/build.xml (-10 / +4 lines)
Lines 13-36 Link Here
13
-->
13
-->
14
14
15
<project name="xml/text-edit/compat" default="compile" basedir=".">
15
<project name="xml/text-edit/compat" default="compile" basedir=".">
16
    <import file="../../../nbbuild/default-properties.xml"/> 
16
17
17
    <property name="text-edit_root" location=".."/>
18
    <property name="text-edit_root" location=".."/>
18
    <property name="xml_root" location="${text-edit_root}/.."/>
19
    <property name="xml_root" location="${text-edit_root}/.."/>
19
20
20
    <property name="nbroot" location="${xml_root}/.."/>
21
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
22
23
    <property name="build.compiler.debug" value="on"/>
24
25
26
    <target name="compile">
21
    <target name="compile">
27
        <echo message="Compiling backward compatibility Text Editing module classes..."/>
22
        <echo message="Compiling backward compatibility Text Editing module classes..."/>
28
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
23
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29
            <classpath>
24
            <classpath>
30
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
25
                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
                <fileset dir="${nbroot}/openide/netbeans/lib">
26
                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
                    <include name="openide*.jar"/>
27
                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
                </fileset>
34
                <pathelement location="${text-edit_root}/src/"/>
28
                <pathelement location="${text-edit_root}/src/"/>
35
            </classpath>
29
            </classpath>
36
        </javac>
30
        </javac>
(-)xml/tools/build.xml (-46 / +44 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="xml/tools" default="netbeans" basedir=".">
15
<project name="xml/tools" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
Lines 20-84 Link Here
20
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="core_root" location="${xml_root}/core"/>
22
    <property name="core_root" location="${xml_root}/core"/>
22
23
23
    <property name="nbroot" location="${xml_root}/.."/>
24
    <target name="init" depends="default.init">
24
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
25
        <patternset id="xml/tools.files">
25
26
          <include name="${nb.modules.dir}/xml-tools.jar"/>
26
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
27
          <include name="${nb.docs.dir}/xml-apis.zip"/>
27
    <property name="homepage.base" value="netbeans.org"/>
28
          <include name="${nb.system.dir}/ParserDB/xml-apis.jc*"/>
28
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
29
        </patternset>
29
    <property name="nbm_alias" value="nb_ide"/>
30
        <path id="cp">
30
31
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
31
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
32
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
33
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
34
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
35
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
35
36
          <pathelement location="${xml/tax.dir}/${nb.modules/autoload.dir}/xml-tax.jar"/>
36
    <property name="build.compiler.debug" value="on"/>
37
          <pathelement location="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/tax.jar"/>
38
          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
39
        </path>
40
    </target>
37
41
38
    <target name="compile">
42
    <target name="compile" depends="init">
39
        <echo message="Compiling XML tools module classes..."/>
43
        <echo message="Compiling XML tools module classes..."/>
40
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
44
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
41
            <classpath>        
45
            <classpath refID="cp"/>
42
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
43
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
44
                <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
45
                <pathelement location="${core_root}/src/"/>
46
                <pathelement location="${tax_lib_root}/src/"/>
47
                <pathelement location="${tax_root}/src/"/>
48
                <pathelement location="${api_root}/src/"/>
49
            </classpath>
50
        </javac>
46
        </javac>
51
    </target>
47
    </target>
52
48
53
    <target name="jars" depends="compile">
49
    <target name="jars" depends="compile">
54
        <mkdir dir="netbeans/modules"/>
50
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
55
        <property file="${xml_root}/spec-vers.properties"/>
51
        <property file="${xml_root}/spec-vers.properties"/>
56
        <copy file="manifest.mf" tofile="manifest-subst.mf">
52
        <copy file="manifest.mf" tofile="manifest-subst.mf">
57
            <filterchain>
53
            <filterchain>
58
                <expandproperties/>
54
                <expandproperties/>
59
            </filterchain>
55
            </filterchain>
60
        </copy>
56
        </copy>
61
        <locjar jarfile="netbeans/modules/xml-tools.jar"
57
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-tools.jar"
62
                manifest="manifest-subst.mf"
58
                manifest="manifest-subst.mf"
63
                compress="false">
59
                compress="false">
64
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
60
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
65
            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
61
            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
66
            <locale name="ja"/>
62
        </jar>    
67
        </locjar>    
68
    </target>
63
    </target>
69
64
70
    <target name="release">
65
    <target name="release">
71
        <copy todir="netbeans" includeEmptyDirs="false">
66
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}" includeEmptyDirs="false">
72
            <fileset dir="release" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
67
            <fileset dir="release/docs" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
68
        </copy>
69
        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}" includeEmptyDirs="false">
70
            <fileset dir="release/system" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
73
        </copy>
71
        </copy>
74
    </target>
72
    </target>
75
73
76
    <target name="javahelp">
74
    <target name="netbeans" depends="jars,release">
77
        <!-- It is a part of core module now. -->
75
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-tools.jar">
78
    </target>
76
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
79
77
             <patternset refID="xml/tools.files"/>
80
    <target name="netbeans" depends="jars,release,javahelp">
78
          </fileset>
81
        <genlist targetname="nbm" outputfiledir="netbeans"/>
79
       </genlist>
82
    </target>
80
    </target>
83
81
84
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
82
    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 93-103 Link Here
93
    
91
    
94
    
92
    
95
    <target name="nbm" depends="netbeans">
93
    <target name="nbm" depends="netbeans">
96
        <delete dir="Info"/>
94
        <makenbm file="xml-tools.nbm"
97
        <makenbm file="../xml-tools.nbm"
95
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
98
                 topdir="."
99
                 needsrestart="false"
96
                 needsrestart="false"
100
                 module="netbeans/modules/xml-tools.jar"
97
                 module="${nb.modules.dir}/xml-tools.jar"
101
                 homepage="http://xml.${homepage.base}/tools/"
98
                 homepage="http://xml.${homepage.base}/tools/"
102
                 distribution="http://${dist.base}/xml-tools.nbm">
99
                 distribution="http://${dist.base}/xml-tools.nbm">
103
            <license file="${license.file}"/>
100
            <license file="${license.file}"/>
Lines 105-120 Link Here
105
        </makenbm>
102
        </makenbm>
106
    </target>
103
    </target>
107
104
108
    <target name="clean">
105
    <target name="clean" depends="init">
109
        <delete>
106
        <delete>
110
            <fileset dir="src">
107
            <fileset dir="src">
111
                <include name="**/*.class"/>
108
                <include name="**/*.class"/>
112
            </fileset>
109
            </fileset>
110
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
111
                <patternset refID="xml/tools.files"/>
112
            </fileset>
113
        </delete>
113
        </delete>
114
        <delete file="manifest-subst.mf"/>
114
        <delete file="manifest-subst.mf"/>
115
        <delete file="../xml-tools.nbm"/>
115
        <delete file="xml-tools.nbm"/>
116
        <delete dir="netbeans"/>
117
        <delete dir="Info"/>
118
    </target>
116
    </target>
119
117
120
    <target name="real-clean" depends="clean">
118
    <target name="real-clean" depends="clean">
(-)xml/xsl/build.xml (-55 / +37 lines)
Lines 13-18 Link Here
13
-->
13
-->
14
14
15
<project name="xml/xsl" default="netbeans" basedir=".">
15
<project name="xml/xsl" default="netbeans" basedir=".">
16
    <import file="../../nbbuild/default.xml"/> 
16
17
17
    <property name="xml_root" location=".."/>
18
    <property name="xml_root" location=".."/>
18
    <property name="api_root" location="${xml_root}/api"/>
19
    <property name="api_root" location="${xml_root}/api"/>
Lines 20-45 Link Here
20
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="tax_lib_root" location="${tax_root}/lib"/>
21
    <property name="core_root" location="${xml_root}/core"/>
22
    <property name="core_root" location="${xml_root}/core"/>
22
23
23
    <property name="nbroot" location="${xml_root}/.."/>
24
    <property name="nbext_root" location="${nbroot}/nbbuild"/>
25
    <property name="libs_root" location="${nbroot}/libs"/>
24
    <property name="libs_root" location="${nbroot}/libs"/>
26
25
27
    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
26
    <target name="init" depends="default.init">
28
    <property name="homepage.base" value="netbeans.org"/>
27
        <ant dir="${nb_all}/xml/external" target="unscramble"/>
29
    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
28
        <patternset id="xml/xsl.files">
30
    <property name="nbm_alias" value="nb_ide"/>
29
          <include name="${nb.modules.dir}/xsl.jar"/>
31
30
        </patternset>
32
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
31
        <path id="cp">
33
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
32
          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
34
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
33
          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
35
    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
34
          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
36
35
          <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
37
    <property name="build.compiler.debug" value="on"/>
36
          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
38
37
          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
39
38
          <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
40
    <target name="init">
39
          <pathelement location="${libs/xalan.dir}/${nb.modules/autoload.dir}/ext/xalan-2.5.2.jar"/>
41
        <ant dir="${nbroot}/xml/external" target="unscramble"/>
40
        </path>
42
        <ant dir="${nbroot}/libs/external" target="unscramble"/>
43
    </target>
41
    </target>
44
42
45
    <target name="compile" depends="init">
43
    <target name="compile" depends="init">
Lines 47-93 Link Here
47
45
48
        <echo message="Compiling XSL module classes..."/>
46
        <echo message="Compiling XSL module classes..."/>
49
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
47
        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
50
            <classpath>
48
            <classpath refID="cp"/>
51
                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
52
                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
53
                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
54
                <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
55
                <pathelement location="${core_root}/src/"/>
56
                <pathelement location="${api_root}/src/"/>
57
                <!--Servlet API-->
58
                <pathelement location="${nbroot}/httpserver/external/servlet-2.2.jar"/>
59
                <fileset dir="${nbroot}/libs/external">
60
                    <include name="xalan*.jar"/>
61
                </fileset>
62
            </classpath>
63
        </javac>
49
        </javac>
64
    </target>
50
    </target>
65
51
66
    <target name="jars" depends="compile">
52
    <target name="jars" depends="compile">
67
        <mkdir dir="netbeans/modules"/>
53
        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
68
        <property file="${xml_root}/spec-vers.properties"/>
54
        <property file="${xml_root}/spec-vers.properties"/>
69
        <copy file="manifest.mf" tofile="manifest-subst.mf">
55
        <copy file="manifest.mf" tofile="manifest-subst.mf">
70
            <filterchain>
56
            <filterchain>
71
                <expandproperties/>
57
                <expandproperties/>
72
            </filterchain>
58
            </filterchain>
73
        </copy>
59
        </copy>
74
        <locjar jarfile="netbeans/modules/xsl.jar"
60
        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xsl.jar"
75
                manifest="manifest-subst.mf"
61
             manifest="manifest-subst.mf"
76
                compress="false">
62
             compress="false">
77
            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
63
            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
78
            <locale name="ja"/>
64
        </jar>    
79
        </locjar>    
80
    </target>
65
    </target>
81
66
82
    <target name="release">
67
    <target name="netbeans" depends="jars">
83
    </target>
68
       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xsl.jar">
84
69
          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
85
    <target name="javahelp">
70
             <patternset refID="xml/xsl.files"/>
86
        <!-- It is a part of core module now. -->
71
          </fileset>
87
    </target>
72
       </genlist>
88
89
    <target name="netbeans" depends="jars,release,javahelp">
90
        <genlist targetname="nbm" outputfiledir="netbeans"/>
91
    </target>
73
    </target>
92
74
93
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
75
    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
Lines 102-112 Link Here
102
    
84
    
103
    
85
    
104
    <target name="nbm" depends="netbeans">
86
    <target name="nbm" depends="netbeans">
105
        <delete dir="Info"/>
87
        <makenbm file="xsl.nbm"
106
        <makenbm file="../xsl.nbm"
88
                 productdir="${netbeans.dest.dir}/${cluster.dir}"
107
                 topdir="."
108
                 needsrestart="false"
89
                 needsrestart="false"
109
                 module="netbeans/modules/xsl.jar"
90
                 module="${nb.modules.dir}/xsl.jar"
110
                 homepage="http://xml.${homepage.base}/xsl/"
91
                 homepage="http://xml.${homepage.base}/xsl/"
111
                 distribution="http://${dist.base}/xsl.nbm">
92
                 distribution="http://${dist.base}/xsl.nbm">
112
            <license file="${license.file}"/>
93
            <license file="${license.file}"/>
Lines 114-129 Link Here
114
        </makenbm>
95
        </makenbm>
115
    </target>
96
    </target>
116
97
117
    <target name="clean">
98
    <target name="clean" depends="init">
118
        <delete>
99
        <delete>
119
            <fileset dir="src">
100
            <fileset dir="src">
120
                <include name="**/*.class"/>
101
                <include name="**/*.class"/>
121
            </fileset>
102
            </fileset>
103
            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
104
                <patternset refID="xml/xsl.files"/>
105
            </fileset>
122
        </delete>
106
        </delete>
123
        <delete file="manifest-subst.mf"/>
107
        <delete file="manifest-subst.mf"/>
124
        <delete file="../xsl.nbm"/>
108
        <delete file="xsl.nbm"/>
125
        <delete dir="netbeans"/>
126
        <delete dir="Info"/>
127
    </target>
109
    </target>
128
110
129
    <target name="real-clean" depends="clean">
111
    <target name="real-clean" depends="clean">
(-)xtest/plugins_src/deprecated/build.xml (-10 / +10 lines)
Lines 14-19 Link Here
14
14
15
<!-- build script for deprecated XTest plugin -->
15
<!-- build script for deprecated XTest plugin -->
16
<project basedir="." default="all" name="XTest deprecated plugin">
16
<project basedir="." default="all" name="XTest deprecated plugin">
17
    <import file="../../../nbbuild/default-properties.xml"/>
18
17
    <target name="all">
19
    <target name="all">
18
        <!-- WRITEME -->
20
        <!-- WRITEME -->
19
    </target>
21
    </target>
Lines 22-37 Link Here
22
    <target name="compile">
24
    <target name="compile">
23
        <path id="basecp">
25
        <path id="basecp">
24
            <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
26
            <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
25
            <fileset dir="${nball.cvs.root}/openide/netbeans/lib">
27
            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
26
                <include name="openide*.jar" />
28
            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
27
            </fileset>
29
            <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
28
            <pathelement location="${nball.cvs.root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
29
            <pathelement location="${nball.cvs.root}/core/netbeans/lib/core.jar"/>
31
            <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
30
            <pathelement location="${nball.cvs.root}/core/netbeans/lib/ext/boot.jar"/>
32
            <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
31
            <pathelement location="${nball.cvs.root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
33
            <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
32
            <pathelement location="${nball.cvs.root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
34
            <pathelement location="${core/execution.dir}/${nb.modules/autoload.dir}/core-execution.jar"/>
33
            <pathelement location="${nball.cvs.root}/core/output/netbeans/modules/autoload/core-output.jar"/>
34
            <pathelement location="${nball.cvs.root}/core/execution/netbeans/modules/autoload/core-execution.jar"/>
35
            <!-- use junit with already compiled extensions -->        
35
            <!-- use junit with already compiled extensions -->        
36
            <pathelement location="../../lib/xtest.jar"/>
36
            <pathelement location="../../lib/xtest.jar"/>
37
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
37
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
(-)xtest/plugins_src/ide/build.xml (-10 / +10 lines)
Lines 14-19 Link Here
14
14
15
<!-- build script for IDE XTest plugin -->
15
<!-- build script for IDE XTest plugin -->
16
<project basedir="." default="all" name="XTest IDE plugin">
16
<project basedir="." default="all" name="XTest IDE plugin">
17
    <import file="../../../nbbuild/default-properties.xml"/>
18
17
    <target name="all">
19
    <target name="all">
18
        <!-- WRITEME -->
20
        <!-- WRITEME -->
19
    </target>
21
    </target>
Lines 22-37 Link Here
22
    <target name="compile">
24
    <target name="compile">
23
        <path id="basecp">
25
        <path id="basecp">
24
            <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
26
            <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
25
            <fileset dir="${nball.cvs.root}/openide/netbeans/lib">
27
            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
26
                <include name="openide*.jar" />
28
            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
27
            </fileset>
29
            <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
28
            <pathelement location="${nball.cvs.root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
30
            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
29
            <pathelement location="${nball.cvs.root}/core/netbeans/lib/core.jar"/>
31
            <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
30
            <pathelement location="${nball.cvs.root}/core/netbeans/lib/ext/boot.jar"/>
32
            <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
31
            <pathelement location="${nball.cvs.root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
33
            <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
32
            <pathelement location="${nball.cvs.root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
34
            <pathelement location="${core/execution.dir}/${nb.modules/autoload.dir}/core-execution.jar"/>
33
            <pathelement location="${nball.cvs.root}/core/output/netbeans/modules/autoload/core-output.jar"/>
34
            <pathelement location="${nball.cvs.root}/core/execution/netbeans/modules/autoload/core-execution.jar"/>
35
            <!-- use junit with already compiled extensions -->        
35
            <!-- use junit with already compiled extensions -->        
36
            <pathelement location="../../lib/xtest.jar"/>
36
            <pathelement location="../../lib/xtest.jar"/>
37
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
37
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>

Return to bug 36759