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

(-)antsrc/org/netbeans/nbbuild/ModuleListParser.java (-19 / +7 lines)
Lines 482-507 Link Here
482
            if (nball == null) {
482
            if (nball == null) {
483
                throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File((String) properties.get("basedir")));
483
                throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File((String) properties.get("basedir")));
484
            }
484
            }
485
            String netbeansDestDir = (String)properties.get("netbeans.dest.dir");
485
            // If run from tests scan binaries otherwise sources.
486
            boolean scanNetBeansSources = false;
486
            if (properties.get("xtest.home") != null) {
487
            File d1 = new File(netbeansDestDir);
487
                entries = scanBinaries(properties, project);
488
            if (d1.getName().equals("netbeans")) {
488
                // module itself has to be added because it doesn't have to be in binaries
489
                File d2 = d1.getParentFile();
489
                Entry e = scanStandaloneSource(properties, project);
490
                if (d2 != null && d2.getName().equals("nbbuild")) {
490
                entries.put(e.getCnb(), e);
491
                    File d3 = d2.getParentFile();
492
                    if (d3 != null && d3.equals(new File(nball))) {
493
                        scanNetBeansSources = true;
494
                    }
495
                }
496
            }
497
            // If netbeans.dest.dir is <nball>/nbbuild/netbeans scan sources otherwise binaries.
498
            if (scanNetBeansSources) {
499
              entries = scanNetBeansOrgSources(new File(nball), properties, project);
500
            } else {
491
            } else {
501
              entries = scanBinaries(properties, project);
492
                entries = scanNetBeansOrgSources(new File(nball), properties, project);
502
              // module itself has to be added because it doesn't have to be in binaries
503
              Entry e = scanStandaloneSource(properties, project);
504
              entries.put(e.getCnb(), e);
505
            }
493
            }
506
        }
494
        }
507
    }
495
    }

Return to bug 61530