Work in progress

environment.go

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package main
+
+import (
+	"os"
+	"strings"
+)
+
+type env []string
+
+func (e env) process() {
+	items := appendExpEnv(nil, e)
+
+	switch {
+	case len(items) == 0:
+		return
+	case len(items) == 1:
+		os.Unsetenv(items[0])
+	case len(items) == 2:
+		os.Setenv(items[0], items[1])
+	default:
+		os.Setenv(items[0], strings.Join(items[1:], ","))
+	}
+}

task.go

@@ -22,11 +22,9 @@
 
 package main
 
-import (
+import "fmt"
-	"fmt"
+
-	"os"
+type macro []string
-	"strings"
-)
 
 type taskDef struct {
 	Deps   []string
@@ -36,9 +34,6 @@ type taskDef struct {
 	Envs   []env
 }
 
-type macro []string
-type env []string
-
 func (t *taskDef) process(taskName, srcDir, dstDir string, conf *config, flags int) error {
 	handled, ok := conf.tasksHandled[taskName]
 	if ok && handled {
@@ -58,27 +53,18 @@ func (t *taskDef) process(taskName, srcDir, dstDir string, conf *config, flags i
 		}
 	}
 
-	for _, envItems := range t.Envs {
+	for _, currEnv := range t.Envs {
-		switch {
+		currEnv.process()
-		case len(envItems) == 0:
-			continue
-		case len(envItems) == 1:
-			os.Unsetenv(envItems[0])
-		case len(envItems) == 2:
-			os.Setenv(envItems[0], envItems[1])
-		default:
-			os.Setenv(envItems[0], strings.Join(envItems[1:], ","))
-		}
 	}
 
 	if flags&flagNoMacro == 0 {
-		for _, macroItems := range t.Macros {
+		for _, currMacro := range t.Macros {
-			if len(macroItems) == 0 {
+			if len(currMacro) == 0 {
 				continue
 			}
 
-			macroName := macroItems[0]
+			macroName := currMacro[0]
-			macroParams := macroItems[1:]
+			macroParams := currMacro[1:]
 
 			depMacro, ok := conf.Macros[macroName]
 			if !ok {