Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: torakiki/pdfsam
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.0.3
Choose a base ref
...
head repository: torakiki/pdfsam
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,309 changed files with 94,901 additions and 71,449 deletions.
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: [torakiki]
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 20
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 20
24 changes: 24 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: build

on: [push]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['21']
name: JDK ${{ matrix.java }}

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'liberica'
cache: 'maven'
- run: sudo apt-get install xvfb
- run: sudo apt-get install gettext
- name: Build with Maven
run: xvfb-run mvn -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw --batch-mode --update-snapshots verify
70 changes: 70 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: release

on:
push:
tags:
- '*'

permissions:
contents: write

jobs:
os_matrix:
strategy:
matrix:
os: [ macos-latest, ubuntu-latest, macos-13 ]
runs-on: ${{ matrix.os }}
name: build ${{ matrix.os }}
steps:
- name: Checkout repo
uses: actions/checkout@v4
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.GPG_SUB_SECRET_KEY }}
passphrase: ${{ secrets.GPG_SUB_SECRET_KEY_PASSWORD }}
fingerprint: ${{ secrets.GPG_SUB_FINGERPRINT }}
- name: Set up Apple certs
if: runner.os == 'macOS'
uses: apple-actions/import-codesign-certs@v3
with:
p12-file-base64: ${{ secrets.APPLE_CERT_P12 }}
p12-password: ${{ secrets.APPLE_CERT_P12_PWD }}
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'liberica'
- name: Install gettext on Ubuntu
if: matrix.os == 'ubuntu-latest'
run: sudo apt-get update && sudo apt-get install -y gettext

- name: Install gettext on macOS
if: matrix.os == 'macos-latest'
run: brew install gettext

- name: Install gettext on Windows
if: matrix.os == 'windows-latest'
run: choco install gettext --version=0.21.1
- name: Build
env:
APPLEID: ${{ secrets.NOTARIZE_ACCOUNT }}
APPLEIDPASS: ${{ secrets.NOTERIZE_PWD }}
TEAMID: ${{ secrets.NOTERIZE_TEAM_ID }}
PDFSAM_GPG_FINGERPRINT: ${{ secrets.GPG_SUB_FINGERPRINT }}
run: mvn clean install -DskipTests -Drelease --batch-mode
- name: Release
uses: softprops/action-gh-release@v2
with:
draft: true
files: |
pdfsam-basic/target/*.deb
pdfsam-basic/target/*.dmg
pdfsam-basic/target/*.zip
pdfsam-basic/target/*.tar.gz
pdfsam-basic/target/*.deb.asc
pdfsam-basic/target/*.dmg.asc
pdfsam-basic/target/*.zip.asc
pdfsam-basic/target/*.tar.gz.asc
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -15,3 +15,4 @@ target/
*.iml
.DS_Store
.idea/
/.run/
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

13 changes: 5 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ The official PDFsam repository is https://github.com/torakiki/pdfsam/ and its is
Before you post
---------
- Make sure the same request has not been posted already by searching among the open and closed issues.
- Make sure the feature you are looking for is not already there, look at the documentation on [pdfsam.org] and [superuser].
- Make sure the feature you are looking for is not already there, look at the documentation on [pdfsam.org].

Open an issue
---------
@@ -14,11 +14,8 @@ You verified the points above and you want to open an issue.

Code contribution
----------
- We need you to sign [our CLA].
- Before starting to write large amounts of code talk to us. Open an issue or send us an email, we can discuss together how to proceed.
- We are very strict with the code style. Code format and templates for the Eclipse IDE are included in the pdfsam-docs module as well as the checkstyle plugin configuration, use them.
- Before starting to write large amounts of code talk to us. Open an issue or email us, we can discuss together how to proceed.
- We are very strict with the code style. Code format and templates for the Eclipse IDE are included in the pdfsam-docs tool as well as the checkstyle plugin configuration, use them.
- Include unit tests to cover your feature or bugfix.

[our CLA]: https://github.com/torakiki/pdfsam-CLAs
[pdfsam.org]: http://pdfsam.org
[superuser]: http://superuser.com/questions/tagged/pdfsam

[pdfsam.org]: https://pdfsam.org
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,29 +2,30 @@ PDFsam (PDF Split And Merge)
==============================

Official SCM repository for PDFsam Basic, a free and open source, multi-platform software designed to extract pages, split, merge, mix and rotate PDF files.
[![Build Status](https://travis-ci.org/torakiki/pdfsam.png)](https://travis-ci.org/torakiki/pdfsam)
![Build Status](https://github.com/torakiki/pdfsam/actions/workflows/build.yml/badge.svg)
[![License](http://img.shields.io/badge/license-AGPLv3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0.html)
[![Join the chat at https://gitter.im/PDFsam/Lobby](https://badges.gitter.im/PDFsam/Lobby.svg)](https://gitter.im/PDFsam/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

![](pdfsam-docs/graphics/pdfsam-merge.gif)

Where
-------------------
Official website [pdfsam.org](https://pdfsam.org/ "PDFsam")

License
-------------------
PDFsam Basic is open source under the [GNU Affero General Public License] since version 3, previous versions are released under GPLv2.
Since version 3 PDFsam Basic is open source under the [GNU Affero General Public License], previous versions are released under GPLv2.

Requirements
-------------------
PDFsam Basic is written using the JavaFX. Version 4 is released as a self-contained application and includes a jlinked OpenJDK 11 runtime while version 3 requires a Java Runtime Environment 8 with JavaFx installed in order to run.
PDFsam Basic is written using JavaFX. Since version 4 it is released as a self-contained application and bundles a jlinked JDK while version 3 requires a Java Runtime Environment 8 with JavaFx installed in order to run.

Documentation
-------------------
Some [documentation](https://pdfsam.org/documentation/) and [FAQ](https://pdfsam.org/faq/)

Build
-------------------
This is a [simple guide](https://github.com/torakiki/pdfsam/wiki/Build-and-run) that can help you building PDFsam Basic
This is a [simple guide](https://github.com/torakiki/pdfsam/wiki/Build-and-run) that can help you to build PDFsam Basic

Contribute
------------------
20 changes: 0 additions & 20 deletions appveyor.yml

This file was deleted.

Binary file removed pdfsam-alternate-mix/graphics/alternate_mix.png
Binary file not shown.
161 changes: 0 additions & 161 deletions pdfsam-alternate-mix/graphics/alternate_mix.svg

This file was deleted.

Loading