mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-16 12:45:41 +02:00
Code Issues Wiki Activity

additional fix for the tool-chain modification functionality

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-11-16 10:56:09 +00:00
parent 0f377144c4
commit 92e72835f8
1 changed files with 73 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/TcModificationUtil.java
View file

@ -13,6 +13,7 @@ package org.eclipse.cdt.managedbuilder.internal.tcmodification;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -33,6 +34,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.FolderInfo; import org.eclipse.cdt.managedbuilder.internal.core.FolderInfo;
import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation; import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
import org.eclipse.cdt.managedbuilder.internal.core.ResourceConfiguration; import org.eclipse.cdt.managedbuilder.internal.core.ResourceConfiguration;
import org.eclipse.cdt.managedbuilder.internal.core.Tool;
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
public class TcModificationUtil { public class TcModificationUtil {
@ -181,8 +184,12 @@ public class TcModificationUtil {
} }
public static TreeMap createResultingChangesMap(TreeMap resultingMap, TreeMap initialMap){ public static TreeMap createResultingChangesMap(TreeMap resultingMap, TreeMap initialMap){
int[] types = ObjectTypeBasedStorage.getSupportedObjectTypes(); int[] types = new int []{
int type; IRealBuildObjectAssociation.OBJECT_TOOLCHAIN,
IRealBuildObjectAssociation.OBJECT_BUILDER,
IRealBuildObjectAssociation.OBJECT_TOOL,
};
TreeMap result = new TreeMap(PathComparator.INSTANCE); TreeMap result = new TreeMap(PathComparator.INSTANCE);
initialMap = (TreeMap)initialMap.clone(); initialMap = (TreeMap)initialMap.clone();
@ -209,23 +216,58 @@ public class TcModificationUtil {
} }
} }
} else { } else {
Set initSet, resSet; Set tcInitSet, resSet, setToStore;
Set bInitSet = null, tInitSet = null;
storage = new PerTypeSetStorage(); storage = new PerTypeSetStorage();
for(int i = 0; i < types.length; i++){
type = types[i]; tcInitSet = initStorage.getSet(IRealBuildObjectAssociation.OBJECT_TOOLCHAIN, false);
initSet = initStorage.getSet(type, false); resSet = resStorage.getSet(IRealBuildObjectAssociation.OBJECT_TOOLCHAIN, false);
resSet = resStorage.getSet(type, false); setToStore = compareSets(resSet, tcInitSet);
if(initSet == null || initSet.isEmpty()){ if(setToStore != null) {
if(resSet != null && !resSet.isEmpty()){ storage.getSet(IRealBuildObjectAssociation.OBJECT_TOOLCHAIN, true).addAll(setToStore);
storage.getSet(type, true).addAll(resSet);
//need to change the initial storage to contain
//tools and a builder from the newly assigned tool-chain
//for the correct change calculation
ToolChain tc = setToStore.size() != 0 ?
(ToolChain)setToStore.iterator().next() : null;
IPath path = (IPath)oPath;
if(tc != null){
tInitSet = new LinkedHashSet();
TcModificationUtil.getRealObjectsSet((Tool[])tc.getTools(), tInitSet);
if(path.segmentCount() == 0){
bInitSet = new LinkedHashSet();
IBuilder builder = tc.getBuilder();
if(builder != null){
bInitSet.add(ManagedBuildManager.getRealBuilder(builder));
}
} }
} else if (resSet == null || resSet.isEmpty()){
storage.getSet(type, true);
} else { } else {
if(!initSet.equals(resSet)){ tcInitSet = Collections.EMPTY_SET;
storage.getSet(type, true).addAll(resSet); if(path.segmentCount() == 0){
bInitSet = Collections.EMPTY_SET;
} }
} }
}
if(bInitSet == null)
bInitSet = initStorage.getSet(IRealBuildObjectAssociation.OBJECT_BUILDER, false);
resSet = resStorage.getSet(IRealBuildObjectAssociation.OBJECT_BUILDER, false);
setToStore = compareSets(resSet, bInitSet);
if(setToStore != null) {
storage.getSet(IRealBuildObjectAssociation.OBJECT_BUILDER, true).addAll(setToStore);
}
if(tInitSet == null)
tInitSet = initStorage.getSet(IRealBuildObjectAssociation.OBJECT_TOOL, false);
resSet = resStorage.getSet(IRealBuildObjectAssociation.OBJECT_TOOL, false);
setToStore = compareSets(resSet, tInitSet);
if(setToStore != null) {
storage.getSet(IRealBuildObjectAssociation.OBJECT_TOOL, true).addAll(setToStore);
} }
} }
@ -237,6 +279,23 @@ public class TcModificationUtil {
return result; return result;
} }
private static Set compareSets(Set resSet, Set initSet){
Set result = null;
if(initSet == null || initSet.isEmpty()){
if(resSet != null && !resSet.isEmpty()){
result = resSet;
}
} else if (resSet == null || resSet.isEmpty()){
result = Collections.EMPTY_SET;
} else {
if(!initSet.equals(resSet)){
result = resSet;
}
}
return result;
}
private static void processFolderInfo(PerTypeMapStorage storage, FolderInfo info, PerTypeMapStorage skipMapStorage, boolean addSkipPaths){ private static void processFolderInfo(PerTypeMapStorage storage, FolderInfo info, PerTypeMapStorage skipMapStorage, boolean addSkipPaths){
IPath p = info.getPath(); IPath p = info.getPath();
IToolChain rtc = ManagedBuildManager.getRealToolChain(info.getToolChain()); IToolChain rtc = ManagedBuildManager.getRealToolChain(info.getToolChain());