untied from ide

Author: apla

common.js

@@ -285,9 +285,14 @@ function createDictOld (arduino, platformId, boardId, boardVariant, options, cur
 	// if we have runtimeFolder, it is accessible via arduino.acceptableRuntimes[0]
 	var runtimeFolder = arduino.acceptableRuntimes[0];
 
-	pathToVar (conf, 'runtime.ide.path', runtimeFolder);
-	// TODO: get version from mac os x bundle or from windows revisions.txt
-	pathToVar (conf, 'runtime.ide.version', arduino.acceptableVersions[0].replace (/\./g, ""));
+	if (runtimeFolder) {
+		pathToVar (conf, 'runtime.ide.path', runtimeFolder);
+		// TODO: get version from mac os x bundle or from windows revisions.txt
+		pathToVar (conf, 'runtime.ide.version', arduino.acceptableVersions[0].replace (/\./g, ""));
+	} else {
+		// from 1.6.0 arduino has other version numeration
+		pathToVar (conf, 'runtime.ide.version', "160");
+	}
 	pathToVar (conf, 'software', "ARDUINO");
 
 	//	Preferences.set("runtime.platform.path", platformFolder.getAbsolutePath());

data.js

@@ -297,16 +297,22 @@ Arduino.prototype.parseConfig = function (cb, section, err, data) {
 	}
 
 	var keyValue = {};
+	var haveRuntimeIde = false;
 
 	data.toString ().split (/[\r\n]+/).forEach (function (line) {
 		if (line.indexOf("#") === 0) return;
 		if (line.length === 0) return;
 		// console.log (line);
 		var ref = line.substring (0, line.indexOf ('='));
 		var value = line.substring (line.indexOf ('=')+1);
+		haveRuntimeIde = haveRuntimeIde || value.match (/\{runtime\.ide\.path\}/);
 		keyValue[ref] = value;
-
 	});
+
+	Object.defineProperty (keyValue, "haveRuntimeIde", {
+		enumerable: false,
+		value: haveRuntimeIde ? true : false
+	})
 //	console.log (Object.keys (boards));
 	cb && cb (null, section, keyValue);
 
@@ -534,6 +540,7 @@ Arduino.prototype.hardwareFound = function (instanceFolder, done, err, files) {
 		var type = localFile.replace ('.txt', '');
 
 		var keyValue = this.parseConfig (fileMeta.contents);
+		var requireArduino = keyValue.haveRuntimeIde;
 
 		var data;
 		if (type === "boards") {
@@ -546,7 +553,7 @@ Arduino.prototype.hardwareFound = function (instanceFolder, done, err, files) {
 		}
 		this.hardware[platformId][type]  = data;
 
-		this.folders[instanceFolder][type][vendor+":"+arch] = true;
+		this.folders[instanceFolder][type][vendor+":"+arch] = requireArduino ? 'require "runtime.ide.path"' : "autonomous";
 
 		var currentHw = this.hardware[platformId][type];
 

hardware/energia/msp430/platform.txt

@@ -9,7 +9,7 @@ name=Launchpad MSP430 boards
 version=1.5.6
 
 # NRG compile variables
-# --------------------- 
+# ---------------------
 
 # Default "compiler.path" is correct, change only if you want to overidde the initial value
 compiler.path={runtime.hardware.path}/tools/msp430/bin/
@@ -67,17 +67,17 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 # msp430 Uploader/Programmers tools
 # ------------------------------
 
-tools.msp430-gdb.cmd.path={runtime.hardware.path}/tools/msp430/bin/msp430-gdb
-tools.msp430-gdb.upload.params.verbose=
-tools.msp430-gdb.upload.params.quiet=
+#tools.msp430-gdb.cmd.path={runtime.hardware.path}/tools/msp430/bin/msp430-gdb
+#tools.msp430-gdb.upload.params.verbose=
+#tools.msp430-gdb.upload.params.quiet=
 #tools.msp430-gdb.upload.pattern={cmd.path} -b 38400 -ex 'target remote {serial.port}' -ex 'set debug remote 0' {build.path}/{build.project_name}.elf -ex 'erase' -ex 'load' -ex 'quit'
-tools.msp430-gdb.upload.pattern=java -cp {runtime.ide.path}/app/GdbLoader/ GdbLoader {cmd.path} {build.path}/{build.project_name}.elf {serial.port}
+#tools.msp430-gdb.upload.pattern=java -cp {runtime.ide.path}/app/GdbLoader/ GdbLoader {cmd.path} {build.path}/{build.project_name}.elf {serial.port}
 
 tools.rf2500.cmd.path={runtime.hardware.path}/tools/msp430/mspdebug/mspdebug
 tools.rf2500.upload.pattern={cmd.path} rf2500 'prog {build.path}/{build.project_name}.hex'
 
-tools.ti-bsl.cmd.path={runtime.ide.path}/app/BsLoader/build/classes/bsloader/ BsLoader
-tools.ti-bsl.upload.pattern=java -cp {cmd.path} "{build.path}/{build.project_name}.hex" "{serial.port}" "--verbose-off"
+#tools.ti-bsl.cmd.path={runtime.ide.path}/app/BsLoader/build/classes/bsloader/ BsLoader
+#tools.ti-bsl.upload.pattern=java -cp {cmd.path} "{build.path}/{build.project_name}.hex" "{serial.port}" "--verbose-off"
 
 # USB Default Flags
 # Default blank usb manufacturer will be filled it at compile time

hardware/intel/edison/platform.txt

@@ -94,5 +94,5 @@ tools.izmirdl.erase.pattern="{cmd.path}" "-C{config.path}" {erase.verbose} -p{bu
 
 tools.izmirdl.bootloader.params.verbose=-v -v -v -v
 tools.izmirdl.bootloader.params.quiet=-q -q
-tools.izmirdl.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/x86/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
+tools.izmirdl.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.hardware.path}/x86/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
 

hardware/intel/x86/platform.txt

@@ -60,6 +60,7 @@ recipe.size.regex=Total\s+([0-9]+).*
 # -------------------
 tools.izmirdl.cmd.path.macosx={runtime.platform.path}/tools/izmir/clupload_osx.sh
 tools.izmirdl.cmd.path.linux={runtime.platform.path}/tools/izmir/clupload_linux.sh
+tools.izmirdl.cmd.path.linux64={runtime.platform.path}/tools/izmir/clupload_linux.sh
 tools.izmirdl.cmd.path.windows={runtime.platform.path}/tools/izmir/clupload_win.sh
 #tools.izmirdl.cmd.path={runtime.ide.path}/hardware/tools/x86/bin/lsz
 #tools.izmirdl.cmd.dir={runtime.ide.path}/hardware/tools/x86/bin/
@@ -94,5 +95,5 @@ tools.izmirdl.erase.pattern="{cmd.path}" "-C{config.path}" {erase.verbose} -p{bu
 
 tools.izmirdl.bootloader.params.verbose=-v -v -v -v
 tools.izmirdl.bootloader.params.quiet=-q -q
-tools.izmirdl.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/x86/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
+tools.izmirdl.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.hardware.path}/x86/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m