From 550b35c0c610d6b0672c01e003c9419924dcf21e Mon Sep 17 00:00:00 2001 From: Sean Evoy Date: Thu, 24 Jun 2004 15:56:06 +0000 Subject: [PATCH] Commit for Dave Daoust: adds updated copyright notices for IBM-supplied source --- .../build.properties | 10 ++++++++++ .../plugin.properties | 11 +++++++++++ .../cdt/managedbuilder/core/BuildException.java | 10 +++++----- .../cdt/managedbuilder/core/IBuildObject.java | 10 +++++----- .../cdt/managedbuilder/core/IConfiguration.java | 10 +++++----- .../eclipse/cdt/managedbuilder/core/IOption.java | 10 +++++----- .../cdt/managedbuilder/core/IOptionCategory.java | 10 +++++----- .../org/eclipse/cdt/managedbuilder/core/ITool.java | 10 +++++----- .../core/ManagedBuilderCorePlugin.java | 8 +++++--- .../managedbuilder/internal/core/BuildObject.java | 14 +++++++------- .../cdt/managedbuilder/internal/core/Option.java | 10 +++++----- .../internal/core/OptionCategory.java | 10 +++++----- .../internal/core/OptionReference.java | 10 +++++----- .../cdt/managedbuilder/internal/core/Tool.java | 10 +++++----- 14 files changed, 83 insertions(+), 60 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/build.properties b/build/org.eclipse.cdt.managedbuilder.core/build.properties index e7e860a497b..b7d2619ab3c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/build.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/build.properties @@ -1,3 +1,13 @@ +############################################################################### +# Copyright (c) 2003, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Common Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/cpl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### bin.includes = plugin.xml,\ plugin.properties,\ about.html,\ diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties index 7ebe6ca2355..e02c184fb59 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties @@ -1,5 +1,16 @@ +############################################################################### +# Copyright (c) 2003, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Common Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/cpl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### pluginName=C/C++ Managed Builder Core providerName=Eclipse.org GeneratedMakefileCBuilder.name=Generated Makefile Builder ManagedBuildNature.name=Managed Builder Project +ManagedMakeProject.name=Managed Make Project \ No newline at end of file diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/BuildException.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/BuildException.java index 2cff8486129..5a3322bb5e3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/BuildException.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/BuildException.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; public class BuildException extends Exception { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildObject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildObject.java index e9b0d097743..991c9534e25 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildObject.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildObject.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; public interface IBuildObject { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IConfiguration.java index 1dfa8052558..846291eb556 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IConfiguration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IConfiguration.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; import org.eclipse.core.resources.IProject; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java index b4d8546917f..b068228f2b5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; /** diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOptionCategory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOptionCategory.java index 238a23602b1..748f44db220 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOptionCategory.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOptionCategory.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; /** diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java index e0f7b7889b3..61c35a33dbc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core; import java.util.List; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java index f276355e1ed..7b1b812de95 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java @@ -1,7 +1,7 @@ package org.eclipse.cdt.managedbuilder.core; /********************************************************************** - * Copyright (c) 2002,2003 Rational Software Corporation and others. + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v0.5 * which accompanies this distribution, and is available at @@ -29,13 +29,15 @@ public class ManagedBuilderCorePlugin extends Plugin { private static final String PLUGIN_ID = "org.eclipse.cdt.managedbuilder.core"; //$NON-NLS-1$ // The attribute name for the dependency calculator public static final String DEP_CALC_ID ="dependencyCalculator"; //$NON-NLS-1$ - //The shared instance. + // The shared instance private static ManagedBuilderCorePlugin plugin; // The attribute name for the scanner info collector public static final String SCANNER_INFO_ID = "scannerInfoCollector"; //$NON-NLS-1$ // The attribute name for the makefile generator public static final String MAKEGEN_ID ="makefileGenerator"; //$NON-NLS-1$ - + // The unique id for all managed make projects + public static final String MANAGED_MAKE_PROJECT_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".managedMake"; //$NON-NLS-1$ + /** * @param descriptor */ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java index c875e0570c4..77b0515d274 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java @@ -1,15 +1,15 @@ -package org.eclipse.cdt.managedbuilder.internal.core; - -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.managedbuilder.internal.core; + import org.eclipse.cdt.managedbuilder.core.IBuildObject; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java index 1c7947f3ae0..76b82b723f4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; import java.util.ArrayList; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java index 821c8b02b24..946db2da521 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; import java.util.ArrayList; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java index cb555795c8a..ab375eb89b8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; import java.util.ArrayList; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java index 24859b1113b..56046f6519a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java @@ -1,13 +1,13 @@ -/********************************************************************** - * Copyright (c) 2003 IBM Corporation and others. +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; import java.util.ArrayList;