mirror of
https://github.com/bluszcz/cutego.git
synced 2024-09-29 05:35:16 +03:00
fix msys2 + android docker image
This commit is contained in:
parent
45c02e2932
commit
c69117432a
3 changed files with 3 additions and 2 deletions
|
@ -60,6 +60,7 @@ func check(buildTarget string) {
|
||||||
|
|
||||||
case "windows":
|
case "windows":
|
||||||
{
|
{
|
||||||
|
utils.Log.Infoln("MSYSTEM:", os.Getenv("MSYSTEM"))
|
||||||
utils.Log.Infoln("QT_MSYS2:", os.Getenv("QT_MSYS2"))
|
utils.Log.Infoln("QT_MSYS2:", os.Getenv("QT_MSYS2"))
|
||||||
utils.Log.Infoln("QT_MSYS2_DIR:", os.Getenv("QT_MSYS2_DIR"))
|
utils.Log.Infoln("QT_MSYS2_DIR:", os.Getenv("QT_MSYS2_DIR"))
|
||||||
utils.Log.Infoln("IsMsys2QtDir:", utils.IsMsys2QtDir())
|
utils.Log.Infoln("IsMsys2QtDir:", utils.IsMsys2QtDir())
|
||||||
|
|
|
@ -14,7 +14,7 @@ func prep() {
|
||||||
utils.Log.Info("running setup/prep")
|
utils.Log.Info("running setup/prep")
|
||||||
|
|
||||||
if utils.UseMsys2() {
|
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")))
|
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,7 +2,7 @@ FROM therecipe/qt:base
|
||||||
|
|
||||||
|
|
||||||
ENV JDK_DIR /usr/lib/jvm/java-8-openjdk-amd64
|
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
|
ENV SDK tools_r25.2.4-linux.zip
|
||||||
|
|
Loading…
Reference in a new issue