From 04baae6ead409fbed17d0680c2adb6a6400ebee1 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Fri, 16 Nov 2007 13:09:22 +0000 Subject: [PATCH] fix for the child folder info creation --- .../cdt/managedbuilder/internal/core/FolderInfo.java | 1 + .../cdt/managedbuilder/internal/core/ToolChain.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java index 3601ef0177b..935aa0bae7d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java @@ -84,6 +84,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { createToolChain(extTc, tcId, parTc.getName(), false); toolChain.createOptions(parTc); + toolChain.setUnusedChildren(parTc.getUnusedChildren()); ITool tools[] = parTc.getTools(); String subId = new String(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java index a56e7c2b851..bea03724c57 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java @@ -2752,6 +2752,14 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert unusedChildren = translateUnusedIdSetToString(set); } + void setUnusedChildren(String children){ + if(CDataUtil.objectsEqual(unusedChildren, children)) + return; + + unusedChildrenSet = null; + unusedChildren = children; + } + private String translateUnusedIdSetToString(Set set){ return CDataUtil.arrayToString(set.toArray(), ";"); //$NON-NLS-1$ }