cmd/gomobile: reset readonly bits of downloaded files in Windows

hyangah · hyangah · commit f9f0ffafe3c2 · 2015-08-24T13:08:21.000Z
os.Rename in init fails in Windows for various reasons. One of them is the temporary files extracted from NDK, OpenAL archives. For some reason, some of them have read-only properties. (golang/go#12212) > gomobile init gomobile: rename C:\Users\foo\pkg\gomobile\work-427911983\openal\include\AL C:\Users\foo\pkg\gomobile\android-ndk-r10e\arm\sysroot\usr\include\AL: Access is denied. We reset the read-only bits of all the extracted files. Change-Id: Ib958cbedf1b7527ecb5b9318f23fe9437dc7c241 Reviewed-on: https://go-review.googlesource.com/12970 Reviewed-by: David Crawshaw <crawshaw@golang.org>
diff --git a/cmd/gomobile/init.go b/cmd/gomobile/init.go
@@ -223,7 +223,7 @@ func move(dst, src string, names ...string) error {
 		}
 		if goos == "windows" {
 			// os.Rename fails if dstf already exists.
-			os.Remove(dstf)
+			removeAll(dstf)
 		}
 		if err := os.Rename(srcf, dstf); err != nil {
 			return err
@@ -291,6 +291,9 @@ func fetchOpenAL() error {
 	if err := extract("openal", archive); err != nil {
 		return err
 	}
+	if goos == "windows" {
+		resetReadOnlyFlagAll(filepath.Join(tmpdir, "openal"))
+	}
 	dst := filepath.Join(ndkccpath, "arm", "sysroot", "usr", "include")
 	src := filepath.Join(tmpdir, "openal", "include")
 	if err := move(dst, src, "AL"); err != nil {
@@ -366,6 +369,9 @@ func fetchNDK() error {
 			return err
 		}
 	}
+	if goos == "windows" {
+		resetReadOnlyFlagAll(filepath.Join(tmpdir, "android-"+ndkVersion))
+	}
 
 	dst := filepath.Join(ndkccpath, "arm")
 	dstSysroot := filepath.Join(dst, "sysroot/usr")

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ func move(dst, src string, names ...string) error {`
`223`	`223`	`}`
`224`	`224`	`if goos == "windows" {`
`225`	`225`	`// os.Rename fails if dstf already exists.`
`226`		`- os.Remove(dstf)`
	`226`	`+ removeAll(dstf)`
`227`	`227`	`}`
`228`	`228`	`if err := os.Rename(srcf, dstf); err != nil {`
`229`	`229`	`return err`
`@@ -291,6 +291,9 @@ func fetchOpenAL() error {`
`291`	`291`	`if err := extract("openal", archive); err != nil {`
`292`	`292`	`return err`
`293`	`293`	`}`
	`294`	`+ if goos == "windows" {`
	`295`	`+ resetReadOnlyFlagAll(filepath.Join(tmpdir, "openal"))`
	`296`	`+ }`
`294`	`297`	`dst := filepath.Join(ndkccpath, "arm", "sysroot", "usr", "include")`
`295`	`298`	`src := filepath.Join(tmpdir, "openal", "include")`
`296`	`299`	`if err := move(dst, src, "AL"); err != nil {`
`@@ -366,6 +369,9 @@ func fetchNDK() error {`
`366`	`369`	`return err`
`367`	`370`	`}`
`368`	`371`	`}`
	`372`	`+ if goos == "windows" {`
	`373`	`+ resetReadOnlyFlagAll(filepath.Join(tmpdir, "android-"+ndkVersion))`
	`374`	`+ }`
`369`	`375`
`370`	`376`	`dst := filepath.Join(ndkccpath, "arm")`
`371`	`377`	`dstSysroot := filepath.Join(dst, "sysroot/usr")`