Dependency updates and slight progress in fixing Clover building

cmd/root.go

@@ -207,21 +207,18 @@ var rootCmd = &cobra.Command{
 		}
 
 		if !UpdateOnly && !InstallerOnly {
-			// Override HOME environment variable (use chroot-like logic for the build process)
-			log.Debug("Overriding HOME..")
+			// Override environment variable
+			log.Debug("Setting up environment variables..")
 			os.Setenv("HOME", util.GetClobberPath())
-
-			// Override TOOLCHAIR_DIR environment variable
-			log.Debug("Overriding TOOLCHAIN_DIR..")
 			os.Setenv("TOOLCHAIN_DIR", util.GetSourcePath()+"/opt/local")
-
-			// Override TOOLCHAIN environment variable
-			// log.Debug("Overriding TOOLCHAIN..")
-			// os.Setenv("TOOLCHAIN", "XCODE8")
-
-			// Override TOOLCHAIN environment variable
-			// log.Debug("Overriding EDK_TOOLS_PATH..")
-			// os.Setenv("EDK_TOOLS_PATH", util.GetCloverPath()+"/BaseTools/BuildEnv")
+			os.Setenv("DIR_MAIN", util.GetSourcePath())
+			os.Setenv("DIR_TOOLS", os.Getenv("DIR_MAIN")+"/tools")
+			os.Setenv("DIR_DOWNLOADS", os.Getenv("DIR_TOOLS")+"/download")
+			os.Setenv("DIR_LOGS", os.Getenv("DIR_TOOLS")+"/logs")
+			os.Setenv("PREFIX", os.Getenv("TOOLCHAIN_DIR"))
+			os.Setenv("EDK_TOOLS_PATH", util.GetCloverPath()+"/BaseTools")
+			os.Setenv("PATH", os.Getenv("PATH")+":"+util.GetCloverPath()+"/BaseTools/BinWrappers/PosixLike")
+			os.Setenv("GETTEXT_PREFIX", os.Getenv("TOOLCHAIN_DIR"))
 
 			// Build base tools
 			log.Debug("Building base tools..")
@@ -237,12 +234,12 @@ var rootCmd = &cobra.Command{
 			Spinner.Prefix = formatSpinnerText("Building base tools", true)
 
 			// Setup EDK
-			log.Debug("Setting up EDK..")
-			Spinner.Prefix = formatSpinnerText("Setting up EDK", false)
-			if err := runCommand("cd " + util.GetCloverPath() + " && " + "source edksetup.sh"); err != nil {
-				log.Fatal("Error: Failure detected, aborting")
-			}
-			Spinner.Prefix = formatSpinnerText("Setting up EDK", true)
+			// log.Debug("Setting up EDK..")
+			// Spinner.Prefix = formatSpinnerText("Setting up EDK", false)
+			// if err := runCommand("cd " + util.GetCloverPath() + " && " + "source edksetup.sh" + " && " + "printenv"); err != nil {
+			// 	log.Fatal("Error: Failure detected, aborting")
+			// }
+			// Spinner.Prefix = formatSpinnerText("Setting up EDK", true)
 
 			// Build gettext, mtoc and nasm (if necessary)
 			if _, err := os.Stat(util.GetSourcePath() + "/opt/local/bin/gettext"); os.IsNotExist(err) {

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/otiai10/copy v1.0.1
+	github.com/otiai10/copy v1.0.1 // indirect
 	github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
 	github.com/pierrec/lz4 v2.2.6+incompatible // indirect
 	github.com/rhysd/go-github-selfupdate v1.1.0
@@ -41,7 +41,7 @@ require (
 	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
 	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
-	golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c // indirect
+	golang.org/x/tools v0.0.0-20191015211201-9c6d90b5a7d0 // indirect
 	google.golang.org/appengine v1.6.2 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0

go.sum

@@ -233,6 +233,8 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c h1:PCDsQ/i3XTQEuyIMOOa9pgQZsQi3ETM+3at2Z02nBo4=
 golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191015211201-9c6d90b5a7d0 h1:KPtnBRFVP7cXAlZnb0bT/gohhmrkpXkk8DP9eZ+Aius=
+golang.org/x/tools v0.0.0-20191015211201-9c6d90b5a7d0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

vendor/modules.txt

@@ -69,8 +69,6 @@ github.com/mitchellh/go-homedir
 github.com/nsf/termbox-go
 # github.com/nwaples/rardecode v1.0.0
 github.com/nwaples/rardecode
-# github.com/otiai10/copy v1.0.1
-github.com/otiai10/copy
 # github.com/pierrec/lz4 v2.2.6+incompatible
 github.com/pierrec/lz4
 github.com/pierrec/lz4/internal/xxh32