diff options
9 files changed, 20 insertions, 29 deletions
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 26801a935c7..96c30e15cc0 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 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2002, 2007 Rational Software Corporation and others. +# Copyright (c) 2002, 2009 Rational Software Corporation 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 @@ -124,7 +124,6 @@ BuildInfoFactory.Missing_Builder=Missing Builder: ResourceChangeHandler.buildInfoSerializationJob=Build Info Serialization #ManagedBuilderCorePlugin messages -ManagedBuilderCorePlugin.resourceChangeHandlingInitializationJob=Initializing Resource Change Handling GeneratedMakefileBuilder.buildResourcesFinished=Build of selected resources is complete. GeneratedMakefileBuilder.buildSelectedIncremental=Building selected file(s) incrementally GeneratedMakefileBuilder.buildSelectedRebuild=Rebuilding selected file(s) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties index 4d54116ef12..516a5f7e99b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Intel Corporation and others. +# Copyright (c) 2007, 2009 Intel Corporation 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 @@ -7,8 +7,8 @@ # # Contributors: # Intel Corporation - Initial API and implementation +# IBM Corporation ############################################################################### -ProjectConverter.0=the specified project is not an CDT project ProjectConverter.0=failed to load the build info for the old-style project ProjectConverter.1=the specified project is not an old style make project, the owner ID is ProjectConverter.10=project conversion failed diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index fde3228a989..ecde73a8852 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2008 IBM Corporation and others. +# Copyright (c) 2000, 2009 IBM Corporation 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 @@ -7,6 +7,7 @@ # # Contributors: # IBM - Initial API and implementation +# QNX Software Systems ############################################################################### # ----------- Configuration Selection Page ----------- @@ -483,7 +484,6 @@ CMainWizardPage.9=Project name is empty ProjectContentsArea.0=Browse... ProjectContentsArea.1=Use default location ProjectContentsArea.2=Location: -ProjectContentsArea.3=Choose file system: ProjectContentsArea.3=Invalid location path ProjectContentsArea.4=Project contents directory must be specified ProjectContentsArea.5=Select directory: diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties index 544c0a9218c..853458e607b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2005 QNX Software Systems and others. +# Copyright (c) 2003, 2009 QNX Software Systems 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 @@ -7,6 +7,7 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# IBM Corporation ############################################################################### cdi.Common.No_answer=No answer @@ -17,7 +18,6 @@ cdi.BreakpointManager.Not_a_CDT_breakpoint=Not a CDT breakpoint cdi.BreakpointManager.Not_Supported=Not Supported cdi.BreakpointManager.Parsing_Error=Parsing Error cdi.RuntimeOptions.Unable_to_set_args_target_not_responding=Unable to set arguments: target is not responding -cdi.RuntimeOptions.Unable_to_set_args=Unable to set arguments: cdi.RuntimeOptions.Unable_to_set_args=Unable to set environment: cdi.RuntimeOptions.Unable_to_set_working_dir=Unable to set working directory: cdi.Session.Unknown_target=Unkown target diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/PreferenceMessages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/PreferenceMessages.properties index d01c52979d3..86745c68980 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/PreferenceMessages.properties +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/PreferenceMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2007 QNX Software Systems and others. +# Copyright (c) 2003, 2009 QNX Software Systems 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 @@ -26,7 +26,6 @@ CDebugPreferencePage.13=Value must be an integer between {0} and {1}. CDebugPreferencePage.14=Binary CDebugPreferencePage.15=Show source files in binaries CDebugPreferencePage.16=Character encoding: -SourcePreferencePage.0=Common source lookup path settings. SourcePreferencePage.0=Common S&ource Lookup Path: DebuggerTypesPage.0=Select All DebuggerTypesPage.1=Deselect All diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/PropertyPageMessages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/PropertyPageMessages.properties index 76d944ff38c..309d5581f45 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/PropertyPageMessages.properties +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/PropertyPageMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2005 QNX Software Systems and others. +# Copyright (c) 2003, 2009 QNX Software Systems 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 @@ -8,6 +8,7 @@ # Contributors: # QNX Software Systems - initial API and implementation # Nokia - https://bugs.eclipse.org/bugs/show_bug.cgi?id=145606 +# IBM Corporation ############################################################################### CBreakpointPropertyPage.0=Ignore count must be a nonnegative integer @@ -41,7 +42,6 @@ SignalPropertyPage.5=Unable to change signal's properties. ModulePropertyPage.0=Type: ModulePropertyPage.1=executable ModulePropertyPage.2=shared library -ModulePropertyPage.3=core file ModulePropertyPage.3=Browse... ModulePropertyPage.4=CPU: ModulePropertyPage.5=not available @@ -54,7 +54,5 @@ ModulePropertyPage.11=loaded ModulePropertyPage.12=not loaded ModulePropertyPage.13=Symbols file: ModulePropertyPage.14=not found -ModulePropertyPage.15=Error ModulePropertyPage.15=Unable to load symbols. -ModulePropertyPage.16=Unable to load symbols. ModulePropertyPage.16=not available diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh index eb1f496884e..90a4c58f4b5 100644 --- a/releng/org.eclipse.cdt.releng/build.sh +++ b/releng/org.eclipse.cdt.releng/build.sh @@ -28,7 +28,7 @@ umask 0022 mkdir -p tools cd tools cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \ - checkout -r RC2_34 org.eclipse.releng.basebuilder + checkout -r r342_v20090210 org.eclipse.releng.basebuilder cd .. # Let's go! diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties index aa945629633..16b20855c2b 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties @@ -1,11 +1,11 @@ ############################################################################### -# Copyright (c) 2007, 2008 IBM Corporation 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: +# Copyright (c) 2007, 2009 IBM Corporation 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: # IBM Corporation - initial API and implementation ############################################################################### @@ -248,7 +248,6 @@ Option.pdf2 = Tune optimizations through Profile Directed Feedback: second run ( Option.optimization.Prefetch = Disable generation of prefetching instructions in compiled code (-qnoprefetch) Option.optimization.procimported = Mark functions as imported (-qprocimported=) Option.optimization.proclocal = Mark functions as local (-qlocal=) -Option.optimization.procimported = Mark functions as imported (-qprocimported=) Option.optimization.procunknown = Mark functions as unknown (-qprocunknown=) Option.optimization.showpdf = Add additional call and block count profiling information to the executable (-qshowpdf) Option.optimization.smallstack = Reduce the size of the stack frame (-qsmallstack) @@ -264,8 +263,6 @@ Option.optimization.w = Specify options to pass to specific compiler components # Linker Options Option.Linking.b = Control how shared objects are processed by the editor (-b) Option.linking.brtl = Enable runtime linking for the output file (-brtl) -Option.linking.bundle = -Option.Linking.bundle_loader Option.Linking.e = Set the entry name for the shared executable(-e ) Option.Linking.f = Option.linking.G = Create a shared object enabled for runtime linking (-G) @@ -331,7 +328,6 @@ Option.tls = Specify the thread local storage model (-qtls=) # Listings and Messages options Option.V = Report information on the progress of compilation (-V) -Option.Warn.nowarn = Suppress warnings and low-level messages (-w) Option.Warn.Pedandic=Pedantic (-pedantic) Option.Warn.PedErrors=Pedantic warnings as errors (-pedantic-errors) Option.Warn.nowarn=Inhibit all warnings (-w) @@ -354,7 +350,6 @@ Option.list = Produce a compiler listing that includes an object listing (-qlist Option.listopt = Produce a compiler listing that displays all options in effect(-qlistopt) Option.phsinfo = Report the time taken in each compilation phase (-qphsinfo) Option.noprint = Suppress all listings (-qnoprint ) -Option.report = Instruct the compiler to produce transformation reports (-qreport) Option.showinc = Show all included files in the source listing (-qshowinc) Option.source = Produce a compiler listing and include the source code (-qsource) Option.srcmsg = Add the corresponding source code lines to the diagnostic messages in stderr file (-qsrcmsg) @@ -385,7 +380,7 @@ Option.dbxextra = Include all typedefs, structs, unions, enums for debugging (-q Option.extchk = Generate bind-time type checking information and check for compile time consistency (-qextchk) Option.fullpath = Preserve absolute path name of source files used with -g option (-qfullpath) Option.genproto = Produce ANSI prototypes from K&R definitions -Option.genproto = Generate prototypes with parameter names +Option.genproto.general = Generate prototypes with parameter names Option.genproto.parmgenproto = Include parameter names in prototypes Option.heapdebug = Enable debug versions of memory management functions (-qheapdebug) Option.initauto = Initialize the automatic variables (-qinitauto=) diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml index c6ed748c42a..780eb20d260 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml @@ -2736,7 +2736,7 @@ id="xlc.c.ecd.genproto.none"> </enumeratedOptionValue> <enumeratedOptionValue - name="%Option.genproto" + name="%Option.genproto.general" isDefault="false" command="-qgenproto" id="xlc.c.ecd.genproto"> |