View | Details | Raw Unified | Return to bug 143236 | Differences between
and this patch

Collapse All | Expand All

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/Evaluator.java (-1 / +1 lines)
 Lines 287-293    Link Here 
287
            assert nbroot != null : "netbeans.org-type module not in a complete netbeans.org source root " + dir;
287
            assert nbroot != null : "netbeans.org-type module not in a complete netbeans.org source root " + dir;
288
            stock.put("nb_all", nbroot.getAbsolutePath()); // NOI18N
288
            stock.put("nb_all", nbroot.getAbsolutePath()); // NOI18N
289
            // Only needed for netbeans.org modules, since for external modules suite.properties suffices.
289
            // Only needed for netbeans.org modules, since for external modules suite.properties suffices.
290
            stock.put("netbeans.dest.dir", new File(nbroot, ModuleList.DEST_DIR_IN_NETBEANS_ORG).getAbsolutePath()); // NOI18N
290
            stock.put("netbeans.dest.dir", ModuleList.findNetBeansOrgDestDir(nbroot).getAbsolutePath()); // NOI18N
291
        } else {
291
        } else {
292
            nbroot = null;
292
            nbroot = null;
293
        }
293
        }
(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java (-1 / +1 lines)
 Lines 158-164    Link Here 
158
        typeProvider = new NbModuleProviderImpl();
158
        typeProvider = new NbModuleProviderImpl();
159
        if (typeProvider.getModuleType() == NbModuleProvider.NETBEANS_ORG && ModuleList.findNetBeansOrg(getProjectDirectoryFile()) == null) {
159
        if (typeProvider.getModuleType() == NbModuleProvider.NETBEANS_ORG && ModuleList.findNetBeansOrg(getProjectDirectoryFile()) == null) {
160
            // #69097: preferable to throwing an assertion error later...
160
            // #69097: preferable to throwing an assertion error later...
161
            throw new IOException("netbeans.org-type module not in a complete netbeans.org source root: " + this); // NOI18N
161
            throw new IOException("netbeans.org-type module requires at least nbbuild: " + FileUtil.getFileDisplayName(helper.getProjectDirectory())); // NOI18N
162
        }
162
        }
163
        eval = new Evaluator(this, typeProvider);
163
        eval = new Evaluator(this, typeProvider);
164
        // XXX could add globs for other package roots too
164
        // XXX could add globs for other package roots too
(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java (-1 / +1 lines)
 Lines 110-116    Link Here 
110
            }
110
            }
111
            File moduleProjectDirF = module.getSourceLocation();
111
            File moduleProjectDirF = module.getSourceLocation();
112
            if (moduleProjectDirF == null) {
112
            if (moduleProjectDirF == null) {
113
                Util.err.log(ErrorManager.WARNING, "Warning - could not find sources for dependent module " + cnb + " for " + project);
113
                // Do not log, this is pretty normal.
114
                continue;
114
                continue;
115
            }
115
            }
116
            FileObject moduleProjectDir = FileUtil.toFileObject(moduleProjectDirF);
116
            FileObject moduleProjectDir = FileUtil.toFileObject(moduleProjectDirF);
(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java (-14 / +66 lines)
 Lines 95-103    Link Here 
95
    static int xmlFilesParsed;
95
    static int xmlFilesParsed;
96
    static int directoriesChecked;
96
    static int directoriesChecked;
97
    static int jarsOpened;
97
    static int jarsOpened;
98
    
98
99
    public static final String DEST_DIR_IN_NETBEANS_ORG = "nbbuild" + File.separatorChar + "netbeans"; // NOI18N
100
    
101
    /** Synch with org.netbeans.nbbuild.ModuleListParser.FOREST: */
99
    /** Synch with org.netbeans.nbbuild.ModuleListParser.FOREST: */
102
    private static final String[] FOREST = {
100
    private static final String[] FOREST = {
103
        /*root*/null,
101
        /*root*/null,
 Lines 237-251    Link Here 
237
    static ModuleList findOrCreateModuleListFromNetBeansOrgSources(File root) throws IOException {
235
    static ModuleList findOrCreateModuleListFromNetBeansOrgSources(File root) throws IOException {
238
        ModuleList list = sourceLists.get(root);
236
        ModuleList list = sourceLists.get(root);
239
        if (list == null) {
237
        if (list == null) {
240
            list = createModuleListFromNetBeansOrgSources(root);
238
            File nbdestdir = findNetBeansOrgDestDir(root);
239
            if (nbdestdir.equals(new File(new File(root, "nbbuild"), "netbeans"))) { // NOI18N
240
                list = createModuleListFromNetBeansOrgSources(root, nbdestdir);
241
            } else {
242
                // #143236: have a customized dest dir, perhaps referenced from orphan modules.
243
                Map<String, ModuleEntry> entries = new HashMap<String, ModuleEntry>();
244
                doScanNetBeansOrgSources(entries, root, 1, root, nbdestdir, null, false);
245
                ModuleList sources = new ModuleList(entries, root, false);
246
                ModuleList binaries = createModuleListFromBinaries(nbdestdir);
247
                list = merge(new ModuleList[] {sources, binaries}, root);
248
            }
241
            sourceLists.put(root, list);
249
            sourceLists.put(root, list);
242
        }
250
        }
243
        return list;
251
        return list;
244
    }
252
    }
245
    
253
246
    private static ModuleList createModuleListFromNetBeansOrgSources(File root) throws IOException {
254
    /**
255
     * Gets the platform build directory associated with a netbeans.org source root.
256
     * Normally nbbuild/netbeans/ but can be overridden.
257
     * @param nb_all the (possibly partial) netbeans.org source root
258
     */
259
    public static File findNetBeansOrgDestDir(File nb_all) {
260
        synchronized (netbeansOrgDestDirs) {
261
            File d = netbeansOrgDestDirs.get(nb_all);
262
            if (d == null) {
263
                File nbbuild = new File(nb_all, "nbbuild"); // NOI18N
264
                d = checkForNetBeansOrgDestDir(new File(nbbuild, "user.build.properties")); // NOI18N
265
                if (d == null) {
266
                    d = checkForNetBeansOrgDestDir(new File(nbbuild, "site.build.properties")); // NOI18N
267
                    if (d == null) {
268
                        d = checkForNetBeansOrgDestDir(new File(System.getProperty("user.home"), ".nbbuild.properties")); // NOI18N
269
                        if (d == null) {
270
                            d = new File(nbbuild, "netbeans"); // NOI18N
271
                        }
272
                    }
273
                }
274
                netbeansOrgDestDirs.put(nb_all, d);
275
            }
276
            return d;
277
        }
278
    }
279
    private static final Map<File,File> netbeansOrgDestDirs = new HashMap<File,File>();
280
    private static File checkForNetBeansOrgDestDir(File properties) {
281
        if (properties.isFile()) {
282
            try {
283
                InputStream is = new FileInputStream(properties);
284
                try {
285
                    Properties p = new Properties();
286
                    p.load(is);
287
                    String d = p.getProperty("netbeans.dest.dir"); // NOI18N
288
                    if (d != null) {
289
                        return new File(d);
290
                    }
291
                } finally {
292
                    is.close();
293
                }
294
            } catch (IOException x) {
295
                LOG.log(Level.INFO, "Could not read " + properties, x);
296
            }
297
        }
298
        return null;
299
    }
300
301
    private static ModuleList createModuleListFromNetBeansOrgSources(File root, File nbdestdir) throws IOException {
247
        Util.err.log("ModuleList.createModuleListFromSources: " + root);
302
        Util.err.log("ModuleList.createModuleListFromSources: " + root);
248
        File nbdestdir = new File(root, DEST_DIR_IN_NETBEANS_ORG);
249
        try {
303
        try {
250
            return loadNetBeansOrgCachedModuleList(root, nbdestdir);
304
            return loadNetBeansOrgCachedModuleList(root, nbdestdir);
251
        } catch (IOException x) {
305
        } catch (IOException x) {
 Lines 870-876    Link Here 
870
        boolean isNetBeansOrg = !suiteComponent && !standalone;
924
        boolean isNetBeansOrg = !suiteComponent && !standalone;
871
        if (isNetBeansOrg) {
925
        if (isNetBeansOrg) {
872
            defaults.put("nb_all", root.getAbsolutePath()); // NOI18N
926
            defaults.put("nb_all", root.getAbsolutePath()); // NOI18N
873
            defaults.put("netbeans.dest.dir", new File(root, DEST_DIR_IN_NETBEANS_ORG).getAbsolutePath()); // NOI18N
927
            defaults.put("netbeans.dest.dir", findNetBeansOrgDestDir(root).getAbsolutePath()); // NOI18N
874
        }
928
        }
875
        defaults.put("code.name.base.dashes", cnb.replace('.', '-')); // NOI18N
929
        defaults.put("code.name.base.dashes", cnb.replace('.', '-')); // NOI18N
876
        defaults.put("module.jar.dir", "modules"); // NOI18N
930
        defaults.put("module.jar.dir", "modules"); // NOI18N
 Lines 929-937    Link Here 
929
     * Whether whether a given dir is root of netbeans.org sources.
983
     * Whether whether a given dir is root of netbeans.org sources.
930
     */
984
     */
931
    public static boolean isNetBeansOrg(File dir) {
985
    public static boolean isNetBeansOrg(File dir) {
932
        return new File(dir, "nbbuild").isDirectory() && // NOI18N
986
        return new File(dir, "nbbuild").isDirectory(); // NOI18N
933
                // Check for both pre- and post-Hg layouts.
934
                (new File(dir, "core").isDirectory() || new File(dir, "openide.util").isDirectory()); // NOI18N
935
    }
987
    }
936
    
988
    
937
    /**
989
    /**
 Lines 951-957    Link Here 
951
                } else {
1003
                } else {
952
                    continue;
1004
                    continue;
953
                }
1005
                }
954
                if (new File(mainrepo, "nbbuild").isDirectory() && new File(mainrepo, "openide.util").isDirectory()) { // NOI18N
1006
                if (new File(mainrepo, "nbbuild").isDirectory()) { // NOI18N
955
                    return mainrepo;
1007
                    return mainrepo;
956
                }
1008
                }
957
            }
1009
            }
 Lines 1059-1065    Link Here 
1059
    private void maybeRescanNetBeansOrgSources() {
1111
    private void maybeRescanNetBeansOrgSources() {
1060
        if (lazyNetBeansOrgList) {
1112
        if (lazyNetBeansOrgList) {
1061
            lazyNetBeansOrgList = false;
1113
            lazyNetBeansOrgList = false;
1062
            File nbdestdir = new File(home, DEST_DIR_IN_NETBEANS_ORG);
1114
            File nbdestdir = findNetBeansOrgDestDir(home);
1063
            Map<String,ModuleEntry> _entries = new HashMap<String,ModuleEntry>(entries); // #68513: possible race condition
1115
            Map<String,ModuleEntry> _entries = new HashMap<String,ModuleEntry>(entries); // #68513: possible race condition
1064
            if (new File(home, "openide.util").isDirectory()) { // NOI18N
1116
            if (new File(home, "openide.util").isDirectory()) { // NOI18N
1065
                // Post-Hg layout.
1117
                // Post-Hg layout.
 Lines 1085-1091    Link Here 
1085
            return e;
1137
            return e;
1086
        }
1138
        }
1087
        if (isNetBeansOrg(home)) {
1139
        if (isNetBeansOrg(home)) {
1088
            File nbdestdir = new File(home, DEST_DIR_IN_NETBEANS_ORG);
1140
            File nbdestdir = findNetBeansOrgDestDir(home);
1089
            for (String tree : FOREST) {
1141
            for (String tree : FOREST) {
1090
                String name = abbreviate(codeNameBase);
1142
                String name = abbreviate(codeNameBase);
1091
                File basedir = new File(tree == null ? home : new File(home, tree), name);
1143
                File basedir = new File(tree == null ? home : new File(home, tree), name);
(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/universe/NetBeansOrgEntry.java (-1 / +1 lines)
 Lines 90-96    Link Here 
90
    }
90
    }
91
    
91
    
92
    public File getDestDir() {
92
    public File getDestDir() {
93
        return new File(nball, ModuleList.DEST_DIR_IN_NETBEANS_ORG);
93
        return ModuleList.findNetBeansOrgDestDir(nball);
94
    }
94
    }
95
    
95
    
96
    public String getCodeNameBase() {
96
    public String getCodeNameBase() {
(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java (+9 lines)
 Lines 204-208    Link Here 
204
        }
204
        }
205
        return null;
205
        return null;
206
    }
206
    }
207
208
    @Override
209
    public String toString() {
210
        try {
211
            return "TestEntry[" + jarFile + ",src=" + getSrcDir() + "]"; // NOI18N
212
        } catch (IOException x) {
213
            return "TestEntry[" + jarFile + ",src=<" + x.getMessage() + ">]"; // NOI18N
214
        }
215
    }
207
    
216
    
208
} 
217
} 
(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java (-19 / +17 lines)
 Lines 500-517    Link Here 
500
    /**
500
    /**
501
     * Find all modules in a binary build, possibly from cache.
501
     * Find all modules in a binary build, possibly from cache.
502
     */
502
     */
503
    private static Map<String,Entry> scanBinaries(Map<String,String> properties, Project project) throws IOException {
503
    private static Map<String,Entry> scanBinaries(Project project, File build) throws IOException {
504
        String buildS = properties.get("netbeans.dest.dir");
505
        File basedir = new File(properties.get("basedir"));
506
        if (buildS == null) {
507
            throw new IOException("No definition of netbeans.dest.dir in " + basedir);
508
        }
509
        // Resolve against basedir, and normalize ../ sequences and so on in case they are used.
510
        // Neither operation is likely to be needed, but just in case.
511
        File build = FileUtils.getFileUtils().normalize(FileUtils.getFileUtils().resolveFile(basedir, buildS).getAbsolutePath());
512
        if (!build.isDirectory()) {
513
            throw new IOException("No such netbeans.dest.dir: " + build);
514
        }
515
        Map<String,Entry> entries = BINARY_SCAN_CACHE.get(build);
504
        Map<String,Entry> entries = BINARY_SCAN_CACHE.get(build);
516
        if (entries == null) {
505
        if (entries == null) {
517
            if (project != null) {
506
            if (project != null) {
 Lines 690-702    Link Here 
690
     */
679
     */
691
    public ModuleListParser(Map<String,String> properties, int type, Project project) throws IOException {
680
    public ModuleListParser(Map<String,String> properties, int type, Project project) throws IOException {
692
        String nball = properties.get("nb_all");
681
        String nball = properties.get("nb_all");
682
        String buildS = properties.get("netbeans.dest.dir");
683
        File basedir = new File(properties.get("basedir"));
684
        if (buildS == null) {
685
            throw new IOException("No definition of netbeans.dest.dir in " + basedir);
686
        }
687
        // Resolve against basedir, and normalize ../ sequences and so on in case they are used.
688
        // Neither operation is likely to be needed, but just in case.
689
        File build = FileUtils.getFileUtils().normalize(FileUtils.getFileUtils().resolveFile(basedir, buildS).getAbsolutePath());
690
        if (!build.isDirectory()) {
691
            throw new IOException("No such netbeans.dest.dir: " + build);
692
        }
693
        if (type != ParseProjectXml.TYPE_NB_ORG) {
693
        if (type != ParseProjectXml.TYPE_NB_ORG) {
694
            // External module.
694
            // External module.
695
            File basedir = new File(properties.get("basedir"));
696
            if (nball != null && project != null) {
695
            if (nball != null && project != null) {
697
                project.log("You must *not* declare <suite-component/> or <standalone/> for a netbeans.org module in " + basedir + "; fix project.xml to use the /2 schema", Project.MSG_WARN);
696
                project.log("You must *not* declare <suite-component/> or <standalone/> for a netbeans.org module in " + basedir + "; fix project.xml to use the /2 schema", Project.MSG_WARN);
698
            }
697
            }
699
            entries = scanBinaries(properties, project);
698
            entries = scanBinaries(project, build);
700
            if (type == ParseProjectXml.TYPE_SUITE) {
699
            if (type == ParseProjectXml.TYPE_SUITE) {
701
                entries.putAll(scanSuiteSources(properties, project));
700
                entries.putAll(scanSuiteSources(properties, project));
702
            } else {
701
            } else {
 Lines 709-723    Link Here 
709
            if (nball == null) {
708
            if (nball == null) {
710
                throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File(properties.get("basedir")));
709
                throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File(properties.get("basedir")));
711
            }
710
            }
712
            // If scan.binaries property is set we scan binaries otherwise sources.
711
            if (!build.equals(new File(new File(nball, "nbbuild"), "netbeans"))) {
713
            if (properties.get("scan.binaries") != null) {
712
                // Potentially orphaned module to be built against specific binaries, plus perhaps other source deps.
714
                entries = scanBinaries(properties, project);
713
                entries = scanBinaries(project, build);
715
                // module itself has to be added because it doesn't have to be in binaries
714
                // Add referenced module in case it does not appear otherwise.
716
                Entry e = scanStandaloneSource(properties, project);
715
                Entry e = scanStandaloneSource(properties, project);
717
                if (e != null) {
716
                if (e != null) {
718
                    entries.put(e.getCnb(), e);
717
                    entries.put(e.getCnb(), e);
719
                }
718
                }
720
                // to allow building of depend modules on top of binary
721
                entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
719
                entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
722
            } else {
720
            } else {
723
                entries = scanNetBeansOrgSources(new File(nball), properties, project);
721
                entries = scanNetBeansOrgSources(new File(nball), properties, project);
(-)a/nbbuild/build.xml (-6 / +4 lines)
 Lines 76-83    Link Here 
76
76
77
  <target name="-load-build-properties">
77
  <target name="-load-build-properties">
78
    <property file="build.properties"/>
78
    <property file="build.properties"/>
79
    <!-- We need absolute path to ${netbeans.dest} -->
80
    <property name="netbeans.dest.abs" location="${netbeans.dest}"/>
81
  </target>
79
  </target>
82
80
83
  <target name="bootstrap"
81
  <target name="bootstrap"
 Lines 1213-1219    Link Here 
1213
    <!-- possibly after filtering for duplicates or something like this. -->
1211
    <!-- possibly after filtering for duplicates or something like this. -->
1214
    <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
1212
    <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
1215
    <!-- a deadlock from hanging an automated build: -->
1213
    <!-- a deadlock from hanging an automated build: -->
1216
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP Windows Vista" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
1214
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP Windows Vista" executable="${netbeans.dest.dir}/bin/nb.exe" failonerror="yes" timeout="600000">
1217
      <arg value="--jdkhome"/>
1215
      <arg value="--jdkhome"/>
1218
      <arg file="${nbjdk.home}"/>
1216
      <arg file="${nbjdk.home}"/>
1219
      <arg value="--userdir"/>
1217
      <arg value="--userdir"/>
 Lines 1221-1227    Link Here 
1221
      <arg line="${sanitystart.args}"/>
1219
      <arg line="${sanitystart.args}"/>
1222
    </exec>
1220
    </exec>
1223
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
1221
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
1224
      <arg value="${netbeans.dest.abs}/bin/netbeans"/>
1222
      <arg value="${netbeans.dest.dir}/bin/netbeans"/>
1225
      <arg value="--jdkhome"/>
1223
      <arg value="--jdkhome"/>
1226
      <arg file="${nbjdk.home}"/>
1224
      <arg file="${nbjdk.home}"/>
1227
      <arg value="--userdir"/>
1225
      <arg value="--userdir"/>
 Lines 1296-1302    Link Here 
1296
    <condition property="run.env.display" value="${env.NBDISPLAY}" else="${env.DISPLAY}">
1294
    <condition property="run.env.display" value="${env.NBDISPLAY}" else="${env.DISPLAY}">
1297
	<isset property="env.NBDISPLAY"/>
1295
	<isset property="env.NBDISPLAY"/>
1298
    </condition>
1296
    </condition>
1299
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP Windows Vista" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
1297
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP Windows Vista" executable="${netbeans.dest.dir}/bin/nb.exe" failonerror="yes">
1300
      <arg value="--jdkhome"/>
1298
      <arg value="--jdkhome"/>
1301
      <arg file="${nbjdk.home}"/>
1299
      <arg file="${nbjdk.home}"/>
1302
      <arg value="--userdir"/>
1300
      <arg value="--userdir"/>
 Lines 1305-1311    Link Here 
1305
      <arg line="${tryme.debug.args}" />
1303
      <arg line="${tryme.debug.args}" />
1306
    </exec>
1304
    </exec>
1307
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
1305
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
1308
      <arg value="${netbeans.dest}/bin/netbeans"/>
1306
      <arg value="${netbeans.dest.dir}/bin/netbeans"/>
1309
      <arg value="--jdkhome"/>
1307
      <arg value="--jdkhome"/>
1310
      <arg file="${nbjdk.home}"/>
1308
      <arg file="${nbjdk.home}"/>
1311
      <arg value="--userdir"/>
1309
      <arg value="--userdir"/>
(-)a/nbbuild/default-properties.xml (-5 / +5 lines)
 Lines 43-48    Link Here 
43
<project name="default-properties" default="netbeans" basedir=".">
43
<project name="default-properties" default="netbeans" basedir=".">
44
  <dirname property="nb_all" file="${ant.file.default-properties}/.."/>
44
  <dirname property="nb_all" file="${ant.file.default-properties}/.."/>
45
45
46
  <!-- Have to be read here, so that they will affect even module builds (e.g. when setting JDK): -->
47
  <property file="${nb_all}/nbbuild/user.build.properties"/>
48
  <property file="${nb_all}/nbbuild/site.build.properties"/>
49
  <property file="${user.home}/.nbbuild.properties"/>
50
46
  <property name="dist.base" value="http://www.netbeans.org/download/nbms/alpha/dev/1.16"/>
51
  <property name="dist.base" value="http://www.netbeans.org/download/nbms/alpha/dev/1.16"/>
47
  <property name="license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
52
  <property name="license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
48
  <property name="build.sysclasspath" value="ignore"/>
53
  <property name="build.sysclasspath" value="ignore"/>
 Lines 52-62    Link Here 
52
  <property name="netbeans.build.dir" location="${nb_all}/nbbuild/build"/>
57
  <property name="netbeans.build.dir" location="${nb_all}/nbbuild/build"/>
53
  <property name="netbeans.javadoc.dir" location="${netbeans.build.dir}/javadoc"/>
58
  <property name="netbeans.javadoc.dir" location="${netbeans.build.dir}/javadoc"/>
54
  <property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
59
  <property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
55
56
  <!-- Have to be read here, so that they will affect even module builds (e.g. when setting JDK): -->
57
  <property file="${nb_all}/nbbuild/user.build.properties"/>
58
  <property file="${nb_all}/nbbuild/site.build.properties"/>
59
  <property file="${user.home}/.nbbuild.properties"/>
60
60
61
  <macrodef name="resolve">
61
  <macrodef name="resolve">
62
    <attribute name="name"/>
62
    <attribute name="name"/>
(-)a/nbbuild/templates/projectized.xml (-1 / +4 lines)
 Lines 294-300    Link Here 
294
        <jhindexer basedir="${build.javahelp.dir}/${javahelp.base}"
294
        <jhindexer basedir="${build.javahelp.dir}/${javahelp.base}"
295
                   db="${build.javahelp.dir}/${javahelp.base}/${javahelp.search}">
295
                   db="${build.javahelp.dir}/${javahelp.base}/${javahelp.search}">
296
            <classpath>
296
            <classpath>
297
                <fileset dir="${nb_all}/apisupport.harness/external">
297
                <fileset dir="${nb_all}">
298
                    <include name="apisupport.harness/external/jsearch*.jar"/>
299
                </fileset>
300
                <fileset dir="${netbeans.dest.dir}/harness">
298
                    <include name="jsearch*.jar"/>
301
                    <include name="jsearch*.jar"/>
299
                </fileset>
302
                </fileset>
300
            </classpath>
303
            </classpath>

Return to bug 143236
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