diff options
Diffstat (limited to 'build/org.eclipse.cdt.build.gcc.ui')
3 files changed, 173 insertions, 173 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/Messages.java b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/Messages.java index 4905e7fd64b..2e07df00926 100644 --- a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/Messages.java +++ b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/Messages.java @@ -1,56 +1,56 @@ -/*******************************************************************************
- * Copyright (c) 2017 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
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.cdt.build.gcc.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.cdt.build.gcc.ui.internal.messages"; //$NON-NLS-1$
- public static String GCCToolChainSettingsPage_Arch;
- public static String GCCToolChainSettingsPage_Browse;
- public static String GCCToolChainSettingsPage_ClangTitle;
- public static String GCCToolChainSettingsPage_Compiler;
- public static String GCCToolChainSettingsPage_Description;
- public static String GCCToolChainSettingsPage_OS;
- public static String GCCToolChainSettingsPage_Title;
- public static String NewClangToolChainWizard_Title;
- public static String NewEnvVarDialog_Append;
- public static String NewEnvVarDialog_Delimiter;
- public static String NewEnvVarDialog_Edit;
- public static String NewEnvVarDialog_Name;
- public static String NewEnvVarDialog_New;
- public static String NewEnvVarDialog_Operation;
- public static String NewEnvVarDialog_Prepend;
- public static String NewEnvVarDialog_Replace;
- public static String NewEnvVarDialog_Select;
- public static String NewEnvVarDialog_Unset;
- public static String NewEnvVarDialog_Value;
- public static String NewGCCToolChainWizard_Add;
- public static String NewGCCToolChainWizard_New;
- public static String ToolChainEnvironmentPage_Add;
- public static String ToolChainEnvironmentPage_Append;
- public static String ToolChainEnvironmentPage_Description;
- public static String ToolChainEnvironmentPage_Edit;
- public static String ToolChainEnvironmentPage_Name;
- public static String ToolChainEnvironmentPage_Operation;
- public static String ToolChainEnvironmentPage_Prepend;
- public static String ToolChainEnvironmentPage_Remove;
- public static String ToolChainEnvironmentPage_RemoveMessage;
- public static String ToolChainEnvironmentPage_RemoveTitle;
- public static String ToolChainEnvironmentPage_Replace;
- public static String ToolChainEnvironmentPage_Title;
- public static String ToolChainEnvironmentPage_Unset;
- public static String ToolChainEnvironmentPage_Value;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
+/******************************************************************************* + * Copyright (c) 2017 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 + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.cdt.build.gcc.ui.internal; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.cdt.build.gcc.ui.internal.messages"; //$NON-NLS-1$ + public static String GCCToolChainSettingsPage_Arch; + public static String GCCToolChainSettingsPage_Browse; + public static String GCCToolChainSettingsPage_ClangTitle; + public static String GCCToolChainSettingsPage_Compiler; + public static String GCCToolChainSettingsPage_Description; + public static String GCCToolChainSettingsPage_OS; + public static String GCCToolChainSettingsPage_Title; + public static String NewClangToolChainWizard_Title; + public static String NewEnvVarDialog_Append; + public static String NewEnvVarDialog_Delimiter; + public static String NewEnvVarDialog_Edit; + public static String NewEnvVarDialog_Name; + public static String NewEnvVarDialog_New; + public static String NewEnvVarDialog_Operation; + public static String NewEnvVarDialog_Prepend; + public static String NewEnvVarDialog_Replace; + public static String NewEnvVarDialog_Select; + public static String NewEnvVarDialog_Unset; + public static String NewEnvVarDialog_Value; + public static String NewGCCToolChainWizard_Add; + public static String NewGCCToolChainWizard_New; + public static String ToolChainEnvironmentPage_Add; + public static String ToolChainEnvironmentPage_Append; + public static String ToolChainEnvironmentPage_Description; + public static String ToolChainEnvironmentPage_Edit; + public static String ToolChainEnvironmentPage_Name; + public static String ToolChainEnvironmentPage_Operation; + public static String ToolChainEnvironmentPage_Prepend; + public static String ToolChainEnvironmentPage_Remove; + public static String ToolChainEnvironmentPage_RemoveMessage; + public static String ToolChainEnvironmentPage_RemoveTitle; + public static String ToolChainEnvironmentPage_Replace; + public static String ToolChainEnvironmentPage_Title; + public static String ToolChainEnvironmentPage_Unset; + public static String ToolChainEnvironmentPage_Value; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewClangToolChainWizard.java b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewClangToolChainWizard.java index a4892173050..d508b739929 100644 --- a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewClangToolChainWizard.java +++ b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewClangToolChainWizard.java @@ -1,75 +1,75 @@ -/*******************************************************************************
- * Copyright (c) 2017 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
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.cdt.build.gcc.ui.internal;
-
-import java.nio.file.Path;
-
-import org.eclipse.cdt.build.gcc.core.ClangToolChain;
-import org.eclipse.cdt.build.gcc.core.GCCToolChain;
-import org.eclipse.cdt.build.gcc.core.GCCUserToolChainProvider;
-import org.eclipse.cdt.core.build.IToolChain;
-import org.eclipse.cdt.core.build.IToolChainManager;
-import org.eclipse.cdt.core.build.IUserToolChainProvider;
-import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
-import org.eclipse.cdt.ui.build.ToolChainWizard;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class NewClangToolChainWizard extends ToolChainWizard {
-
- private GCCToolChainSettingsPage settingsPage;
- private ToolChainEnvironmentPage envPage;
-
- @Override
- public boolean performFinish() {
- Path path = settingsPage.getPath();
- String os = settingsPage.getOS();
- String arch = settingsPage.getArch();
- IEnvironmentVariable[] envvars = envPage.getEnvVars();
-
- new Job(Messages.NewGCCToolChainWizard_Add) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- IToolChainManager manager = Activator.getService(IToolChainManager.class);
- IUserToolChainProvider provider = (IUserToolChainProvider) manager
- .getProvider(GCCUserToolChainProvider.PROVIDER_ID);
-
- if (toolChain != null) {
- provider.removeToolChain(toolChain);
- }
-
- ClangToolChain gcc = new ClangToolChain(provider, path, arch, envvars);
- gcc.setProperty(IToolChain.ATTR_OS, os);
- provider.addToolChain(gcc);
- return Status.OK_STATUS;
- } catch (CoreException e) {
- return e.getStatus();
- }
- }
- }.schedule();
- return true;
- }
-
- @Override
- public void addPages() {
- super.addPages();
-
- settingsPage = new GCCToolChainSettingsPage((GCCToolChain) toolChain, true);
- addPage(settingsPage);
-
- envPage = new ToolChainEnvironmentPage(toolChain);
- addPage(envPage);
-
- setWindowTitle(Messages.NewClangToolChainWizard_Title);
- }
-
-}
+/******************************************************************************* + * Copyright (c) 2017 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 + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.cdt.build.gcc.ui.internal; + +import java.nio.file.Path; + +import org.eclipse.cdt.build.gcc.core.ClangToolChain; +import org.eclipse.cdt.build.gcc.core.GCCToolChain; +import org.eclipse.cdt.build.gcc.core.GCCUserToolChainProvider; +import org.eclipse.cdt.core.build.IToolChain; +import org.eclipse.cdt.core.build.IToolChainManager; +import org.eclipse.cdt.core.build.IUserToolChainProvider; +import org.eclipse.cdt.core.envvar.IEnvironmentVariable; +import org.eclipse.cdt.ui.build.ToolChainWizard; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; + +public class NewClangToolChainWizard extends ToolChainWizard { + + private GCCToolChainSettingsPage settingsPage; + private ToolChainEnvironmentPage envPage; + + @Override + public boolean performFinish() { + Path path = settingsPage.getPath(); + String os = settingsPage.getOS(); + String arch = settingsPage.getArch(); + IEnvironmentVariable[] envvars = envPage.getEnvVars(); + + new Job(Messages.NewGCCToolChainWizard_Add) { + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + IToolChainManager manager = Activator.getService(IToolChainManager.class); + IUserToolChainProvider provider = (IUserToolChainProvider) manager + .getProvider(GCCUserToolChainProvider.PROVIDER_ID); + + if (toolChain != null) { + provider.removeToolChain(toolChain); + } + + ClangToolChain gcc = new ClangToolChain(provider, path, arch, envvars); + gcc.setProperty(IToolChain.ATTR_OS, os); + provider.addToolChain(gcc); + return Status.OK_STATUS; + } catch (CoreException e) { + return e.getStatus(); + } + } + }.schedule(); + return true; + } + + @Override + public void addPages() { + super.addPages(); + + settingsPage = new GCCToolChainSettingsPage((GCCToolChain) toolChain, true); + addPage(settingsPage); + + envPage = new ToolChainEnvironmentPage(toolChain); + addPage(envPage); + + setWindowTitle(Messages.NewClangToolChainWizard_Title); + } + +} diff --git a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/messages.properties b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/messages.properties index 47aa4fe0d0d..986e1cb776a 100644 --- a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/messages.properties +++ b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/messages.properties @@ -1,42 +1,42 @@ -################################################################################
-# Copyright (c) 2017 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
-# http://www.eclipse.org/legal/epl-v10.html
-################################################################################
-GCCToolChainSettingsPage_Arch=CPU Architecture:
-GCCToolChainSettingsPage_Browse=Browse...
-GCCToolChainSettingsPage_ClangTitle=clang Toolchain Settings
-GCCToolChainSettingsPage_Compiler=Compiler:
-GCCToolChainSettingsPage_Description=Enter the path to the compiler and properties for the toolchain.
-GCCToolChainSettingsPage_OS=Operating System:
-GCCToolChainSettingsPage_Title=GCC ToolChain Settings
-NewClangToolChainWizard_Title=New clang Toolchain
-NewEnvVarDialog_Append=Append
-NewEnvVarDialog_Delimiter=Delimiter:
-NewEnvVarDialog_Edit=Edit Environment Variable
-NewEnvVarDialog_Name=Name:
-NewEnvVarDialog_New=New Environment Variable
-NewEnvVarDialog_Operation=Operation
-NewEnvVarDialog_Prepend=Prepend
-NewEnvVarDialog_Replace=Replace
-NewEnvVarDialog_Select=Select...
-NewEnvVarDialog_Unset=Unset
-NewEnvVarDialog_Value=Value:
-NewGCCToolChainWizard_Add=Add ToolChain
-NewGCCToolChainWizard_New=New GCC ToolChain
-ToolChainEnvironmentPage_Add=Add...
-ToolChainEnvironmentPage_Append=Append
-ToolChainEnvironmentPage_Description=Environment variables to set when using toolchain.
-ToolChainEnvironmentPage_Edit=Edit...
-ToolChainEnvironmentPage_Name=Name
-ToolChainEnvironmentPage_Operation=Operation
-ToolChainEnvironmentPage_Prepend=Prepend
-ToolChainEnvironmentPage_Remove=Remove
-ToolChainEnvironmentPage_RemoveMessage=Are you sure you would like to remove the selected environment variable(s)
-ToolChainEnvironmentPage_RemoveTitle=Remove
-ToolChainEnvironmentPage_Replace=Replace
-ToolChainEnvironmentPage_Title=Environment Variables
-ToolChainEnvironmentPage_Unset=Unset
-ToolChainEnvironmentPage_Value=Value
+################################################################################ +# Copyright (c) 2017 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 +# http://www.eclipse.org/legal/epl-v10.html +################################################################################ +GCCToolChainSettingsPage_Arch=CPU Architecture: +GCCToolChainSettingsPage_Browse=Browse... +GCCToolChainSettingsPage_ClangTitle=clang Toolchain Settings +GCCToolChainSettingsPage_Compiler=Compiler: +GCCToolChainSettingsPage_Description=Enter the path to the compiler and properties for the toolchain. +GCCToolChainSettingsPage_OS=Operating System: +GCCToolChainSettingsPage_Title=GCC ToolChain Settings +NewClangToolChainWizard_Title=New clang Toolchain +NewEnvVarDialog_Append=Append +NewEnvVarDialog_Delimiter=Delimiter: +NewEnvVarDialog_Edit=Edit Environment Variable +NewEnvVarDialog_Name=Name: +NewEnvVarDialog_New=New Environment Variable +NewEnvVarDialog_Operation=Operation +NewEnvVarDialog_Prepend=Prepend +NewEnvVarDialog_Replace=Replace +NewEnvVarDialog_Select=Select... +NewEnvVarDialog_Unset=Unset +NewEnvVarDialog_Value=Value: +NewGCCToolChainWizard_Add=Add ToolChain +NewGCCToolChainWizard_New=New GCC ToolChain +ToolChainEnvironmentPage_Add=Add... +ToolChainEnvironmentPage_Append=Append +ToolChainEnvironmentPage_Description=Environment variables to set when using toolchain. +ToolChainEnvironmentPage_Edit=Edit... +ToolChainEnvironmentPage_Name=Name +ToolChainEnvironmentPage_Operation=Operation +ToolChainEnvironmentPage_Prepend=Prepend +ToolChainEnvironmentPage_Remove=Remove +ToolChainEnvironmentPage_RemoveMessage=Are you sure you would like to remove the selected environment variable(s) +ToolChainEnvironmentPage_RemoveTitle=Remove +ToolChainEnvironmentPage_Replace=Replace +ToolChainEnvironmentPage_Title=Environment Variables +ToolChainEnvironmentPage_Unset=Unset +ToolChainEnvironmentPage_Value=Value |