Switched systray to use 2goarray

getlantern · Feb 18, 2015 · b7fde38 · b7fde38
1 parent b395364
commit b7fde38
Show file tree

Hide file tree

Showing 4 changed files with 867 additions and 215 deletions.
diff --git a/src/github.com/getlantern/systray/embeddll.bash b/src/github.com/getlantern/systray/embeddll.bash
@@ -6,5 +6,11 @@
 #
 ###############################################################################
 
-go get github.com/jteeuwen/go-bindata/go-bindata
-go-bindata -nomemcopy -nocompress -pkg systray -prefix dll -o systraydll_windows.go dll
+function die() {
+  echo $*
+  exit 1
+}
+which 2goarray > /dev/null || go get github.com/cratonica/2goarray/...
+which 2goarray > /dev/null || die "Please install 2goarray manually, then try again"
+
+2goarray systraydll systray < systray.dll > systraydll_windows.go
diff --git a/...ub.com/getlantern/systray/dll/systray.dll → ...github.com/getlantern/systray/systray.dll b/...ub.com/getlantern/systray/dll/systray.dll → ...github.com/getlantern/systray/systray.dll
diff --git a/src/github.com/getlantern/systray/systray_windows.go b/src/github.com/getlantern/systray/systray_windows.go
@@ -25,17 +25,12 @@ var (
 
 func init() {
 	// Write DLL to file
-	b, err := Asset("systray.dll")
-	if err != nil {
-		panic(fmt.Errorf("Unable to read systray.dll: %v", err))
-	}
-
-	err = os.MkdirAll(dllDir, 0755)
+	err := os.MkdirAll(dllDir, 0755)
 	if err != nil {
 		panic(fmt.Errorf("Unable to create directory %v to hold systray.dll: %v", dllDir, err))
 	}
 
-	err = ioutil.WriteFile(dllFile, b, 0644)
+	err = ioutil.WriteFile(dllFile, systraydll, 0644)
 	if err != nil {
 		panic(fmt.Errorf("Unable to save systray.dll to %v: %v", dllFile, err))
 	}

diff --git a/src/github.com/getlantern/systray/systraydll_windows.go b/src/github.com/getlantern/systray/systraydll_windows.go