jonls · qwepoizt · Jul 20, 2021 · Jul 20, 2021 · Jul 20, 2021 · Jul 20, 2021
diff --git a/appveyor.yml b/appveyor.yml
@@ -13,45 +13,69 @@ build_script:
 - ps: |
     If ($env:arch -Match "x86_64") {
       $env:MSYSTEM = "MINGW64"
+      # TODO: switch to release channel after Elektra 0.9.8 is released
+      $env:ELEKTRA_DOWNLOAD_URL = "https://build.libelektra.org/job/libelektra/job/master/lastSuccessfulBuild/artifact/artifacts/debian-bullseye-mingw-w64-x86_64/elektra.zip"
+      $env:PATH_FOR_ELEKTRA_FILES = "C:\msys64\mingw64"
     } Else {
       $env:MSYSTEM = "MINGW32"
+      # TODO: switch to release channel after Elektra 0.9.8 is released
+      $env:ELEKTRA_DOWNLOAD_URL = "https://build.libelektra.org/job/libelektra/job/master/lastSuccessfulBuild/artifact/artifacts/debian-bullseye-mingw-w64-i686/elektra.zip"
+      $env:PATH_FOR_ELEKTRA_FILES = "C:\msys64\mingw32"
     }
 
     $env:CONFIGURE_FLAGS = "--disable-drm --disable-randr --disable-vidmode --enable-wingdi --disable-quartz --disable-geoclue2 --disable-corelocation --disable-gui --disable-ubuntu --disable-nls --host=$env:arch-w64-mingw32"
 
 - ps: md (Join-Path $env:APPVEYOR_BUILD_FOLDER root)
+
+# Download and extract Elektra.
 - ps: |
-        md (Join-Path $env:APPVEYOR_BUILD_FOLDER elektra-download)
-        cd $env:APPVEYOR_BUILD_FOLDER
-        cd elektra-download
-        Start-FileDownload 'https://build.libelektra.org/job/libelektra/job/master/lastSuccessfulBuild/artifact/artifacts/debian-bullseye-mingw-w64/elektra.zip'
-
-- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && cd elektra-download && 7z x elektra.zip"
-- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && cd elektra-download/elektra && cp -r usr/local/include/* /usr/include"
-- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && cd elektra-download/elektra && cp -r usr/local/lib/* /usr/lib"
+    md (Join-Path $env:APPVEYOR_BUILD_FOLDER elektra-download)
+    cd $env:APPVEYOR_BUILD_FOLDER/elektra-download
+    Start-FileDownload $env:ELEKTRA_DOWNLOAD_URL
+    7z x elektra.zip
+
+    # Copied from https://stackoverflow.com/a/44931279
+    function CopyFilesToFolder ($fromFolder, $toFolder) {
+    $childItems = Get-ChildItem $fromFolder
+    $childItems | ForEach-Object {
+        Copy-Item -Path $_.FullName -Destination $toFolder -Recurse -Force
+    }
+        Write-Output "Copied all items of $fromFolder to $toFolder"
+    }
+    CopyFilesToFolder elektra\usr\local\lib $env:PATH_FOR_ELEKTRA_FILES\lib
+    CopyFilesToFolder elektra\usr\local\include $env:PATH_FOR_ELEKTRA_FILES\include
+    md $env:APPVEYOR_BUILD_FOLDER\root\bin
+    Copy-Item -Path elektra\usr\local\bin\kdb-static.exe $env:APPVEYOR_BUILD_FOLDER\root\bin
+    Copy-Item -Path elektra\usr\local\lib\libelektra-full.dll $env:APPVEYOR_BUILD_FOLDER\root\bin
+    cd $env:APPVEYOR_BUILD_FOLDER
+
 - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"
 - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --prefix=\"$APPVEYOR_BUILD_FOLDER/root\" $CONFIGURE_FLAGS"
 - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && make distcheck DISTCHECK_CONFIGURE_FLAGS=\"$CONFIGURE_FLAGS\""
 - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install"
 
 test_script:
+
 - |
-  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe -l 12:-34 -pv
-- |
-  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe -l 12:-34 -m dummy -vo
-- ps: Set-Content -Value "[redshift]`ndawn-time=6:30`ndusk-time=18:00-19:30`n" -Path time.config
+  mkdir C:\ProgramData\usr\local\kdb\
+  %APPVEYOR_BUILD_FOLDER%\root\bin\kdb-static.exe mount ../../../../projects/redshift/src/elektra/windows/redshift-win.dump spec:/sw/jonls/redshift/#0/current dump
+  %APPVEYOR_BUILD_FOLDER%\root\bin\kdb-static.exe spec-mount /sw/jonls/redshift/#0/current
+
 - |
-  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe -c time.config -pv
+  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe --help
 - |
-  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe -c time.config -m dummy -vo
-
+  %APPVEYOR_BUILD_FOLDER%\root\bin\redshift.exe --mode=print --location-provider=manual --lat=12 --lon=-34 --method=dummy -v
+  
 after_build:
 - ps: |
     $ZIP_NAME = "redshift-windows-$env:arch"
     $ZIP_FILE = "redshift-windows-$env:arch.zip"
 
     md $ZIP_NAME
     Copy-Item -Path $env:APPVEYOR_BUILD_FOLDER\root\bin\redshift.exe -Destination $ZIP_NAME
+    Copy-Item -Path $env:APPVEYOR_BUILD_FOLDER\root\bin\kdb-static.exe -Destination $ZIP_NAME
+    Copy-Item -Path $env:APPVEYOR_BUILD_FOLDER\root\bin\libelektra-full.dll -Destination $ZIP_NAME
+    Copy-Item -Path $env:APPVEYOR_BUILD_FOLDER\src\elektra\windows\redshift-win.dump -Destination $ZIP_NAME
     Copy-Item -Path README.md -Destination $ZIP_NAME/README.txt
     Copy-Item -Path NEWS.md -Destination $ZIP_NAME/NEWS.txt
     Copy-Item -Path COPYING -Destination $ZIP_NAME/COPYING.txt

diff --git a/configure.ac b/configure.ac
@@ -32,6 +32,7 @@ esac
 AC_CHECK_TOOL([WINDRES], [windres], [])
 AS_IF([test "x$build_windows" = "xyes" -a -n "x$WINDRES"], [
 	enable_windows_resource=yes
+	AC_DEFINE([WINDOWS_BUILD], [1], [Add a DEFINE that this is a Windows build])
 ], [
 	enable_windows_resource=no
 ])

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -6,7 +6,6 @@ data/applications/redshift-gtk.desktop.in
 
 src/redshift.c
 src/options.c
-src/config-ini.c
 
 src/gamma-drm.c
 src/gamma-randr.c

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -33,20 +33,23 @@ EXTRA_redshift_SOURCES = \
 
 # Note: rules for Elektra are based on https://github.com/kodebach/lcdproc/blob/3e2b9d3f5cade3bbe21fdb5a9ea1c9ffc1c994fa/server/Makefile.am
 CLEANFILES = elektra/redshift-conf.c elektra/redshift-conf.h elektra/redshift-conf.mount.sh
-nodist_redshift_SOURCES = elektra/redshift-conf.h elektra/redshift-conf.c
-redshift.$(OBJEXT) options.$(OBJEXT): elektra/redshift-conf.h elektra/redshift-conf.c
 
 if ENABLE_WINDOWS_RESOURCE
+redshift_SOURCES += elektra/windows/redshift-conf.h elektra/windows/redshift-conf.c
 else
+
+# Linux builds generate the files during make
+redshift.$(OBJEXT) options.$(OBJEXT): elektra/redshift-conf.h elektra/redshift-conf.c
+nodist_redshift_SOURCES = elektra/redshift-conf.h elektra/redshift-conf.c
 KDB ?= kdb
 # Use pattern rule to ensure that kdb gen is only executed once, even if make -jN is used.
 # see https://stackoverflow.com/a/10609434
 %-conf.c %-conf.h %-conf.mount.sh: %.ni
 	$(KDB) gen -F ni=$*.ni highlevel "/sw/jonls/redshift/#0/current" $*-conf initFn=loadConfiguration helpFn=printHelpMessage specloadFn=exitForSpecload embeddedSpec=full;
-endif
-
 scriptsdir = $(prefix)/libexec
 scripts_DATA = elektra/redshift-conf.mount.sh
+endif
+
 
 AM_CFLAGS =
 redshift_LDADD = @LIBINTL@

diff --git a/src/elektra/windows/redshift-conf.c b/src/elektra/windows/redshift-conf.c