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

(-)nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java (+12 lines)
Lines 132-138 Link Here
132
            dummy.addDependency (targetprefix + module);
132
            dummy.addDependency (targetprefix + module);
133
        }
133
        }
134
        project.addTarget (dummy);
134
        project.addTarget (dummy);
135
        /* This runs bootstrap etc. again, causing problems under 1.5:
135
        project.executeTarget (dummyName);
136
        project.executeTarget (dummyName);
137
         */
138
        Vector fullList = project.topoSort(dummyName, targets);
139
        // Now remove earlier ones: already done.
140
        Vector doneList = project.topoSort(getOwningTarget().getName(), targets);
141
        List todo = new ArrayList(fullList.subList(0, fullList.indexOf(dummy)));
142
        todo.removeAll(doneList.subList(0, doneList.indexOf(getOwningTarget())));
143
        log("<nbmerge>: new targets to run: " + todo, Project.MSG_VERBOSE);
144
        Iterator targit = todo.iterator();
145
        while (targit.hasNext()) {
146
            ((Target)targit.next()).performTasks();
147
        }
136
148
137
/* Done in build.xml        
149
/* Done in build.xml        
138
        Delete delete = (Delete) project.createTask ("delete");
150
        Delete delete = (Delete) project.createTask ("delete");

Return to bug 24489