arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx

Browse Source
This commit is contained in:
Federico Fissore
2015-01-30 16:42:04 +01:00
parent d61568a8be
commit d460982623
5 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -7,13 +7,7 @@ import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -170,19 +164,13 @@ public class BaseNoGui {
}
static public File getContentFile(String name) {
String path = System.getProperty("user.dir");
File path = new File(System.getProperty("user.dir"));
// Get a path to somewhere inside the .app folder
if (OSUtils.isMacOS()) {
// <key>javaroot</key>
// <string>$JAVAROOT</string>
String javaroot = System.getProperty("javaroot");
if (javaroot != null) {
path = javaroot;
}
path = new File(BaseNoGui.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParentFile();
}
File working = new File(path);
return new File(working, name);
return new File(path, name);
}
static public TargetPlatform getCurrentTargetPlatformFromPackage(String pack) {