Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix command line with relative paths #5878

Merged
merged 2 commits into from
Jan 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/processing/app/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ public Base(String[] args) throws Exception {
// Build
splash.splashText(tr("Verifying..."));

File sketchFile = new File(parser.getFilenames().get(0));
File sketchFile = BaseNoGui.absoluteFile(parser.getFilenames().get(0));
sketch = new Sketch(sketchFile);

outputFile = new Compiler(sketch).build(progress -> {}, false);
Expand Down
85 changes: 85 additions & 0 deletions app/test/processing/app/CommandLineTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
* This file is part of Arduino.
*
* Copyright 2017 Arduino LLC (http://www.arduino.cc/)
*
* Arduino is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*/

package processing.app;

import static org.junit.Assert.assertEquals;

import java.io.File;

import org.apache.commons.compress.utils.IOUtils;
import org.junit.Before;
import org.junit.Test;

import processing.app.helpers.OSUtils;

public class CommandLineTest {

File buildPath;
File arduinoPath;

@Before
public void findBuildPaths() throws Exception {
buildPath = new File(System.getProperty("user.dir"));
while (!new File(buildPath, "build").isDirectory()) {
buildPath = buildPath.getParentFile();
if (buildPath == null) {
throw new Exception("Could not determine build path");
}
}
System.out.println("found buildpath: " + buildPath);
if (OSUtils.isLinux()) {
arduinoPath = new File(buildPath, "build/linux/work/arduino");
}
if (OSUtils.isWindows()) {
arduinoPath = new File(buildPath, "build/windows/work/arduino");
}
if (OSUtils.isMacOS()) {
arduinoPath = new File(buildPath,
"build/macosx/work/Arduino.app/Contents/MacOS/Arduino");
}
if (!arduinoPath.canExecute()) {
throw new Exception("Could not determine arduino location");
}
System.out.println("found arduino: " + arduinoPath);
}

@Test
public void testCommandLineBuildWithRelativePath() throws Exception {
Runtime rt = Runtime.getRuntime();
File wd = new File(buildPath, "build/shared/examples/01.Basics/Blink/");
Process pr = rt
.exec(arduinoPath + " --board arduino:avr:uno --verify Blink.ino", null,
wd);
IOUtils.copy(pr.getInputStream(), System.out);
pr.waitFor();
assertEquals(0, pr.exitValue());
}

}
3 changes: 3 additions & 0 deletions build/shared/revisions.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ARDUINO 1.8.2

[ide]
* Fix command line: works again with relative paths (regression)

ARDUINO 1.8.1 - 2017.01.09

[ide]
Expand Down