diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/feature.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/feature.xml deleted file mode 100644 index 36ad2713e4..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/feature.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - The C++ toolchain to build Athena programs on Linux. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or -* without modification, are permitted provided that the following -* conditions are met: -* Redistributions of source code must retain the above -* copyright notice, this list of conditions and the following -* disclaimer. Redistributions in binary form must reproduce the -* above copyright notice, this list of conditions and the following -* disclaimer in the documentation and/or other materials provided -* with the distribution. Neither the name of the FIRST nor the -* names of its contributors may be used to endorse or promote -* products derived from this software without specific prior -* written permission. -* -* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT -* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/pom.xml deleted file mode 100644 index 04be54179b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature - 0.2.0 - eclipse-feature - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/META-INF/MANIFEST.MF b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/META-INF/MANIFEST.MF deleted file mode 100644 index 43b19f1328..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Linux -Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.linux;singleton:=true -Bundle-Version: 0.2.0 -Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0", - edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/README b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/README deleted file mode 100644 index c7114baf95..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/README +++ /dev/null @@ -1,8 +0,0 @@ -Making This Plugin Work -======================= - -This plugin needs a very big zip that contains the toolchain. This is -currently hosted by Jenkins in the "Windows Toolchain Provider" -project. This can also be created from the download from mentor -embedded. The file should be resources/toolchain.zip and contains the -5 main directories. \ No newline at end of file diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/build.properties deleted file mode 100644 index cc05bf7aed..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - resources/,\ - plugin.xml -src.includes = resources/ diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/plugin.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/plugin.xml deleted file mode 100644 index 88ae2f4185..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/pom.xml deleted file mode 100644 index 9f935036b8..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux - 0.2.0 - eclipse-plugin - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy - prepare-package - - copy - - - - - edu.wpi.first.wpilib.plugins.cpp.toolchains - linux - 1.0.0 - zip - toolchain.zip - - - true - ${project.build.outputDirectory}/resources - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/resources/PLACEHOLDER b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/resources/PLACEHOLDER deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/Activator.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/Activator.java deleted file mode 100644 index b3a54f6c7a..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/Activator.java +++ /dev/null @@ -1,62 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.linux; - -import org.eclipse.ui.IStartup; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin implements IStartup { - - // The plug-in ID - public static final String PLUGIN_ID = "edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - private String getCurrentVersion() { - return "4.4.1-csery-gcc"; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - @Override - public void earlyStartup() { - new ToolchainInstaller(getCurrentVersion()).installIfNecessary(); - } - -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java deleted file mode 100644 index 24340b20c8..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java +++ /dev/null @@ -1,34 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.linux; - -import java.io.InputStream; - -import org.eclipse.jface.preference.IPreferenceStore; - -import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller; -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; -import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants; - -public class ToolchainInstaller extends AbstractInstaller { - - public ToolchainInstaller(String version) { - super(version, - WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_INSTALLED), WPILibCPPPlugin.getDefault().getToolchain()); - } - - @Override - protected String getFeatureName() { - return "toolchains"; - } - - @Override - protected void updateInstalledVersion(String version) { - WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED, - version); - } - - @Override - protected InputStream getInstallResourceStream() { - return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip"); - } - -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/feature.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/feature.xml deleted file mode 100644 index 17c65ff9e2..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/feature.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - The C++ toolchain to build Athena programs on a Mac. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or -* without modification, are permitted provided that the following -* conditions are met: -* Redistributions of source code must retain the above -* copyright notice, this list of conditions and the following -* disclaimer. Redistributions in binary form must reproduce the -* above copyright notice, this list of conditions and the following -* disclaimer in the documentation and/or other materials provided -* with the distribution. Neither the name of the FIRST nor the -* names of its contributors may be used to endorse or promote -* products derived from this software without specific prior -* written permission. -* -* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT -* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/pom.xml deleted file mode 100644 index fb70083482..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature - 0.2.0 - eclipse-feature - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/META-INF/MANIFEST.MF b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/META-INF/MANIFEST.MF deleted file mode 100644 index 4de558b5ac..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Windows -Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.mac;singleton:=true -Bundle-Version: 0.2.0 -Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0", - edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/README b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/README deleted file mode 100644 index c7114baf95..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/README +++ /dev/null @@ -1,8 +0,0 @@ -Making This Plugin Work -======================= - -This plugin needs a very big zip that contains the toolchain. This is -currently hosted by Jenkins in the "Windows Toolchain Provider" -project. This can also be created from the download from mentor -embedded. The file should be resources/toolchain.zip and contains the -5 main directories. \ No newline at end of file diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/build.properties deleted file mode 100644 index cc05bf7aed..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - resources/,\ - plugin.xml -src.includes = resources/ diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/plugin.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/plugin.xml deleted file mode 100644 index 1cf334019a..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/pom.xml deleted file mode 100644 index 2035aedd73..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac - 0.2.0 - eclipse-plugin - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy - prepare-package - - copy - - - - - edu.wpi.first.wpilib.plugins.cpp.toolchains - mac - 1.0.0 - zip - toolchain.zip - - - true - ${project.build.outputDirectory}/resources - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/resources/PLACEHOLDER b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/resources/PLACEHOLDER deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/Activator.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/Activator.java deleted file mode 100644 index 7ae4b3b816..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/Activator.java +++ /dev/null @@ -1,62 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.mac; - -import org.eclipse.ui.IStartup; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin implements IStartup { - - // The plug-in ID - public static final String PLUGIN_ID = "edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - private String getCurrentVersion() { - return "4.4.1-csery-gcc"; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - @Override - public void earlyStartup() { - new ToolchainInstaller(getCurrentVersion()).installIfNecessary(); - } - -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java deleted file mode 100644 index 80766e6a05..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java +++ /dev/null @@ -1,34 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.mac; - -import java.io.InputStream; - -import org.eclipse.jface.preference.IPreferenceStore; - -import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller; -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; -import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants; - -public class ToolchainInstaller extends AbstractInstaller { - - public ToolchainInstaller(String version) { - super(version, - WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_INSTALLED), - WPILibCPPPlugin.getDefault().getToolchain()); - } - - @Override - protected String getFeatureName() { - return "toolchains"; - } - - @Override - protected void updateInstalledVersion(String version) { - WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED, - version); - } - - @Override - protected InputStream getInstallResourceStream() { - return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip"); - } -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml deleted file mode 100644 index 442deaf4c3..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - The C++ toolchain to build Athena programs on Windows. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. - - - - * Copyright (c) 2013 FIRST and WPI -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or -* without modification, are permitted provided that the following -* conditions are met: -* Redistributions of source code must retain the above -* copyright notice, this list of conditions and the following -* disclaimer. Redistributions in binary form must reproduce the -* above copyright notice, this list of conditions and the following -* disclaimer in the documentation and/or other materials provided -* with the distribution. Neither the name of the FIRST nor the -* names of its contributors may be used to endorse or promote -* products derived from this software without specific prior -* written permission. -* -* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT -* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml deleted file mode 100644 index 6e98e250c6..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature - 0.3.0 - eclipse-feature - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF deleted file mode 100644 index a121c67513..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Windows -Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows;singleton:=true -Bundle-Version: 0.3.0 -Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0", - edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/README b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/README deleted file mode 100644 index c7114baf95..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/README +++ /dev/null @@ -1,8 +0,0 @@ -Making This Plugin Work -======================= - -This plugin needs a very big zip that contains the toolchain. This is -currently hosted by Jenkins in the "Windows Toolchain Provider" -project. This can also be created from the download from mentor -embedded. The file should be resources/toolchain.zip and contains the -5 main directories. \ No newline at end of file diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/build.properties deleted file mode 100644 index cc05bf7aed..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - resources/,\ - plugin.xml -src.includes = resources/ diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/plugin.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/plugin.xml deleted file mode 100644 index a56a247458..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml deleted file mode 100644 index 7fa5f4b062..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows - 0.3.0 - eclipse-plugin - - - edu.wpi.first.wpilib.plugins - edu.wpi.first.wpilib.plugins - 0.1.0.qualifier - .. - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy - prepare-package - - copy - - - - - edu.wpi.first.wpilib.plugins.cpp.toolchains - windows - 1.0.0 - zip - toolchain.zip - - - true - ${project.build.outputDirectory}/resources - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/resources/PLACEHOLDER b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/resources/PLACEHOLDER deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/Activator.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/Activator.java deleted file mode 100644 index 65d7f0d8da..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/Activator.java +++ /dev/null @@ -1,62 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.windows; - -import org.eclipse.ui.IStartup; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin implements IStartup { - - // The plug-in ID - public static final String PLUGIN_ID = "edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - private String getCurrentVersion() { - return "4.4.1-csery-gcc"; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - @Override - public void earlyStartup() { - new ToolchainInstaller(getCurrentVersion()).installIfNecessary(); - } - -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java deleted file mode 100644 index f63e3292d1..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java +++ /dev/null @@ -1,34 +0,0 @@ -package edu.wpi.first.wpilib.plugins.cpp.toolchains.windows; - -import java.io.InputStream; - -import org.eclipse.jface.preference.IPreferenceStore; - -import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller; -import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin; -import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants; - -public class ToolchainInstaller extends AbstractInstaller { - - public ToolchainInstaller(String version) { - super(version, - WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_INSTALLED), WPILibCPPPlugin.getDefault().getToolchain()); - } - - @Override - protected String getFeatureName() { - return "toolchains"; - } - - @Override - protected void updateInstalledVersion(String version) { - WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED, - version); - } - - @Override - protected InputStream getInstallResourceStream() { - return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip"); - } - -} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject index a645afb13b..34a8c1b7dc 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject @@ -1,44 +1,40 @@ - - + + - + - + - - - - + + + + + + + + + + + + + + + + + + + @@ -80,76 +120,26 @@ - - + + - - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + - + - - - - + - - - - - - - - - - - - - + + - - - - - - - - - - - - + + - - - - - - - - - - - - + + - - - - - - - - - - - - + + + - + - + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/WPILibCPPPlugin.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/WPILibCPPPlugin.java index f25d0e66da..1022c37584 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/WPILibCPPPlugin.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/WPILibCPPPlugin.java @@ -58,11 +58,6 @@ public class WPILibCPPPlugin extends AbstractUIPlugin implements IStartup { return plugin; } - public String getToolchain() { - return WPILibCore.getDefault().getWPILibBaseDir() - + File.separator + "toolchains" + File.separator + "current"; - } - public String getCurrentVersion() { try { Properties props = new AntPropertiesParser(WPILibCPPPlugin.class.getResourceAsStream("/resources/configuration.properties")).getProperties(); diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java index 6062e02ad7..bf9287888b 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java @@ -166,10 +166,7 @@ public class DeployLaunchShortcut implements ILaunchShortcut config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT, "2345"); config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, "gdbserver"); - config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, WPILibCPPPlugin.getDefault().getToolchain() + "/bin/arm-none-linux-gnueabi-gdb"); List solibs = new ArrayList<>(); - solibs.add(WPILibCPPPlugin.getDefault().getToolchain() + "/arm-non-linux-gnueabi/libc/lib"); - solibs.add(WPILibCPPPlugin.getDefault().getToolchain() + "/arm-non-linux-gnueabi/libc/usr/lib"); solibs.add(WPILibCPPPlugin.getDefault().getCPPDir() + "/lib"); config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, solibs); config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB, true); diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceConstants.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceConstants.java index d04dd6165d..3598e5e32d 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceConstants.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceConstants.java @@ -5,5 +5,4 @@ package edu.wpi.first.wpilib.plugins.cpp.preferences; */ public class PreferenceConstants { public static final String LIBRARY_INSTALLED = "libraryVersion_current"; - public static final String TOOLCHAIN_INSTALLED = "toolchainVersion_current"; } diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/newproject/WPIRobotCPPProjectCreator.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/newproject/WPIRobotCPPProjectCreator.java index a2dea99127..ba49801764 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/newproject/WPIRobotCPPProjectCreator.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/newproject/WPIRobotCPPProjectCreator.java @@ -44,7 +44,6 @@ public class WPIRobotCPPProjectCreator implements IProjectCreator { public Map getValues() { Map vals = new HashMap(); vals.put("$project", projectName); - vals.put("$toolchain", WPILibCPPPlugin.getDefault().getToolchain()); vals.put("$cpp-location", WPILibCPPPlugin.getDefault().getCPPDir()); vals.put("$world", worldName); return vals; @@ -74,9 +73,6 @@ public class WPIRobotCPPProjectCreator implements IProjectCreator { } catch (CoreException e) { WPILibCPPPlugin.logError("Error intializing FRC C++ project.", e); } - - //config.getToolChain().getOptionById("cdt.managedbuild.option.gnu.cross.prefix").setValue(prefix); - //config.getToolChain().getOptionById("cdt.managedbuild.option.gnu.cross.path").setValue(path); } @Override diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml index 1f54c278c1..f6498c4bba 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml @@ -6,19 +6,9 @@ - - - - - - - - - Core WPILib Robot Development Tools. - diff --git a/eclipse-plugins/pom.xml b/eclipse-plugins/pom.xml index e267f6f5d2..3cc55eca6e 100644 --- a/eclipse-plugins/pom.xml +++ b/eclipse-plugins/pom.xml @@ -12,12 +12,6 @@ edu.wpi.first.wpilib.plugins.core.feature edu.wpi.first.wpilib.plugins.cpp edu.wpi.first.wpilib.plugins.cpp.feature - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature edu.wpi.first.wpilib.plugins.java edu.wpi.first.wpilib.plugins.java.feature edu.wpi.first.wpilib.plugins.updatesite