From 7ac3195dd0b6f72f29afbff6bee77e49bfec79eb Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 2 Aug 2010 16:55:56 +0000 Subject: [PATCH] Bug 321374 - "NLS unused messages" warnings running headless build --- .../internal/core/HeadlessBuildMessages.java | 2 +- .../core/HeadlessBuildMessages.properties | 46 +++++++++++++++++++ .../internal/core/PluginResources.properties | 37 --------------- 3 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.properties diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.java index b085625dec9..71ed24e1fde 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.managedbuilder.internal.core; import org.eclipse.osgi.util.NLS; public class HeadlessBuildMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.core.PluginResources"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.core.HeadlessBuildMessages"; //$NON-NLS-1$ public static String HeadlessBuilder_already_exists_in_workspace; public static String HeadlessBuilder_build_failed; public static String HeadlessBuilder_building_all; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.properties new file mode 100644 index 00000000000..84efdc6c0c0 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuildMessages.properties @@ -0,0 +1,46 @@ +############################################################################### +# Copyright (c) 2010 CodeSourcery and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# CodeSourcery - Initial API and implementation +############################################################################### + +HeadlessBuilder_already_exists_in_workspace=\ already exists in the workspace\! +HeadlessBuilder_build_failed=Couldn't BUILD project +HeadlessBuilder_building_all=Building All Projects... +HeadlessBuilder_cant_be_found=\ can't be found\! +HeadlessBuilder_clean_failed=Couldn't CLEAN project +HeadlessBuilder_cleaning_all_projects=Cleaning All Projects... +HeadlessBuilder_CouldntLockWorkspace=Could not obtain lock for workspace location +HeadlessBuilder_Directory=Directory: +HeadlessBuilder_Error=Error: +HeadlessBuilder_invalid_argument=Invalid Arguments: +HeadlessBuilder_is_not_accessible=\ is not accessible\! +HeadlessBuilder_is_not_valid_in_workspace=\ is not valid in the workspace\! +HeadlessBuilder_no_arguments=No arguments specified. +HeadlessBuilder_NoConfigMatched=WARNING: No Config matched " +HeadlessBuilder_NoProjectMatched=WARNING: No Project matched " +HeadlessBuilder_Not_CDT_Proj=\ doesn't appear to be a CDT project. Skipping... +HeadlessBuilder_project=Project: +HeadlessBuilder_Quote=" +HeadlessBuilder_RegExSyntaxError=Project/Configuration Regular Expression Syntax error: +HeadlessBuilder_Skipping=Skipping " +HeadlessBuilder_Skipping2=". Skipping... +HeadlessBuilder_unknown_argument=Unknown argument: +HeadlessBuilder_URI=URI: +HeadlessBuilder_usage=Usage: +HeadlessBuilder_usage_build=\ \ \ -build {project_name_reg_ex{/config_reg_ex} | all} +HeadlessBuilder_usage_clean_build=\ \ \ -cleanBuild {project_name_reg_ex{/config_reg_ex} | all} +HeadlessBuilder_usage_import=\ \ \ -import {[uri:/]/path/to/project} +HeadlessBuilder_importAll=\ \ \ -importAll {[uri:/]/path/to/projectTreeURI} Import all projects under URI +HeadlessBuilder_IncludeFile=\ \ \ -include {include_file} additional include_file to pass to tools +HeadlessBuilder_InlucdePath=\ \ \ -I {include_path} additional include_path to add to tools +HeadlessBuilder_invalid_uri=Invalid project URI: +HeadlessBuilder_MustSpecifyWorkspace=Must specify a location for the workspace. Restart with the '-data' switch. +HeadlessBuilder_PreprocessorDefine=\ \ \ -D {prepoc_define} addition preprocessor defines to pass to the tools +HeadlessBuilder_Workspace=Workspace +HeadlessBuilder_WorkspaceInUse=Workspace already in use\! diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties index 32a56491b78..14f383cbb3d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties @@ -160,43 +160,6 @@ CommonBuilder.22=Building referenced configurations.. CommonBuilder.23=Buildfile generation error occurred.. CommonBuilder.24=Build stopped.. -# Headless builder -HeadlessBuilder_already_exists_in_workspace=\ already exists in the workspace\! -HeadlessBuilder_build_failed=Couldn't BUILD project -HeadlessBuilder_building_all=Building All Projects... -HeadlessBuilder_cant_be_found=\ can't be found\! -HeadlessBuilder_clean_failed=Couldn't CLEAN project -HeadlessBuilder_cleaning_all_projects=Cleaning All Projects... -HeadlessBuilder_CouldntLockWorkspace=Could not obtain lock for workspace location -HeadlessBuilder_Directory=Directory: -HeadlessBuilder_Error=Error: -HeadlessBuilder_invalid_argument=Invalid Arguments: -HeadlessBuilder_is_not_accessible=\ is not accessible\! -HeadlessBuilder_is_not_valid_in_workspace=\ is not valid in the workspace\! -HeadlessBuilder_no_arguments=No arguments specified. -HeadlessBuilder_NoConfigMatched=WARNING: No Config matched " -HeadlessBuilder_NoProjectMatched=WARNING: No Project matched " -HeadlessBuilder_Not_CDT_Proj=\ doesn't appear to be a CDT project. Skipping... -HeadlessBuilder_project=Project: -HeadlessBuilder_Quote=" -HeadlessBuilder_RegExSyntaxError=Project/Configuration Regular Expression Syntax error: -HeadlessBuilder_Skipping=Skipping " -HeadlessBuilder_Skipping2=". Skipping... -HeadlessBuilder_unknown_argument=Unknown argument: -HeadlessBuilder_URI=URI: -HeadlessBuilder_usage=Usage: -HeadlessBuilder_usage_build=\ \ \ -build {project_name_reg_ex{/config_reg_ex} | all} -HeadlessBuilder_usage_clean_build=\ \ \ -cleanBuild {project_name_reg_ex{/config_reg_ex} | all} -HeadlessBuilder_usage_import=\ \ \ -import {[uri:/]/path/to/project} -HeadlessBuilder_importAll=\ \ \ -importAll {[uri:/]/path/to/projectTreeURI} Import all projects under URI -HeadlessBuilder_IncludeFile=\ \ \ -include {include_file} additional include_file to pass to tools -HeadlessBuilder_InlucdePath=\ \ \ -I {include_path} additional include_path to add to tools -HeadlessBuilder_invalid_uri=Invalid project URI: -HeadlessBuilder_MustSpecifyWorkspace=Must specify a location for the workspace. Restart with the '-data' switch. -HeadlessBuilder_PreprocessorDefine=\ \ \ -D {prepoc_define} addition preprocessor defines to pass to the tools -HeadlessBuilder_Workspace=Workspace -HeadlessBuilder_WorkspaceInUse=Workspace already in use\! - MakeBuilder.buildError= MultiResourceInfo.MultiResourceInfo.UnhandledIHoldsOptionsType=Unhandled parent type: not ITool nor IToolChain ResourceChangeHandler2.0=project build settings update job