Fixed broken symlink & added icudtl.dat download (#33)

Download the icudtl.dat /w the engine.
Everything is now in the same directory.

Author: zephylac

example/simpleDemo/engineDownloader.go

@@ -19,6 +19,16 @@ import (
 	"time"
 )
 
+func createSymLink(symlink string, file string) {
+
+	os.Remove(symlink)
+
+	err := os.Symlink(file, symlink)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
 // Unzip will decompress a zip archive, moving all files and folders
 // within the zip file (parameter 1) to an output directory (parameter 2).
 func unzip(src string, dest string) ([]string, error) {
@@ -128,7 +138,7 @@ func printDownloadPercent(done chan int64, path string, total int64) {
 				size = 1
 			}
 
-			var percent float64 = float64(size) / float64(total) * 100
+			var percent = float64(size) / float64(total) * 100
 
 			// We use `\033[2K\r` to avoid carriage return, it will print above previous.
 			fmt.Printf("\033[2K\r %.0f %% / 100 %%", percent)
@@ -154,6 +164,7 @@ func downloadFile(filepath string, url string) error {
 			os.Exit(0)
 		}
 	}
+
 	start := time.Now()
 
 	// Create the file
@@ -242,45 +253,85 @@ func main() {
 	}
 
 	var platform = "undefined"
-	var downloadURL = ""
+	var downloadShareLibraryURL = ""
+	var endMessage = ""
 
 	// Retrieve the OS and set variable to retrieve correct flutter embedder
 	switch runtime.GOOS {
 	case "darwin":
 		platform = "darwin-x64"
-		downloadURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/FlutterEmbedder.framework.zip", hashResponse.Items[0].Sha, platform)
+		downloadShareLibraryURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/FlutterEmbedder.framework.zip", hashResponse.Items[0].Sha, platform)
+		endMessage = "export CGO_LDFLAGS=\"-F${PWD} -Wl,-rpath,@executable_path\""
 
 	case "linux":
 		platform = "linux-x64"
-		downloadURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/%s-embedder", hashResponse.Items[0].Sha, platform, platform)
+		downloadShareLibraryURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/%s-embedder", hashResponse.Items[0].Sha, platform, platform)
+		endMessage = "export CGO_LDFLAGS=\"-L${PWD}\""
 
 	case "windows":
 		platform = "windows-x64"
-		downloadURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/%s-embedder", hashResponse.Items[0].Sha, platform, platform)
+		downloadShareLibraryURL = fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/%s-embedder", hashResponse.Items[0].Sha, platform, platform)
+		endMessage = "set CGO_LDFLAGS=-L%cd%"
 
 	default:
 		log.Fatal("OS not supported")
 	}
 
-	err3 := downloadFile(dir+"/.build/temp.zip", downloadURL)
+	downloadIcudtlURL := fmt.Sprintf("https://storage.googleapis.com/flutter_infra/flutter/%s/%s/artifacts.zip", hashResponse.Items[0].Sha, platform)
+
+	err3 := downloadFile(dir+"/.build/temp.zip", downloadShareLibraryURL)
 	if err3 != nil {
 		log.Fatal(err3)
 	} else {
 		fmt.Printf("Downloaded embedder for %s platform, matching version : %s\n", platform, hashResponse.Items[0].Sha)
 	}
 
+	err4 := downloadFile(dir+"/.build/artifacts.zip", downloadIcudtlURL)
+	if err != nil {
+		log.Fatal(err4)
+	} else {
+		fmt.Printf("Downloaded artifact for %s platform.\n", platform)
+	} 
+
 	_, err = unzip(".build/temp.zip", dir+"/.build/")
 	if err != nil {
 		log.Fatal(err)
 	}
 
+	_, err = unzip(".build/artifacts.zip", dir+"/.build/artifacts/")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	err = os.Rename(".build/artifacts/icudtl.dat", dir+"/icudtl.dat")
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	switch platform {
 	case "darwin-x64":
-		_, err = unzip(".build/FlutterEmbedder.framework.zip", dir+"/FlutterEmbedder.framework")
+		_, err = unzip(dir+"/.build/FlutterEmbedder.framework.zip", dir+"/.build/FlutterEmbedder.framework/")
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		os.RemoveAll(dir + "/FlutterEmbedder.framework")
+
+		err := os.Rename(dir+"/.build/FlutterEmbedder.framework/", dir+"/FlutterEmbedder.framework/")
 		if err != nil {
 			log.Fatal(err)
 		}
 
+		createSymLink(dir+"/FlutterEmbedder.framework/Versions/Current", dir+"/FlutterEmbedder.framework/Versions/A")
+
+		createSymLink(dir+"/FlutterEmbedder.framework/FlutterEmbedder", dir+"/FlutterEmbedder.framework/Versions/Current/FlutterEmbedder")
+
+		createSymLink(dir+"/FlutterEmbedder.framework/Headers", dir+"/FlutterEmbedder.framework/Versions/Current/Headers")
+
+		createSymLink(dir+"/FlutterEmbedder.framework/Modules", dir+"/FlutterEmbedder.framework/Versions/Current/Modules")
+
+		createSymLink(dir+"/FlutterEmbedder.framework/Resources", dir+"/FlutterEmbedder.framework/Versions/Current/Resources")
+
 	case "linux-x64":
 		err := os.Rename(".build/libflutter_engine.so", dir+"/libflutter_engine.so")
 		if err != nil {
@@ -296,6 +347,8 @@ func main() {
 	}
 	fmt.Printf("Unzipped files and moved them to correct repository.\n")
 
-	fmt.Printf("Done.\n")
+	fmt.Printf("\nTo let know the CGO compiler where to look for the share library, Please run:\n\t")
+	fmt.Printf("%s\n", endMessage)
 
+	fmt.Printf("Done.\n")
 }

example/simpleDemo/main.go

@@ -34,7 +34,7 @@ func main() {
 		 * Linux    : flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat
 		 * Windows  : flutter/bin/cache/artifacts/engine/windows-x64/icudtl.dat
 		 */
-		gutter.OptionICUDataPath("/opt/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"),
+		gutter.OptionICUDataPath(dir + "/icudtl.dat"),
 		gutter.OptionWindowInitializer(setIcon),
 		gutter.OptionWindowDimension(800, 600),
 		gutter.OptionWindowInitializer(setIcon),