Skip to content

Commit

Permalink
chore: update xpdf tools
Browse files Browse the repository at this point in the history
  • Loading branch information
matzehecht committed Dec 17, 2022
1 parent 4b1be84 commit 963cf3a
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 48 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
env:
cache-name: cache-pdftotext-windows
with:
path: xpdf-tools-win-4.03.zip
path: xpdf-tools-win-4.04.zip
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
Expand All @@ -147,27 +147,27 @@ jobs:
- name: Download pdftotext
if: ${{ matrix.os == 'windows' }}
run: |
if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip"
if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip"
}
Expand-Archive -Path xpdf-tools-win-4.03.zip
Expand-Archive -Path xpdf-tools-win-4.04.zip
- name: Copy pdftotext
if: ${{ matrix.os == 'windows' && matrix.arch == 'x64' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
- name: Copy pdftotext
if: ${{ matrix.os == 'windows' && matrix.arch == 'x86' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
- name: Cache pdftotext
uses: actions/cache@v2
if: ${{ matrix.os == 'linux' }}
env:
cache-name: cache-pdftotext-linux
with:
path: xpdf-tools-linux-4.03.tar.gz
path: xpdf-tools-linux-4.04.tar.gz
key: ${{ matrix.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ matrix.os }}-build-${{ env.cache-name }}
Expand All @@ -176,20 +176,20 @@ jobs:
- name: Download pdftotext linux
if: ${{ matrix.os == 'linux' }}
run: |
if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz
if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz
fi
tar -xvzf xpdf-tools-linux-4.03.tar.gz
tar -xvzf xpdf-tools-linux-4.04.tar.gz
- name: Copy pdftotext
if: ${{ matrix.os == 'linux' && matrix.arch == 'x64' }}
run: |
mkdir "lib/pdftotext/linux" --parents
cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64
cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64
- name: Copy pdftotext
if: ${{ matrix.os == 'linux' && matrix.arch == 'x86' }}
run: |
mkdir "lib/pdftotext/linux" --parents
cp xpdf-tools-linux-4.03/bin32/pdftotext lib/pdftotext/linux/pdftotext32
cp xpdf-tools-linux-4.04/bin32/pdftotext lib/pdftotext/linux/pdftotext32
- uses: ./.github/actions/nexe-compile
name: Compile ${{ matrix.type }} for ${{ matrix.os }} ${{ matrix.arch }}
with:
Expand Down Expand Up @@ -276,28 +276,28 @@ jobs:
env:
cache-name: cache-pdftotext-windows
with:
path: xpdf-tools-win-4.03.zip
path: xpdf-tools-win-4.04.zip
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
${{ runner.os }}-build-
${{ runner.os }}-
- name: Download pdftotext
run: |
if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip"
if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip"
}
Expand-Archive -Path .\xpdf-tools-win-4.03.zip
Expand-Archive -Path .\xpdf-tools-win-4.04.zip
- name: Copy pdftotext
if: ${{ matrix.arch == 'x64' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
- name: Copy pdftotext
if: ${{ matrix.arch == 'x86' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
- name: Write key file
run: |
$bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERTIFICATE }}")
Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
runs-on: ubuntu-latest
name: Publish to hecht.space
if: ${{ contains(github.ref, 'main') }}
needs: ["publish","buildLinuxInstaller", "buildWinInstaller"]
needs: ['publish', 'buildLinuxInstaller', 'buildWinInstaller']
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
env:
cache-name: cache-pdftotext-windows
with:
path: xpdf-tools-win-4.03.zip
path: xpdf-tools-win-4.04.zip
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
Expand All @@ -139,27 +139,27 @@ jobs:
- name: Download pdftotext
if: ${{ matrix.os == 'windows' }}
run: |
if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip"
if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip"
}
Expand-Archive -Path xpdf-tools-win-4.03.zip
Expand-Archive -Path xpdf-tools-win-4.04.zip
- name: Copy pdftotext
if: ${{ matrix.os == 'windows' && matrix.arch == 'x64' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
- name: Copy pdftotext
if: ${{ matrix.os == 'windows' && matrix.arch == 'x86' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
- name: Cache pdftotext
uses: actions/cache@v2
if: ${{ matrix.os == 'linux' }}
env:
cache-name: cache-pdftotext-linux
with:
path: xpdf-tools-linux-4.03.tar.gz
path: xpdf-tools-linux-4.04.tar.gz
key: ${{ matrix.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ matrix.os }}-build-${{ env.cache-name }}
Expand All @@ -168,20 +168,20 @@ jobs:
- name: Download pdftotext linux
if: ${{ matrix.os == 'linux' }}
run: |
if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz
if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz
fi
tar -xvzf xpdf-tools-linux-4.03.tar.gz
tar -xvzf xpdf-tools-linux-4.04.tar.gz
- name: Copy pdftotext
if: ${{ matrix.os == 'linux' && matrix.arch == 'x64' }}
run: |
mkdir "lib/pdftotext/linux" --parents
cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64
cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64
- name: Copy pdftotext
if: ${{ matrix.os == 'linux' && matrix.arch == 'x86' }}
run: |
mkdir "lib/pdftotext/linux" --parents
cp xpdf-tools-linux-4.03/bin32/pdftotext lib/pdftotext/linux/pdftotext32
cp xpdf-tools-linux-4.04/bin32/pdftotext lib/pdftotext/linux/pdftotext32
- uses: ./.github/actions/nexe-compile
name: Compile ${{ matrix.type }} for ${{ matrix.os }} ${{ matrix.arch }}
with:
Expand Down Expand Up @@ -251,28 +251,28 @@ jobs:
env:
cache-name: cache-pdftotext-windows
with:
path: xpdf-tools-win-4.03.zip
path: xpdf-tools-win-4.04.zip
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
${{ runner.os }}-build-
${{ runner.os }}-
- name: Download pdftotext
run: |
if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip"
if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) {
Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip"
}
Expand-Archive -Path .\xpdf-tools-win-4.03.zip
Expand-Archive -Path .\xpdf-tools-win-4.04.zip
- name: Copy pdftotext
if: ${{ matrix.arch == 'x64' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe"
- name: Copy pdftotext
if: ${{ matrix.arch == 'x86' }}
run: |
New-Item -path "lib\pdftotext\win" -type directory
Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe"
- name: Write key file
run: |
$bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERTIFICATE }}")
Expand Down Expand Up @@ -370,9 +370,9 @@ jobs:
[System.Collections.ArrayList]$originalContent = (Get-Content $configFilePath)
$originalContent.removeRange(9, 5)
$originalContent | Out-File -encoding utf8 $configFilePath
Start-Sleep -Seconds 30
if (((Get-Service "EMAPC").Status) -ne "Running")
{
Expand All @@ -387,7 +387,7 @@ jobs:
Write-Host "Service not running after config change"
exit 1
}
(Get-Content $configFilePath) `
-replace '^(.*)required: true$', '$1default: ein standard wert' `
-replace '^((.*)inputKeyWord: EM)', "`$1`r`n`$2default: ['Muster', 'Max']" |
Expand All @@ -409,9 +409,9 @@ jobs:
[System.Collections.ArrayList]$originalContent = (Get-Content $configFilePath)
$originalContent.removeRange(0, 57)
$originalContent | Out-File -encoding utf8 $configFilePath
Start-Sleep -Seconds 30
if (((Get-Service "EMAPC").Status) -ne "Stopped")
{
Get-Content $configFilePath
Expand All @@ -428,7 +428,7 @@ jobs:
- name: Uninstall service
run: |
Start-Process msiexec.exe -Wait -ArgumentList "/X $PWD\emapc-windows-service-installer-x64.msi /passive /qn"
If ( (Test-Path -Path "$([environment]::getfolderpath('programfiles'))/EMAPC") -Or (Get-Service "EMAPC" -ErrorAction SilentlyContinue) )
{
Write-Host "Service did not properly uninstall"
Expand All @@ -453,21 +453,21 @@ jobs:
env:
cache-name: cache-pdftotext-linux-test
with:
path: xpdf-tools-linux-4.03.tar.gz
path: xpdf-tools-linux-4.04.tar.gz
key: ${{ matrix.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ matrix.os }}-build-${{ env.cache-name }}
${{ matrix.os }}-build-
${{ matrix.os }}-
- name: Download pdftotext linux
run: |
if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz
if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then
curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz
fi
tar -xvzf xpdf-tools-linux-4.03.tar.gz
tar -xvzf xpdf-tools-linux-4.04.tar.gz
- name: Copy pdftotext
run: |
mkdir "lib/pdftotext/linux" --parents
cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64
cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64
- name: test
run: ./test/linuxtests.sh

0 comments on commit 963cf3a

Please sign in to comment.