Refactor for Windows

Author: jeroen

.github/workflows/R-CMD-check.yaml

@@ -10,16 +10,15 @@ jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }}${{ matrix.config.static }})
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }}${{ matrix.config.FORCE_STATIC_GIFSKI }})
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: '4.1', static: '-rwinlib'}
-          - {os: windows-latest, r: 'release', static: '-rwinlib'}
           - {os: windows-latest, r: '4.1'}
           - {os: windows-latest, r: 'release'}
+          - {os: windows-latest, r: 'release', FORCE_STATIC_GIFSKI: 'static'}
           - {os: macOS-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
@@ -50,3 +49,5 @@ jobs:
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2
+        env:
+          FORCE_STATIC_GIFSKI: ${{ matrix.config.FORCE_STATIC_GIFSKI }}

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: gifski
 Type: Package
 Title: Highest Quality GIF Encoder
-Version: 1.6.6-1
+Version: 1.12.0
 Authors@R: c(
     person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

NEWS

@@ -1,6 +1,6 @@
 1.12.0
   - Update embedded libgifski to upstream 1.12.0
-  - Windows: if rust is available, default to source build of libgifski.
+  - Windows: if Cargo is available, default to source build of libgifski
 
 1.6.6-1
   - Fix for legacy Windows Vista/2008 (for the old winbuilder)

configure.ucrt

@@ -0,0 +1,9 @@
+#!/bin/sh
+export PATH="$HOME/.cargo/bin:$PATH"
+CARGO=$(which cargo)
+if [ $? -eq 0 ] && [ -z "${FORCE_STATIC_GIFSKI}" ]; then
+  echo "Building from source using ${CARGO} $(cargo --version)"
+  cp -f src/Makevars.win.build src/Makevars.win
+  exit 0
+fi
+exit 0

src/Makevars.win

@@ -1,30 +1,15 @@
-TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
-LIBDIR = myrustlib/target/$(TARGET)/release
-STATLIB = $(LIBDIR)/libmyrustlib.a
-PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+VERSION = 1.12.0
+RWINLIB = ../windows/gifski-winlibs
+PKG_CPPFLAGS = -I$(RWINLIB)/include
+GCC_VERSION = ${subst gcc,,${COMPILED_BY}}
+PKG_LIBS = -L$(RWINLIB)/lib$(GCC_VERSION)$(R_ARCH) \
+	-L$(RWINLIB)/lib$(R_ARCH) \
+	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
 
-# These can also be set in ~/.cargo/config
-ifeq ($(R_COMPILED_BY),gcc 8.3.0)
-GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
-export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\mingw64\\bin\\gcc
-export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\\mingw32\\bin\\gcc
-else
-GCCPATH=$(subst C:\,/c/,$(RTOOLS43_HOME))/x86_64-w64-mingw32.static.posix/bin
-endif
+all: clean winlibs
 
-all: clean rustup
-
-$(SHLIB): $(STATLIB)
-
-$(STATLIB):
-ifeq ($(WIN),64) #hack for mxe-rtools42 missing -lgcc_eh
-	mkdir -p myrustlib/target/release/deps; echo '!<arch>' > myrustlib/target/release/deps/libgcc_eh.a
-endif
-	PATH="$(GCCPATH):$(USERPROFILE)\.cargo:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
-	rm -Rf $(LIBDIR)/build
+winlibs:
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
 
 clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
-
-rustup:
-	rustup target add $(TARGET) || true
+	rm -f $(SHLIB) $(OBJECTS)

src/Makevars.win.build

@@ -0,0 +1,30 @@
+TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
+LIBDIR = myrustlib/target/$(TARGET)/release
+STATLIB = $(LIBDIR)/libmyrustlib.a
+PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+
+# These can also be set in ~/.cargo/config
+ifeq ($(R_COMPILED_BY),gcc 8.3.0)
+GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
+export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\mingw64\\bin\\gcc
+export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\\mingw32\\bin\\gcc
+else
+GCCPATH=$(subst C:\,/c/,$(RTOOLS43_HOME))/x86_64-w64-mingw32.static.posix/bin
+endif
+
+all: clean rustup
+
+$(SHLIB): $(STATLIB)
+
+$(STATLIB):
+ifeq ($(WIN),64) #hack for mxe-rtools42 missing -lgcc_eh
+	mkdir -p myrustlib/target/release/deps; echo '!<arch>' > myrustlib/target/release/deps/libgcc_eh.a
+endif
+	PATH="$(GCCPATH):$(USERPROFILE)\.cargo:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
+	rm -Rf $(LIBDIR)/build
+
+clean:
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
+
+rustup:
+	rustup target add $(TARGET) || true