remove outdated assembleCompilerCommand function

Author: facchinm

programmer.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/facchinm/go-serial"
-	"github.com/kardianos/osext"
 	"github.com/mattn/go-shellwords"
 	"io"
 	"mime/multipart"
@@ -389,187 +388,3 @@ func touch_port_1200bps(portname string, wait_for_upload_port bool) (string, err
 	}
 	return portname, nil
 }
-
-func assembleCompilerCommand(boardname string, portname string, filePath string) (bool, string, []string) {
-
-	// get executable (self)path and use it as base for all other paths
-	execPath, _ := osext.Executable()
-
-	boardFields := strings.Split(boardname, ":")
-	if len(boardFields) != 3 {
-		mapD := map[string]string{"Err": "Board need to be specified in core:architecture:name format"}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		return false, "", nil
-	}
-	tempPath := (filepath.Dir(execPath) + "/" + boardFields[0] + "/hardware/" + boardFields[1] + "/boards.txt")
-	file, err := os.Open(tempPath)
-	if err != nil {
-		mapD := map[string]string{"Err": "Could not find board: " + boardname}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		log.Println("Error:", err)
-		return false, "", nil
-	}
-	scanner := bufio.NewScanner(file)
-
-	boardOptions := make(map[string]string)
-	uploadOptions := make(map[string]string)
-
-	for scanner.Scan() {
-		// map everything matching with boardname
-		if strings.Contains(scanner.Text(), boardFields[2]) {
-			arr := strings.Split(scanner.Text(), "=")
-			arr[0] = strings.Replace(arr[0], boardFields[2]+".", "", 1)
-			boardOptions[arr[0]] = arr[1]
-		}
-	}
-
-	if len(boardOptions) == 0 {
-		mapD := map[string]string{"Err": "Board " + boardFields[2] + " is not part of " + boardFields[0] + ":" + boardFields[1]}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		return false, "", nil
-	}
-
-	// filepath need special care; the project_name var is the filename minus its extension (hex or bin)
-	// if we are going to modify standard IDE files we also could pass ALL filename
-	filePath = strings.Trim(filePath, "\n")
-	boardOptions["build.path"] = filepath.Dir(filePath)
-	boardOptions["build.project_name"] = strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filepath.Base(filePath)))
-
-	file.Close()
-
-	// get infos about the programmer
-	tempPath = (filepath.Dir(execPath) + "/" + boardFields[0] + "/hardware/" + boardFields[1] + "/platform.txt")
-	file, err = os.Open(tempPath)
-	if err != nil {
-		mapD := map[string]string{"Err": "Could not find board: " + boardname}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		log.Println("Error:", err)
-		return false, "", nil
-	}
-	scanner = bufio.NewScanner(file)
-
-	tool := boardOptions["upload.tool"]
-
-	for scanner.Scan() {
-		// map everything matching with upload
-		if strings.Contains(scanner.Text(), tool) {
-			arr := strings.Split(scanner.Text(), "=")
-			uploadOptions[arr[0]] = arr[1]
-			arr[0] = strings.Replace(arr[0], "tools."+tool+".", "", 1)
-			boardOptions[arr[0]] = arr[1]
-			// we have a "=" in command line
-			if len(arr) > 2 {
-				boardOptions[arr[0]] = arr[1] + "=" + arr[2]
-			}
-		}
-	}
-	file.Close()
-
-	// multiple verisons of the same programmer can be handled if "version" is specified
-	version := uploadOptions["runtime.tools."+tool+".version"]
-	path := (filepath.Dir(execPath) + "/" + boardFields[0] + "/tools/" + tool + "/" + version)
-	if err != nil {
-		mapD := map[string]string{"Err": "Could not find board: " + boardname}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		log.Println("Error:", err)
-		return false, "", nil
-	}
-
-	boardOptions["runtime.tools."+tool+".path"] = path
-
-	cmdline := boardOptions["upload.pattern"]
-	// remove cmd.path as it is handled differently
-	cmdline = strings.Replace(cmdline, "\"{cmd.path}\"", " ", 1)
-	cmdline = strings.Replace(cmdline, "\"{path}/{cmd}\"", " ", 1)
-	cmdline = strings.Replace(cmdline, "\"", "", -1)
-
-	initialPortName := portname
-
-	// some boards (eg. Leonardo, Yun) need a special procedure to enter bootloader
-	if boardOptions["upload.use_1200bps_touch"] == "true" {
-		// triggers bootloader mode
-		// the portname could change in this occasion (expecially on Windows) so change portname
-		// with the port which will reappear
-		log.Println("Restarting in bootloader mode")
-
-		mode := &serial.Mode{
-			BaudRate: 1200,
-			Vmin:     1,
-			Vtimeout: 0,
-		}
-		port, err := serial.OpenPort(portname, mode)
-		if err != nil {
-			log.Println(err)
-			return false, "", nil
-		}
-		//port.SetDTR(false)
-		port.Close()
-		time.Sleep(time.Second / 2.0)
-
-		timeout := false
-		go func() {
-			time.Sleep(2 * time.Second)
-			timeout = true
-		}()
-
-		// time.Sleep(time.Second / 4)
-		// wait for port to reappear
-		if boardOptions["upload.wait_for_upload_port"] == "true" {
-			after_reset_ports, _ := serial.GetPortsList()
-			log.Println(after_reset_ports)
-			var ports []string
-			for {
-				ports, _ = serial.GetPortsList()
-				log.Println(ports)
-				time.Sleep(time.Millisecond * 200)
-				portname = findNewPortName(ports, after_reset_ports)
-				if portname != "" {
-					break
-				}
-				if timeout {
-					break
-				}
-			}
-		}
-	}
-
-	if portname == "" {
-		portname = initialPortName
-	}
-
-	boardOptions["serial.port"] = portname
-	boardOptions["serial.port.file"] = filepath.Base(portname)
-
-	// split the commandline in substrings and recursively replace mapped strings
-	cmdlineSlice := strings.Split(cmdline, " ")
-	var winded = true
-	for index, _ := range cmdlineSlice {
-		winded = true
-		for winded != false {
-			cmdlineSlice[index], winded = formatCmdline(cmdlineSlice[index], boardOptions)
-		}
-	}
-
-	tool = (filepath.Dir(execPath) + "/" + boardFields[0] + "/tools/" + tool + "/bin/" + tool)
-	// the file doesn't exist, we are on windows
-	if _, err := os.Stat(tool); err != nil {
-		tool = tool + ".exe"
-		// convert all "/" to "\"
-		tool = strings.Replace(tool, "/", "\\", -1)
-	}
-
-	// remove blanks from cmdlineSlice
-	var cmdlineSliceOut []string
-	for _, element := range cmdlineSlice {
-		if element != "" {
-			cmdlineSliceOut = append(cmdlineSliceOut, element)
-		}
-	}
-
-	return (tool != ""), tool, cmdlineSliceOut
-}