Merge pull request #83 from lucor/release/v1.1.3

Release v1.1.3

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog - Fyne.io fyne-cross
 
+## 1.1.3 - 02 Nov 2021
+
+### Fixed
+
+-  Building for windows fails to add icon #66
+-  Fixes darwin image creation (SDK extraction) #80
+
 ## 1.1.2 - 05 Oct 2021
 
 ### Fixed

docker/darwin/Dockerfile

@@ -30,10 +30,10 @@ RUN curl -L https://github.com/tpoechtrager/osxcross/archive/${OSX_CROSS_COMMIT}
 RUN ./tools/gen_sdk_package_tools_dmg.sh /tmp/command_line_tools_for_xcode.dmg
 
 ARG SDK_VERSION
-RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.bz2 && \
+RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.* && \
     if [ -z "$SDK_VERSION" ] ;\
-     then ls -1 MacOSX*.tar.bz2 | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
-     else mv MacOSX*.tar.bz2 tarballs ; \
+     then ls -1 MacOSX*.tar.* | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
+     else mv MacOSX*.tar.* tarballs ; \
     fi
 
 RUN UNATTENDED=yes SDK_VERSION=${SDK_VERSION} OSX_VERSION_MIN=${OSX_VERSION_MIN} ./build.sh

internal/command/docker.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/user"
+	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -330,8 +331,6 @@ func fyneRelease(ctx Context) error {
 // that will be automatically linked by compliler during the build
 func WindowsResource(ctx Context) (string, error) {
 
-	windres := ctx.Name + ".syso"
-
 	args := []string{
 		gowindresBin,
 		"-arch", ctx.Architecture.String(),
@@ -346,17 +345,19 @@ func WindowsResource(ctx Context) (string, error) {
 
 	err := Run(ctx.DockerImage, ctx.Volume, runOpts, args)
 	if err != nil {
-		return windres, fmt.Errorf("could not package the Fyne app: %v", err)
+		return "", fmt.Errorf("could not package the Fyne app: %v", err)
 	}
 
-	// copy the windows resource under the project root
+	// copy the windows resource under the package root
 	// it will be automatically linked by compiler during build
-	err = volume.Copy(volume.JoinPathHost(ctx.TmpDirHost(), ctx.ID, windres), volume.JoinPathHost(ctx.WorkDirHost(), windres))
+	windres := ctx.Name + ".syso"
+	out := filepath.Join(ctx.Package, windres)
+	err = volume.Copy(volume.JoinPathHost(ctx.TmpDirHost(), ctx.ID, windres), volume.JoinPathHost(ctx.WorkDirHost(), out))
 	if err != nil {
-		return windres, fmt.Errorf("could not copy windows resource under the project root: %v", err)
+		return "", fmt.Errorf("could not copy windows resource under the package root: %v", err)
 	}
 
-	return windres, nil
+	return out, nil
 }
 
 // pullImage attempts to pull a newer version of the docker image

internal/resource/darwin_dockerfile.go

@@ -34,10 +34,10 @@ RUN curl -L https://github.com/tpoechtrager/osxcross/archive/${OSX_CROSS_COMMIT}
 RUN ./tools/gen_sdk_package_tools_dmg.sh /tmp/command_line_tools_for_xcode.dmg
 
 ARG SDK_VERSION
-RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.bz2 && \
+RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.* && \
     if [ -z "$SDK_VERSION" ] ;\
-     then ls -1 MacOSX*.tar.bz2 | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
-     else mv MacOSX*.tar.bz2 tarballs ; \
+     then ls -1 MacOSX*.tar.* | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
+     else mv MacOSX*.tar.* tarballs ; \
     fi
 
 RUN UNATTENDED=yes SDK_VERSION=${SDK_VERSION} OSX_VERSION_MIN=${OSX_VERSION_MIN} ./build.sh