From 9f1241f3ef4666a00ecf109c0a9c500a266371b8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Jul 2021 18:32:13 +0100 Subject: [PATCH] Bug 575139 - Meson shows sanitycheckc.exe in binaries container Exclude everything in */meson-private/* when generating meson projects. Signed-off-by: Mat Booth Change-Id: Id26c8dd695e5d09d158bb747b50e04544df706c9 --- build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF | 2 +- .../org/eclipse/cdt/meson/core/MesonProjectGenerator.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF index 136c12f7843..e270f1be98d 100644 --- a/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.cdt.meson.core;singleton:=true -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-Activator: org.eclipse.cdt.meson.core.Activator Bundle-Vendor: %provider Require-Bundle: org.eclipse.core.runtime, diff --git a/build/org.eclipse.cdt.meson.core/src/org/eclipse/cdt/meson/core/MesonProjectGenerator.java b/build/org.eclipse.cdt.meson.core/src/org/eclipse/cdt/meson/core/MesonProjectGenerator.java index aa4c14a096a..e107c93e0bc 100644 --- a/build/org.eclipse.cdt.meson.core/src/org/eclipse/cdt/meson/core/MesonProjectGenerator.java +++ b/build/org.eclipse.cdt.meson.core/src/org/eclipse/cdt/meson/core/MesonProjectGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2018 QNX Software Systems and others. + * Copyright (c) 2015, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -28,6 +28,7 @@ import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.tools.templates.freemarker.FMProjectGenerator; import org.eclipse.tools.templates.freemarker.SourceRoot; import org.eclipse.tools.templates.freemarker.TemplateManifest; @@ -81,7 +82,8 @@ public class MesonProjectGenerator extends FMProjectGenerator { } } - entries.add(CoreModel.newOutputEntry(buildFolder.getFullPath(), new IPath[] {})); + entries.add( + CoreModel.newOutputEntry(buildFolder.getFullPath(), new IPath[] { new Path("**/meson-private/**") })); //$NON-NLS-1$ CoreModel.getDefault().create(project).setRawPathEntries(entries.toArray(new IPathEntry[entries.size()]), monitor); }