lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 21:25:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix msys2 + android docker image

Browse source
This commit is contained in:
therecipe 2017-01-03 20:03:42 +01:00
parent 45c02e2932
commit c69117432a
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/qtsetup/check.go
View file

@ -60,6 +60,7 @@ func check(buildTarget string) {
case "windows":
{
utils.Log.Infoln("MSYSTEM:", os.Getenv("MSYSTEM"))
utils.Log.Infoln("QT_MSYS2:", os.Getenv("QT_MSYS2"))
utils.Log.Infoln("QT_MSYS2_DIR:", os.Getenv("QT_MSYS2_DIR"))
utils.Log.Infoln("IsMsys2QtDir:", utils.IsMsys2QtDir())

2
cmd/qtsetup/prep.go
View file

@ -14,7 +14,7 @@ func prep() {
utils.Log.Info("running setup/prep")
if utils.UseMsys2() {
utils.RemoveAll(filepath.Join(utils.QT_MSYS2_DIR(), "usr", "bin", "go.exe"))
utils.RemoveAll(filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin", "go.exe"))
utils.RunCmdOptional(exec.Command("cmd", "/C", "mklink", "/H", filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin", "go.exe"), filepath.Join(runtime.GOROOT(), "bin", "go.exe")), fmt.Sprintf("create go symlink in your QT_MSYS2_DIR/usr/bin (%v)", filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin")))
}

2
internal/docker/android/Dockerfile
View file

@ -2,7 +2,7 @@ FROM therecipe/qt:base
ENV JDK_DIR /usr/lib/jvm/java-8-openjdk-amd64
RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -qq update && apt-get -y -qq install openjdk-8-jdk && apt-get -qq clean
RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -qq update && apt-get -y -qq install openjdk-8-jdk && apt-get -qq clean && update-ca-certificates -f
ENV SDK tools_r25.2.4-linux.zip