Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
View | Details | Raw Unified | Return to bug 147393 | Differences between
and this patch

Collapse All | Expand All

(-)a/apisupport.harness/build.xml (-3 / +15 lines)
 Lines 44-50    Link Here 
44
44
45
    <import file="../nbbuild/templates/projectized.xml"/>
45
    <import file="../nbbuild/templates/projectized.xml"/>
46
46
47
    <target name="nbantext" depends="init">
47
    <target name="nbantext" depends="build-init">
48
        <jar jarfile="${cluster}/tasks.jar" compress="${build.package.compress}" index="${build.package.index}">
48
        <jar jarfile="${cluster}/tasks.jar" compress="${build.package.compress}" index="${build.package.index}">
49
            <manifest>
49
            <manifest>
50
                <attribute name="NetBeans-Own-Library" value="true"/>
50
                <attribute name="NetBeans-Own-Library" value="true"/>
 Lines 55-64    Link Here 
55
        </jar>
55
        </jar>
56
    </target>
56
    </target>
57
57
58
    <target name="netbeans-extra" depends="init,nbantext,jar-jnlp-launcher">
58
    <target name="netbeans-extra" depends="nbantext,jar-jnlp-launcher">
59
        <copy file="${nb_all}/nbbuild/templates/common.xml" tofile="${cluster}/common.xml"/>
59
        <copy file="${nb_all}/nbbuild/templates/common.xml" tofile="${cluster}/common.xml"/>
60
        <copy file="${nb_all}/nbbuild/jdk.xml" tofile="${cluster}/jdk.xml"/>
60
        <copy file="${nb_all}/nbbuild/jdk.xml" tofile="${cluster}/jdk.xml"/>
61
        <copy file="external/jsearch-2.0_05.jar" todir="${cluster}"/>
61
        <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
62
            <manifest dir="..">
63
                <include name="libs.javacapi/external/binaries-list"/>
64
                <include name="libs.javacimpl/external/binaries-list"/>
65
            </manifest>
66
        </downloadbinaries>
67
        <copy todir="${cluster}/antlib">
68
            <fileset dir="..">
69
                <include name="apisupport.harness/external/jsearch*.jar"/>
70
                <include name="libs.javacapi/external/javac*.jar"/>
71
                <include name="libs.javacimpl/external/javac*.jar"/>
72
            </fileset>
73
        </copy>
62
    </target>
74
    </target>
63
 
75
 
64
    <target name="compile-jnlp-launcher" depends="init,compile">
76
    <target name="compile-jnlp-launcher" depends="init,compile">
(-)a/apisupport.harness/nbproject/project.properties (-1 / +2 lines)
 Lines 49-55    Link Here 
49
    common.xml,\
49
    common.xml,\
50
    jdk.xml,\
50
    jdk.xml,\
51
    tasks.jar,\
51
    tasks.jar,\
52
    jsearch-2.0_05.jar
52
    antlib/*.jar
53
53
54
# Just to keep it from being enabled (it does nothing as a module, and the cluster
54
# Just to keep it from being enabled (it does nothing as a module, and the cluster
55
# is not even loaded, but just in case):
55
# is not even loaded, but just in case):
 Lines 68-73    Link Here 
68
    org/netbeans/nbbuild/Arch-api-questions.xml,\
68
    org/netbeans/nbbuild/Arch-api-questions.xml,\
69
    org/netbeans/nbbuild/Branding*.class,\
69
    org/netbeans/nbbuild/Branding*.class,\
70
    org/netbeans/nbbuild/CreateModuleXML*.class,\
70
    org/netbeans/nbbuild/CreateModuleXML*.class,\
71
    org/netbeans/nbbuild/CustomJavac*.class,\
71
    org/netbeans/nbbuild/FixDependencies*.class,\
72
    org/netbeans/nbbuild/FixDependencies*.class,\
72
    org/netbeans/nbbuild/FixTestDependencies*.class,\
73
    org/netbeans/nbbuild/FixTestDependencies*.class,\
73
    org/netbeans/nbbuild/JHIndexer*.class,\
74
    org/netbeans/nbbuild/JHIndexer*.class,\
(-)a/apisupport.harness/release/build.xml (-6 / +5 lines)
 Lines 70-76    Link Here 
70
70
71
    </target>
71
    </target>
72
72
73
    <target name="init" depends="basic-init,files-init,build-init"/>
73
    <target name="init" depends="basic-init,files-init,build-init,-javac-init"/>
74
74
75
    <target name="nbm-license-init" unless="license.file">
75
    <target name="nbm-license-init" unless="license.file">
76
        <mkdir dir="build"/>
76
        <mkdir dir="build"/>
 Lines 134-146    Link Here 
134
        <!-- Override if you want to use these: -->
134
        <!-- Override if you want to use these: -->
135
        <property name="nbm.distribution" value=""/>
135
        <property name="nbm.distribution" value=""/>
136
        <property name="nbm.homepage" value=""/>
136
        <property name="nbm.homepage" value=""/>
137
        <path id="cp">
138
            <pathelement path="${module.classpath}"/>
139
            <pathelement path="${cp.extra}"/>
140
        </path>
141
        <property name="build.javahelp.dir" location="build/javahelp"/>
137
        <property name="build.javahelp.dir" location="build/javahelp"/>
142
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
138
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
143
        <property name="javahelp.search" value="JavaHelpSearch"/>
139
        <property name="javahelp.search" value="JavaHelpSearch"/>
140
        <path id="javacimpl">
141
            <fileset dir="${harness.dir}/antlib" includes="javac*.jar"/>
142
        </path>
144
    </target>
143
    </target>
145
144
146
    <target name="test-lib-init" depends="init,-delete-suite-masks">
145
    <target name="test-lib-init" depends="init,-delete-suite-masks">
 Lines 167-173    Link Here 
167
166
168
    <target name="javahelp" depends="init" if="has.javahelp">
167
    <target name="javahelp" depends="init" if="has.javahelp">
169
        <!-- Similar to projectized.xml but does not fiddle with usersguide/.../ide.css, and finds jhall.jar differently: -->
168
        <!-- Similar to projectized.xml but does not fiddle with usersguide/.../ide.css, and finds jhall.jar differently: -->
170
        <property name="jhall.jar" location="${harness.dir}/jsearch-2.0_05.jar"/>
169
        <property name="jhall.jar" location="${harness.dir}/antlib/jsearch-2.0_05.jar"/>
171
        <available property="jhall.jar.exists" file="${jhall.jar}"/>
170
        <available property="jhall.jar.exists" file="${jhall.jar}"/>
172
        <fail unless="jhall.jar.exists">You must set 'jhall.jar' (e.g. in private.properties) to the location of jsearch.jar from a JavaHelp distribution</fail>
171
        <fail unless="jhall.jar.exists">You must set 'jhall.jar' (e.g. in private.properties) to the location of jsearch.jar from a JavaHelp distribution</fail>
173
        <mkdir dir="${build.javahelp.dir}/${javahelp.base}/${javahelp.search}"/>
172
        <mkdir dir="${build.javahelp.dir}/${javahelp.base}/${javahelp.search}"/>
(-)a/apisupport.harness/taskdefs.properties (-1 / +2 lines)
 Lines 52-55    Link Here 
52
makeupdatedesc=org.netbeans.nbbuild.MakeUpdateDesc
52
makeupdatedesc=org.netbeans.nbbuild.MakeUpdateDesc
53
verifyclasslinkage=org.netbeans.nbbuild.VerifyClassLinkage
53
verifyclasslinkage=org.netbeans.nbbuild.VerifyClassLinkage
54
fixtestdeps=org.netbeans.nbbuild.FixTestDependencies
54
fixtestdeps=org.netbeans.nbbuild.FixTestDependencies
55
shorterpaths=org.netbeans.nbbuild.ShorterPaths
55
shorterpaths=org.netbeans.nbbuild.ShorterPaths
56
custom-javac=org.netbeans.nbbuild.CustomJavac
(-)a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java (+139 lines)
Line 0    Link Here 
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
5
 *
6
 * The contents of this file are subject to the terms of either the GNU
7
 * General Public License Version 2 only ("GPL") or the Common
8
 * Development and Distribution License("CDDL") (collectively, the
9
 * "License"). You may not use this file except in compliance with the
10
 * License. You can obtain a copy of the License at
11
 * http://www.netbeans.org/cddl-gplv2.html
12
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13
 * specific language governing permissions and limitations under the
14
 * License.  When distributing the software, include this License Header
15
 * Notice in each file and include the License file at
16
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
17
 * particular file as subject to the "Classpath" exception as provided
18
 * by Sun in the GPL Version 2 section of the License file that
19
 * accompanied this code. If applicable, add the following below the
20
 * License Header, with the fields enclosed by brackets [] replaced by
21
 * your own identifying information:
22
 * "Portions Copyrighted [year] [name of copyright owner]"
23
 *
24
 * If you wish your version of this file to be governed by only the CDDL
25
 * or only the GPL Version 2, indicate your decision by adding
26
 * "[Contributor] elects to include this software in this distribution
27
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
28
 * single choice of license, a recipient has the option to distribute
29
 * your version of this file under either the CDDL, the GPL Version 2 or
30
 * to extend the choice of license to its licensees as provided above.
31
 * However, if you add GPL Version 2 code and therefore, elected the GPL
32
 * Version 2 license, then the option applies only if the new code is
33
 * made subject to such option by the copyright holder.
34
 *
35
 * Contributor(s):
36
 *
37
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
38
 */
39
40
package org.netbeans.nbbuild;
41
42
import java.io.File;
43
import java.lang.reflect.Method;
44
import org.apache.tools.ant.AntClassLoader;
45
import org.apache.tools.ant.BuildException;
46
import org.apache.tools.ant.Project;
47
import org.apache.tools.ant.taskdefs.Javac;
48
import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
49
import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
50
import org.apache.tools.ant.types.Commandline;
51
import org.apache.tools.ant.types.Path;
52
53
/**
54
 * Runs javac in-process from a local implementation, e.g. so as to ensure JSR 269 is supported.
55
 * Works just like using the default <code>modern</code> compiler, except loaded from the specified place.
56
 */
57
public class CustomJavac extends Javac {
58
59
    public CustomJavac() {}
60
61
    private Path javacClasspath;
62
    public void addJavacClasspath(Path cp) {
63
        javacClasspath = cp;
64
    }
65
66
    private Path processorPath;
67
    public void addProcessorPath(Path cp) {
68
        processorPath = cp;
69
    }
70
71
    @Override
72
    protected void compile() {
73
        String specifiedCompiler = getProject().getProperty("build.compiler");
74
        if (specifiedCompiler != null) {
75
            log("Warning: build.compiler=" + specifiedCompiler + " so disabling JSR 269 annotation processing", Project.MSG_WARN);
76
            super.compile();
77
            return;
78
        }
79
        if (processorPath != null) {
80
            createCompilerArg().setValue("-processorpath");
81
            createCompilerArg().setPath(processorPath);
82
        }
83
        if (compileList.length > 0) {
84
            log("Compiling " + compileList.length + " source file" +
85
                    (compileList.length == 1 ? "" : "s") +
86
                    (getDestdir() != null ? " to " + getDestdir() : ""));
87
            if (listFiles) {
88
                for (File f : compileList) {
89
                    log(f.getAbsolutePath());
90
                }
91
            }
92
            CompilerAdapter adapter = new CustomAdapter();
93
            adapter.setJavac(this);
94
            if (adapter.execute()) {
95
                // XXX updateDirList
96
            } else {
97
                // other modes not supported, see below
98
                throw new BuildException("Compile failed; see the compiler error output for details.", getLocation());
99
            }
100
        }
101
    }
102
103
    @Override
104
    public void setErrorProperty(String errorProperty) {
105
        throw new UnsupportedOperationException();
106
    }
107
108
    @Override
109
    public void setUpdatedProperty(String updatedProperty) {
110
        throw new UnsupportedOperationException();
111
    }
112
113
    @Override
114
    public void setFailonerror(boolean fail) {
115
        throw new UnsupportedOperationException();
116
    }
117
118
119
    private static class CustomAdapter extends DefaultCompilerAdapter {
120
121
        public boolean execute() throws BuildException {
122
            // adapted from Javac13
123
            Commandline cmd = setupModernJavacCommand();
124
            try {
125
                Path cp = ((CustomJavac) getJavac()).javacClasspath;
126
                ClassLoader cl = new AntClassLoader(getJavac().getProject(), cp);
127
                Class c = Class.forName("com.sun.tools.javac.Main", true, cl);
128
                getJavac().log("Running javac from " + c.getProtectionDomain().getCodeSource().getLocation(), Project.MSG_VERBOSE);
129
                Method compile = c.getMethod("compile", String[].class);
130
                int result = (Integer) compile.invoke(null, (Object) cmd.getArguments());
131
                return result == 0;
132
            } catch (Exception ex) {
133
                throw new BuildException("Error starting compiler: " + ex, ex, location);
134
            }
135
        }
136
137
    }
138
139
}
(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java (-14 / +2 lines)
 Lines 839-848    Link Here 
839
                    throw new BuildException("The module " + depJar + " has no public packages and so cannot be compiled against", getLocation());
839
                    throw new BuildException("The module " + depJar + " has no public packages and so cannot be compiled against", getLocation());
840
                } else if (pubpkgs != null && !runtime && publicPackageJarDir != null) {
840
                } else if (pubpkgs != null && !runtime && publicPackageJarDir != null) {
841
                    File splitJar = createPublicPackageJar(additions, pubpkgs, publicPackageJarDir, cnb);
841
                    File splitJar = createPublicPackageJar(additions, pubpkgs, publicPackageJarDir, cnb);
842
                    if (splitJar != null) {
842
                    additions.clear();
843
                        additions.clear();
843
                    additions.add(splitJar);
844
                        additions.add(splitJar);
845
                    }
846
                }
844
                }
847
            }
845
            }
848
            
846
            
 Lines 1254-1269    Link Here 
1254
                    ZipEntry inEntry;
1252
                    ZipEntry inEntry;
1255
                    while ((inEntry = zis.getNextEntry()) != null) {
1253
                    while ((inEntry = zis.getNextEntry()) != null) {
1256
                        String path = inEntry.getName();
1254
                        String path = inEntry.getName();
1257
                        if (path.matches("META-INF/services/(com\\.sun\\.mirror\\.apt\\.AnnotationProcessorFactory|javax\\.annotation\\.processing\\.Processor)")) {
1258
                            // An annotation processor is called by the compiler,
1259
                            // so needs to be present in the classpath of the module depending on it.
1260
                            // Not just the registration but the implementation need to be available;
1261
                            // and any classes that the impl depends on as well.
1262
                            // Since this all would be hard to compute, best to just leave the classpath untouched.
1263
                            os.close();
1264
                            ppjar.delete();
1265
                            return null;
1266
                        }
1267
                        if (!addedPaths.add(path)) {
1255
                        if (!addedPaths.add(path)) {
1268
                            continue;
1256
                            continue;
1269
                        }
1257
                        }
(-)a/nbbuild/jdk.xml (-1 / +6 lines)
 Lines 102-108    Link Here 
102
                <os family="mac"/>
102
                <os family="mac"/>
103
            </and>
103
            </and>
104
        </condition>
104
        </condition>
105
        <condition property="nbjdk.bootclasspath" value="${nbjdk.home}/jre/lib/rt.jar">
105
        <pathconvert property="nbjdk.bootclasspath.standard">
106
            <path>
107
                <fileset dir="${nbjdk.home}/jre/lib" erroronmissingdir="false" includes="*.jar"/>
108
            </path>
109
        </pathconvert>
110
        <condition property="nbjdk.bootclasspath" value="${nbjdk.bootclasspath.standard}">
106
            <equals arg1="${nbjdk.bootclasspath.tmp}" arg2="$${platforms.${nbjdk.active}.bootclasspath}"/>
111
            <equals arg1="${nbjdk.bootclasspath.tmp}" arg2="$${platforms.${nbjdk.active}.bootclasspath}"/>
107
        </condition>
112
        </condition>
108
        <property name="nbjdk.bootclasspath" value="${nbjdk.bootclasspath.tmp}"/>
113
        <property name="nbjdk.bootclasspath" value="${nbjdk.bootclasspath.tmp}"/>
(-)a/nbbuild/templates/common.xml (-8 / +28 lines)
 Lines 72-77    Link Here 
72
        </condition>
72
        </condition>
73
        <property name="jar-excludes" value="**/*.java,**/*.form,**/package.html,**/doc-files/"/>
73
        <property name="jar-excludes" value="**/*.java,**/*.form,**/package.html,**/doc-files/"/>
74
        <property name="module.jar.verifylinkageignores" value=""/>
74
        <property name="module.jar.verifylinkageignores" value=""/>
75
        <property name="cp.extra" value=""/>
75
    </target>
76
    </target>
76
77
77
    <target name="-release.dir">
78
    <target name="-release.dir">
 Lines 101-106    Link Here 
101
        </patternset>
102
        </patternset>
102
    </target>
103
    </target>
103
104
105
    <target name="-javac-init" depends="build-init">
106
        <path id="cp">
107
            <pathelement path="${module.classpath}"/>
108
            <pathelement path="${cp.extra}"/>
109
        </path>
110
        <!-- Unlike ${module.classpath}, this does not use publicPackageJarDir, since processors need not be in public packages: -->
111
        <parseprojectxml project="." moduleclasspathproperty="processor.path"/>
112
        <presetdef name="nb-javac">
113
            <custom-javac>
114
                <bootclasspath path="${nbjdk.bootclasspath}"/>
115
                <javacclasspath refid="javacimpl"/>
116
                <processorpath>
117
                    <pathelement path="${processor.path}"/>
118
                    <pathelement path="${cp.extra}"/>
119
                </processorpath>
120
            </custom-javac>
121
        </presetdef>
122
    </target>
123
104
    <target name="up-to-date" depends="init">
124
    <target name="up-to-date" depends="init">
105
        <uptodate targetfile="${cluster}/${module.jar}" property="is.jar.uptodate">
125
        <uptodate targetfile="${cluster}/${module.jar}" property="is.jar.uptodate">
106
            <srcfiles dir="${src.dir}"/>
126
            <srcfiles dir="${src.dir}"/>
 Lines 122-132    Link Here 
122
        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
142
        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
123
            <classpath refid="cp"/>
143
            <classpath refid="cp"/>
124
        </depend>
144
        </depend>
125
        <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" encoding="UTF-8"
145
        <nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" encoding="UTF-8"
126
                deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
146
                deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
127
            <classpath refid="cp"/>
147
            <classpath refid="cp"/>
128
            <compilerarg line="${javac.compilerargs}"/>
148
            <compilerarg line="${javac.compilerargs}"/>
129
        </javac>
149
        </nb-javac>
130
        <!-- Sanity check: -->
150
        <!-- Sanity check: -->
131
        <pathconvert pathsep=":" property="class.files.in.src">
151
        <pathconvert pathsep=":" property="class.files.in.src">
132
            <path>
152
            <path>
 Lines 158-169    Link Here 
158
        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
178
        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
159
            <classpath refid="cp"/>
179
            <classpath refid="cp"/>
160
        </depend>
180
        </depend>
161
        <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
181
        <nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}"
162
               debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
182
               debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
163
               source="${javac.source}" target="${javac.target}" includes="${javac.includes}" optimize="${build.compiler.optimize}" includeantruntime="false">
183
               source="${javac.source}" target="${javac.target}" includes="${javac.includes}" optimize="${build.compiler.optimize}" includeantruntime="false">
164
            <classpath refid="cp"/>
184
            <classpath refid="cp"/>
165
            <compilerarg line="${javac.compilerargs}"/>
185
            <compilerarg line="${javac.compilerargs}"/>
166
        </javac>
186
        </nb-javac>
167
    </target>
187
    </target>
168
188
169
    <target name="jar-prep" depends="init">
189
    <target name="jar-prep" depends="init">
 Lines 424-435    Link Here 
424
                <classpath refid="test.@{test.type}.cp"/>
444
                <classpath refid="test.@{test.type}.cp"/>
425
            </depend>
445
            </depend>
426
            <property name="test.excludes" value=""/> <!-- # 113770 -->
446
            <property name="test.excludes" value=""/> <!-- # 113770 -->
427
            <javac srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}"
447
            <nb-javac srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}"
428
                   debug="true" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
448
                   debug="true" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
429
                   source="${javac.source}" target="${javac.target}" optimize="${build.compiler.optimize}" includeantruntime="false">
449
                   source="${javac.source}" target="${javac.target}" optimize="${build.compiler.optimize}" includeantruntime="false">
430
                <classpath refid="test.@{test.type}.cp"/>
450
                <classpath refid="test.@{test.type}.cp"/>
431
                <compilerarg line="${javac.compilerargs}"/>
451
                <compilerarg line="${javac.compilerargs}"/>
432
            </javac>
452
            </nb-javac>
433
            <copy todir="${build.test.@{test.type}.classes.dir}">
453
            <copy todir="${build.test.@{test.type}.classes.dir}">
434
                <fileset dir="${test.@{test.type}.src.dir}">
454
                <fileset dir="${test.@{test.type}.src.dir}">
435
                    <exclude name="**/*.java"/>
455
                    <exclude name="**/*.java"/>
 Lines 488-499    Link Here 
488
                <depend srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}" cache="${build.test.@{test.type}.dir}/depcache">
508
                <depend srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}" cache="${build.test.@{test.type}.dir}/depcache">
489
                    <classpath refid="test.@{test.type}.cp"/>
509
                    <classpath refid="test.@{test.type}.cp"/>
490
                </depend>
510
                </depend>
491
                <javac srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}"
511
                <nb-javac srcdir="${test.@{test.type}.src.dir}" destdir="${build.test.@{test.type}.classes.dir}"
492
                       debug="true" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
512
                       debug="true" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
493
                       source="${javac.source}" target="${javac.target}" includeantruntime="false" optimize="${build.compiler.optimize}" includes="${javac.includes}">
513
                       source="${javac.source}" target="${javac.target}" includeantruntime="false" optimize="${build.compiler.optimize}" includes="${javac.includes}">
494
                    <classpath refid="test.@{test.type}.cp"/>
514
                    <classpath refid="test.@{test.type}.cp"/>
495
                    <compilerarg line="${javac.compilerargs}"/>
515
                    <compilerarg line="${javac.compilerargs}"/>
496
                </javac>
516
                </nb-javac>
497
                <copy todir="${build.test.@{test.type}.classes.dir}">
517
                <copy todir="${build.test.@{test.type}.classes.dir}">
498
                    <fileset dir="${test.@{test.type}.src.dir}">
518
                    <fileset dir="${test.@{test.type}.src.dir}">
499
                        <exclude name="**/*.java"/>
519
                        <exclude name="**/*.java"/>
(-)a/nbbuild/templates/projectized.xml (-8 / +8 lines)
 Lines 46-52    Link Here 
46
    <import file="common.xml"/>
46
    <import file="common.xml"/>
47
47
48
    <target name="common-init" depends="default.init"/>
48
    <target name="common-init" depends="default.init"/>
49
    <target name="init" depends="basic-init,files-init,build-init,-init-proxy"/>
49
    <target name="init" depends="basic-init,files-init,build-init,-javac-init,-init-proxy"/>
50
    
50
    
51
    <condition property="proxy.host+port">
51
    <condition property="proxy.host+port">
52
        <and>
52
        <and>
 Lines 145-154    Link Here 
145
                <equals arg1="${cluster.dir}" arg2="${cluster.dir.fallback}"/>
145
                <equals arg1="${cluster.dir}" arg2="${cluster.dir.fallback}"/>
146
            </not>
146
            </not>
147
        </condition>
147
        </condition>
148
        <path id="cp">
149
            <pathelement path="${module.classpath}"/>
150
            <pathelement path="${cp.extra}"/>
151
        </path>
152
        <property name="build.javahelp.dir" location="build/javahelp"/>
148
        <property name="build.javahelp.dir" location="build/javahelp"/>
153
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
149
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
154
        <property name="javahelp.search" value="JavaHelpSearch"/>
150
        <property name="javahelp.search" value="JavaHelpSearch"/>
 Lines 161-166    Link Here 
161
        <property name="locjhindexer.locales" value="${locales}"/>
157
        <property name="locjhindexer.locales" value="${locales}"/>
162
        <property name="locmakenbm.locales" value="${locales}"/>
158
        <property name="locmakenbm.locales" value="${locales}"/>
163
        <property name="locmakenbm.brands" value="${brandings}"/>
159
        <property name="locmakenbm.brands" value="${brandings}"/>
160
        <path id="javacimpl">
161
            <fileset dir="${nb_all}">
162
                <include name="libs.javacapi/external/javac*.jar"/>
163
                <include name="libs.javacimpl/external/javac*.jar"/>
164
            </fileset>
165
        </path>
166
        <taskdef name="custom-javac" classname="org.netbeans.nbbuild.CustomJavac" classpath="${nb_all}/nbbuild/nbantext.jar"/>
164
    </target>
167
    </target>
165
168
166
    <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated -->
169
    <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated -->
 Lines 458-464    Link Here 
458
            <isset property="nbjdk.bootclasspath"/>
461
            <isset property="nbjdk.bootclasspath"/>
459
        </condition>
462
        </condition>
460
        <property name="bootclasspath.opt" value=""/>
463
        <property name="bootclasspath.opt" value=""/>
461
        <property name="cp.extra" value=""/>
462
        <property name="ecj.warn.opts" value="-warn:+uselessTypeCheck"/>
464
        <property name="ecj.warn.opts" value="-warn:+uselessTypeCheck"/>
463
        <exec executable="sh">
465
        <exec executable="sh">
464
            <arg value="-c"/>
466
            <arg value="-c"/>
 Lines 580-586    Link Here 
580
            <isset property="spec.version.base"/>
582
            <isset property="spec.version.base"/>
581
        </condition>
583
        </condition>
582
584
583
        <property name="cp.extra" value=""/>
584
        <path id="sigtest.class.path.ref">
585
        <path id="sigtest.class.path.ref">
585
            <path path="${module.run.classpath}"/>
586
            <path path="${module.run.classpath}"/>
586
            <path path="${cp.extra}"/>
587
            <path path="${cp.extra}"/>
 Lines 650-656    Link Here 
650
        <property name="report.file" location="${report.dir}/${code.name.base.dashes}.xml"/>
651
        <property name="report.file" location="${report.dir}/${code.name.base.dashes}.xml"/>
651
        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
652
        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
652
653
653
        <property name="cp.extra" value=""/>
654
        <path id="findbugs.class.path.ref">
654
        <path id="findbugs.class.path.ref">
655
            <path path="${module.run.classpath}"/>
655
            <path path="${module.run.classpath}"/>
656
            <path path="${cp.extra}"/>
656
            <path path="${cp.extra}"/>

Return to bug 147393
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo