diff options
| author | Vedang Manerikar <ved.manerikar@gmail.com> | 2021-04-11 21:57:01 +0530 |
|---|---|---|
| committer | Vedang Manerikar <ved.manerikar@gmail.com> | 2021-04-11 23:33:16 +0530 |
| commit | e905af3941e3a9a004659bf54dc1f037930fa0f9 (patch) | |
| tree | d1c2342b899eaf184148518bb095be894608bc94 | |
| parent | 77f1fcf52c786bf97c128af57b5ec2b8cc2f4b35 (diff) | |
Fix: Download missing dll files separately
I'm making these changes based on reading through the output logs of
the Appveyor code, I don't have any understanding of how mingw64
works.
| -rw-r--r-- | README.org | 3 | ||||
| -rw-r--r-- | ci/appveyor/install.bat | 7 | ||||
| -rw-r--r-- | ci/appveyor/pack.bat | 8 |
3 files changed, 16 insertions, 2 deletions
@@ -196,6 +196,9 @@ libpoppler version, will be available. These commands should give no error, otherwise you are in trouble. **** Compilation and installation on Windows + :PROPERTIES: + :CUSTOM_ID: compilation-and-installation-on-windows + :END: If using the GNU binaries for Windows, support for PNG and zlib must first be installed by copying the appropriate dlls into emacs' ~bin/~ directory. Most third-party binaries come with this diff --git a/ci/appveyor/install.bat b/ci/appveyor/install.bat index ce7936b..9958d2a 100644 --- a/ci/appveyor/install.bat +++ b/ci/appveyor/install.bat @@ -28,4 +28,11 @@ IF %COMPILER%==msys2 ( REM Set up Cask bash -lc "git clone https://github.com/cask/cask ~/.cask" + REM Download ssleay32 and libeay32 dlls + bash -lc "pushd /c/projects/pdf-tools; curl -fsSL https://indy.fulgan.com/SSL/openssl-1.0.2u-x64_86-win64.zip -o ./tmp/openssl.zip" + + REM Extract *eay32 dlls to TMP + 7z x -o%TMPDIR%\ %TMPDIR%\openssl.zip + bash -lc "pushd /c/projects/pdf-tools; echo Indy Fulgan download complete; pwd; ls -la ./tmp/" + ) diff --git a/ci/appveyor/pack.bat b/ci/appveyor/pack.bat index 7077f26..acee147 100644 --- a/ci/appveyor/pack.bat +++ b/ci/appveyor/pack.bat @@ -2,7 +2,7 @@ cd %APPVEYOR_BUILD_FOLDER% -REM Create a writeable TMPDIR +REM Create a writeable PACKDIR mkdir %APPVEYOR_BUILD_FOLDER%\pack set PACKDIR=%APPVEYOR_BUILD_FOLDER%\pack @@ -11,7 +11,11 @@ IF %COMPILER%==msys2 ( SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;C:\%MSYS2_DIR%\home\appveyor\.cask\bin;%PATH%" REM Copy epdfinfo.exe and all dependencies - bash -lc "pushd /c/projects/pdf-tools; ldd server/epdfinfo.exe | grep mingw | cut -d' ' -f 3 | xargs -I {} cp {} ./pack/; cp server/epdfinfo.exe ./pack/; cp /mingw64/bin/*eay32.dll ./pack/" + bash -lc "pushd /c/projects/pdf-tools; ldd server/epdfinfo.exe | grep mingw | cut -d' ' -f 3 | xargs -I {} cp {} ./pack/; cp server/epdfinfo.exe ./pack/" + + REM Copy dlls to pack + cp %TMPDIR%\ssleay32.dll %PACKDIR%\ + cp %TMPDIR%\libeay32.dll %PACKDIR%\ REM Package epdfinfo.exe and all dependencies 7z a epdfinfo.zip %PACKDIR%\*.* |