From f5be7559e16786e1df1bef9613543ed6d82aa1da Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 10 Nov 2022 20:09:11 -0500 Subject: [PATCH 1/3] Mark for removal API not accessed within CDT (or Embed CDT) --- .../core/ManagedBuildManager.java | 59 ++++++------------- .../IEnvironmentBuildPathsChangeListener.java | 3 + .../envvar/IEnvironmentVariableProvider.java | 6 ++ .../envvar/EnvironmentVariableProvider.java | 13 ++++ .../cdt/core/resources/ScannerProvider.java | 2 +- 5 files changed, 42 insertions(+), 41 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index 29a367f5f47..cc72be5feab 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -820,47 +820,11 @@ public static IConfiguration getSelectedConfiguration(IProject project) { return null; } - /* (non-Javadoc) - * - * @param config - * @param option + /** + * Unreferenced in CDT + * @deprecated */ - /* - private static void notifyListeners(IConfiguration config, IOption option) { - // Continue if change is something that effect the scanner - try { - //an option can be null in the case of calling this method from the environment - //build path change listener - if (config.isTemporary() || - (option != null && option.getValueType() != IOption.INCLUDE_PATH - && option.getValueType() != IOption.PREPROCESSOR_SYMBOLS - && option.getValueType() != IOption.INCLUDE_FILES - && option.getValueType() != IOption.LIBRARY_PATHS - && option.getValueType() != IOption.LIBRARY_FILES - && option.getValueType() != IOption.MACRO_FILES - && option.getValueType() != IOption.UNDEF_INCLUDE_PATH - && option.getValueType() != IOption.UNDEF_PREPROCESSOR_SYMBOLS - && option.getValueType() != IOption.UNDEF_INCLUDE_FILES - && option.getValueType() != IOption.UNDEF_LIBRARY_PATHS - && option.getValueType() != IOption.UNDEF_LIBRARY_FILES - && option.getValueType() != IOption.UNDEF_MACRO_FILES - )) { - return; - } - } catch (BuildException e) {return;} - - // Figure out if there is a listener for this change - IResource resource = config.getOwner(); - List listeners = (List) getBuildModelListeners().get(resource); - if (listeners == null) { - return; - } - ListIterator iter = listeners.listIterator(); - while (iter.hasNext()) { - ((IScannerInfoChangeListener)iter.next()).changeNotification(resource, (IScannerInfo)getBuildInfo(resource)); - } - } - */ + @Deprecated(forRemoval = true) public static void initializePathEntries(IConfiguration config, IOption option) { try { if (config.isTemporary() || (option != null && option.getValueType() != IOption.INCLUDE_PATH @@ -885,6 +849,11 @@ public static void initializePathEntries(IConfiguration config, IOption option) } + /** + * Unreferenced in CDT + * @deprecated + */ + @Deprecated(forRemoval = true) public static void initializePathEntries(IResourceConfiguration resConfig, IOption option) { IConfiguration cfg = resConfig.getParent(); if (cfg != null) @@ -1478,6 +1447,11 @@ public static void updateCoreSettings(IProject project) throws CoreException { updateBuildInfo(project, true); } + /** + * Unreferenced in CDT + * @deprecated + */ + @Deprecated public static void updateCoreSettings(IConfiguration cfg) throws CoreException { IProject project = cfg.getOwner().getProject(); ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(project); @@ -1488,6 +1462,11 @@ public static void updateCoreSettings(IConfiguration cfg) throws CoreException { } } + /** + * Unreferenced in CDT + * @deprecated + */ + @Deprecated(forRemoval = true) public static void updateCoreSettings(IProject project, IConfiguration[] cfgs) throws CoreException { updateCoreSettings(project, cfgs, false); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentBuildPathsChangeListener.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentBuildPathsChangeListener.java index c1c0e11f16f..a8d150de206 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentBuildPathsChangeListener.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentBuildPathsChangeListener.java @@ -20,7 +20,10 @@ * listeners of the environment build path changes should implement this interface * * @since 3.0 + * + * @deprecated Not referenced in CDT */ +@Deprecated(forRemoval = true) public interface IEnvironmentBuildPathsChangeListener { /** diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java index 1ce5e814a91..3d46b3e18da 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java @@ -123,11 +123,17 @@ public IBuildEnvironmentVariable getVariable(String variableName, Object level, * adds the listener that will return notifications about the include and library paths changes. * The ManagedBuildManager will register the change listener and will notify all registered * Scanned Info Change Listeners about the include paths change. + * + * @deprecated Not referenced in CDT */ + @Deprecated(forRemoval = true) void subscribe(IEnvironmentBuildPathsChangeListener listener); /** * removes the include and library paths change listener + * + * @deprecated Not referenced in CDT */ + @Deprecated(forRemoval = true) void unsubscribe(IEnvironmentBuildPathsChangeListener listener); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java index 0fee0afb75f..fbe790bbce7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java @@ -238,7 +238,10 @@ private List getListeners() { /** * notifies registered listeners + * + * @deprecated Not referenced in CDT */ + @Deprecated(forRemoval = true) private void notifyListeners(IConfiguration configuration, int buildPathType) { List listeners = getListeners(); for (IEnvironmentBuildPathsChangeListener listener : listeners) { @@ -246,6 +249,11 @@ private void notifyListeners(IConfiguration configuration, int buildPathType) { } } + /** + * + * @deprecated Not referenced in CDT + */ + @Deprecated(forRemoval = true) @Override public synchronized void subscribe(IEnvironmentBuildPathsChangeListener listener) { if (listener == null) @@ -257,6 +265,11 @@ public synchronized void subscribe(IEnvironmentBuildPathsChangeListener listener listeners.add(listener); } + /** + * + * @deprecated Not referenced in CDT + */ + @Deprecated(forRemoval = true) @Override public synchronized void unsubscribe(IEnvironmentBuildPathsChangeListener listener) { if (listener == null) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java index 3ec1a8ee8ca..d38d1333aeb 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java @@ -47,7 +47,7 @@ * @deprecated Since CDT 4.0 replaced by {@link ScannerInfoProviderProxy}. Still * used as a default for projects created by earlier CDT versions. */ -@Deprecated +@Deprecated(forRemoval = true) public class ScannerProvider extends AbstractCExtension implements IScannerInfoProvider, IElementChangedListener { // Listeners interested in build model changes From 64c502ac27c5b2f58450080872b8b4991c6e568f Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 10 Nov 2022 20:08:49 -0500 Subject: [PATCH 2/3] Delete dead code. --- .../core/ManagedBuildManager.java | 69 ------------------- 1 file changed, 69 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index cc72be5feab..0b30d850a50 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -30,7 +30,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; import java.util.Random; @@ -61,8 +60,6 @@ import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.parser.IScannerInfo; -import org.eclipse.cdt.core.parser.IScannerInfoChangeListener; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; @@ -72,7 +69,6 @@ import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; import org.eclipse.cdt.managedbuilder.buildproperties.IBuildProperty; import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyManager; -import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentBuildPathsChangeListener; import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider; import org.eclipse.cdt.managedbuilder.internal.buildproperties.BuildPropertyManager; import org.eclipse.cdt.managedbuilder.internal.core.BooleanExpressionApplicabilityCalculator; @@ -251,14 +247,8 @@ public class ManagedBuildManager extends AbstractCExtension { // This map has a lifecycle corresponding to the build definitions extension loading. private static Map configElementMap; - // private static List sortedToolChains; - // private static Map builtTypeToToolChainListMap; - // Listeners interested in build model changes - private static Map> buildModelListeners; // Random number for derived object model elements private static Random randomNumber; - // Environment Build Paths Change Listener - private static IEnvironmentBuildPathsChangeListener fEnvironmentBuildPathsChangeListener; private static HashMap, List> fSortedToolChains; private static HashMap, List> fSortedTools; @@ -274,16 +264,6 @@ private static interface ISorter { void sort(); } - static { - getEnvironmentVariableProvider() - .subscribe(fEnvironmentBuildPathsChangeListener = (configuration, buildPathType) -> { - // if(buildPathType == IEnvVarBuildPath.BUILDPATH_INCLUDE){ - // initializePathEntries(configuration,null); - // notifyListeners(configuration,null); - // } - }); - } - /** * @return the next random number as a positive integer. */ @@ -860,37 +840,6 @@ public static void initializePathEntries(IResourceConfiguration resConfig, IOpti initializePathEntries(cfg, option); } - private static void notifyListeners(IResourceInfo resConfig, IOption option) { - // Continue if change is something that effect the scanreser - try { - if (resConfig.getParent().isTemporary() || (option != null && option.getValueType() != IOption.INCLUDE_PATH - && option.getValueType() != IOption.PREPROCESSOR_SYMBOLS - && option.getValueType() != IOption.INCLUDE_FILES && option.getValueType() != IOption.LIBRARY_PATHS - && option.getValueType() != IOption.LIBRARY_FILES && option.getValueType() != IOption.MACRO_FILES - && option.getValueType() != IOption.UNDEF_INCLUDE_PATH - && option.getValueType() != IOption.UNDEF_PREPROCESSOR_SYMBOLS - && option.getValueType() != IOption.UNDEF_INCLUDE_FILES - && option.getValueType() != IOption.UNDEF_LIBRARY_PATHS - && option.getValueType() != IOption.UNDEF_LIBRARY_FILES - && option.getValueType() != IOption.UNDEF_MACRO_FILES && !option.isForScannerDiscovery())) { - return; - } - } catch (BuildException e) { - return; - } - - // Figure out if there is a listener for this change - IResource resource = resConfig.getParent().getOwner(); - List listeners = getBuildModelListeners().get(resource); - if (listeners == null) { - return; - } - ListIterator iter = listeners.listIterator(); - while (iter.hasNext()) { - iter.next().changeNotification(resource, (IScannerInfo) getBuildInfo(resource)); - } - } - /** * Adds the version of the managed build system to the project * specified in the argument. @@ -964,8 +913,6 @@ public static IOption setOption(IResourceInfo resConfig, IHoldsOptions holder, I } else { // Event handling Failed. } - // initializePathEntries(resConfig,retOpt); - notifyListeners(resConfig, retOpt); } catch (BuildException e) { return null; } @@ -1030,8 +977,6 @@ public static IOption setOption(IResourceInfo resConfig, IHoldsOptions holder, I } else { // Event handling Failed. } - // initializePathEntries(resConfig,retOpt); - notifyListeners(resConfig, retOpt); } catch (BuildException e) { return null; } @@ -1096,8 +1041,6 @@ public static IOption setOption(IResourceInfo resConfig, IHoldsOptions holder, I } else { // Event handling Failed. } - // initializePathEntries(resConfig,retOpt); - notifyListeners(resConfig, retOpt); } catch (BuildException e) { return null; } @@ -1116,8 +1059,6 @@ public static IOption setOption(IResourceInfo resConfig, IHoldsOptions holder, I } else { // Event handling Failed. } - // initializePathEntries(resConfig,retOpt); - notifyListeners(resConfig, retOpt); } catch (BuildException e) { return null; } @@ -2959,16 +2900,6 @@ public static URL getURLInBuildDefinitions(DefaultManagedConfigElement element, return null; } - /* - * @return - */ - private static Map> getBuildModelListeners() { - if (buildModelListeners == null) { - buildModelListeners = new HashMap<>(); - } - return buildModelListeners; - } - private static Map getConfigElementMap() { if (!projectTypesLoading) throw new IllegalStateException(); From 7587224391f2757da088dfda9a76fec38e6e57d0 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 11 Nov 2022 09:48:39 -0500 Subject: [PATCH 3/3] Remove .. folder entry in zip file This resolve the following exception during the build: !ENTRY org.eclipse.ui.ide 4 4 2022-11-11 09:45:42.503 !MESSAGE Entry is outside of the target dir: ../ !STACK 0 java.io.IOException: Entry is outside of the target dir: ../ at org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider.initialize(ZipFileStructureProvider.java:190) at org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider.getChildren(ZipFileStructureProvider.java:113) at org.eclipse.ui.wizards.datatransfer.ImportOperation.importRecursivelyFrom(ImportOperation.java:781) at org.eclipse.ui.wizards.datatransfer.ImportOperation.execute(ImportOperation.java:385) at org.eclipse.ui.actions.WorkspaceModifyOperation.lambda$0(WorkspaceModifyOperation.java:110) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2380) --- .../builderTests/regressions/helloworldC.zip | Bin 3756 -> 3576 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldC.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldC.zip index c5577598963c329069e0e5851a28d2780f4792fc..e5438fbd4022a5b0ffb81d8c3ae4e305eb9c3ffe 100644 GIT binary patch delta 461 zcmZ1@`$O6}z?+#xgn@y9gMru1!tPzg?n4Qj3=E6f7#KJiWEk|43ySiyQj<$ULpT|j zrAlpm=O^SPmsW5yFtWU0W?%pl8;i0z&4HRDWgc~WWMp7y0UE#o(u}NE61(2byj))y z-4PDR<=(vMEYLZ7f#wJT%_uHP*3U@I$;mIzFUm=A)=P#v1mqYrhfJ>Ixu`D3j4%z= zI}$*185n>DGc0Ljn7p1>v>r`=fHxx(vUXGtA!}a@^diE0tPIQ`?-4K!)oUQrykV}n d#?64ur$BSD_%gtol?~((W+40mq~Gy?cmSAjW(5EM delta 679 zcmew%y+*b^z?+$civa|@axLt@3@E|OAj+Vprym-^$-um)(bjh#5QkQ$7Z)W% zoDH)2F-~Xaa&O*r7N~bG&|X2Pwv5!Aoc!|qqMQ_Gy=1uaLFT}mzqa4oo7qvIWwIvE z$$D{STw%uxb(8?ZTUQVh9FnY%kPNM0U