import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
public class EnvVarSupplier implements IConfigurationEnvironmentVariableSupplier {
+ private EnvVar arduinoRoot;
private EnvVar arduinoHome;
+ private EnvVar arduinoLibs;
private EnvVar path;
-
+
private static final String OUTPUT_DIR = "OUTPUT_DIR"; //$NON-NLS-1$
private static final String BOARD = "BOARD"; //$NON-NLS-1$
- private static final String CYGWIN = "CYGWIN"; //$NON-NLS-1$
private static final class EnvVar implements IBuildEnvironmentVariable {
String name;
}
public EnvVarSupplier() {
- File arduinoPath = ArduinoHome.get();
-
- if (arduinoPath.isDirectory()) {
- arduinoHome = new EnvVar();
- arduinoHome.name = "ARDUINO_HOME"; //$NON-NLS-1$
- arduinoHome.value = arduinoPath.getAbsolutePath();
-
- File avrPath = new File(arduinoPath, "hardware/tools/avr/bin"); //$NON-NLS-1$
- String pathStr = avrPath.getAbsolutePath();
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- // Windows needs the arduino path too to pick up the cygwin dlls
- pathStr += File.pathSeparator + arduinoPath.getAbsolutePath();
- }
-
- path = new EnvVar();
- path.name = "PATH"; //$NON-NLS-1$
- path.value = pathStr;
- path.operation = IBuildEnvironmentVariable.ENVVAR_PREPEND;
- path.delimiter = File.pathSeparator;
- }
+ arduinoRoot = new EnvVar();
+ arduinoRoot.name = "ARDUINO_ROOT"; //$NON-NLS-1$
+ arduinoRoot.value = ArduinoHome.getRootfileDir().getAbsolutePath();
+
+ arduinoHome = new EnvVar();
+ arduinoHome.name = "ARDUINO_HOME"; //$NON-NLS-1$
+ arduinoHome.value = ArduinoHome.getArduinoDir().getAbsolutePath();
+
+ arduinoLibs = new EnvVar();
+ arduinoLibs.name = "ARDUINO_LIBS"; //$NON-NLS-1$
+ arduinoLibs.value = ArduinoHome.getArduinoLibsDir().getAbsolutePath();
+
+ File avrPath = new File(ArduinoHome.getArduinoDir(), "hardware/tools/avr/bin"); //$NON-NLS-1$
+ String pathStr = avrPath.getAbsolutePath();
+
+ path = new EnvVar();
+ path.name = "PATH"; //$NON-NLS-1$
+ path.value = pathStr;
+ path.operation = IBuildEnvironmentVariable.ENVVAR_PREPEND;
+ path.delimiter = File.pathSeparator;
}
private IBuildEnvironmentVariable getOutputDir(IConfiguration configuration) {
Board board = ArduinoProjectGenerator.getBoard(configuration);
if (board == null)
return null;
-
+
EnvVar boardVar = new EnvVar();
boardVar.name = BOARD;
boardVar.value = board.getId();
}
}
- private IBuildEnvironmentVariable getCygwin() {
- EnvVar var = new EnvVar();
- var.name = CYGWIN;
- var.value = "nodosfilewarning"; //$NON-NLS-1$
- return var;
- }
-
@Override
public IBuildEnvironmentVariable getVariable(String variableName,
IConfiguration configuration, IEnvironmentVariableProvider provider) {
- if (path != null && variableName.equals(path.name)) {
+ if (variableName.equals(path.name)) {
return path;
- } else if (arduinoHome != null && variableName.equals(arduinoHome.name)) {
+ } else if (variableName.equals(arduinoRoot.name)) {
+ return arduinoRoot;
+ } else if (variableName.equals(arduinoHome.name)) {
return arduinoHome;
+ } else if (variableName.equals(arduinoLibs.name)) {
+ return arduinoLibs;
} else if (variableName.equals(OUTPUT_DIR)) {
return getOutputDir(configuration);
} else if (variableName.equals(BOARD)) {
return getBoard(configuration);
- } else if (variableName.equals(CYGWIN)) {
- return getCygwin();
}
return null;
}
IConfiguration configuration, IEnvironmentVariableProvider provider) {
List<IBuildEnvironmentVariable> vars = new ArrayList<>();
- if (path != null)
- vars.add(path);
-
- if (arduinoHome != null)
- vars.add(arduinoHome);
+ vars.add(path);
+ vars.add(arduinoRoot);
+ vars.add(arduinoHome);
+ vars.add(arduinoLibs);
if (configuration != null) {
vars.add(getOutputDir(configuration));
vars.add(boardVar);
}
- if (Platform.getOS().equals(Platform.OS_WIN32))
- vars.add(getCygwin());
-
return vars.toArray(new IBuildEnvironmentVariable[vars.size()]);
}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2015 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
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.arduino.ui.internal;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class ArduinoPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+ public ArduinoPreferencePage() {
+ super(GRID);
+ setDescription("Arduino C++ Preferences");
+ setPreferenceStore(Activator.getDefault().getPreferenceStore());
+ }
+
+ @Override
+ protected void createFieldEditors() {
+
+ }
+
+ @Override
+ public void init(IWorkbench workbench) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dispose() {
+ // TODO Auto-generated method stub
+ super.dispose();
+ }
+
+}
projects / sdk / ide / org-eclipse-cdt.git / commitdiff