Commit Graph

318 Commits (master)

Author SHA1 Message Date
Raoul Snyman 337479e1cf Merge branch 'update-pkg-for-macos' into 'master'
Update pkg for macos

See merge request openlp/packaging!24
2023-09-15 06:37:49 +00:00
Raoul Snyman 931faa3775 Add arch to dmg name, bundle applescript, parse pep440 version number 2023-09-14 11:46:34 -07:00
Tim Bentley cdd1851f2d Merge branch 'fix-appveyor-more' into 'master'
Fix the build number for the PortableApps installer, which was also causing a hang somewhere

See merge request openlp/packaging!23
2023-09-13 20:42:20 +00:00
Raoul Snyman 03bdf87994
Fix the build number for the PortableApps installer, which was also causing a hang somewhere 2023-09-09 21:22:00 -07:00
Raoul Snyman a6e556e524
Merge branch 'fix-wix-build-numbers' into 'master'
Convert a PEP440 version number to a Windows version number

See merge request openlp/packaging!22
2023-09-08 14:06:41 +00:00
Raoul Snyman c69cfab237 Convert a PEP440 version number to a Windows version number 2023-09-07 23:15:32 -07:00
Tomas Groth d32a48727b Merge branch 'update-to-pyro5' into 'master'
Update the builder to bundle Pyro5

See merge request openlp/packaging!21
2023-08-26 06:54:55 +00:00
Raoul Snyman 6789a46057 Update the builder to bundle Pyro5 2023-08-25 20:02:06 -07:00
Tim Bentley 140d073f64 Merge branch 'add-vlc-to-macos' into 'master'
Copy VLC files into macOS

See merge request openlp/packaging!19
2023-05-17 07:24:58 +00:00
Raoul Snyman bb5d483936
Copy VLC files into macOS 2023-05-08 21:43:42 -07:00
Raoul Snyman 34aca98b1a Use the correct license. 2023-04-27 05:21:10 +00:00
Raoul Snyman 9dbb7d99cd Add LICENSE 2023-04-27 03:36:59 +00:00
Raoul Snyman 9a6cd69af7 Merge branch 'add-nsappleeventusagedesc' into 'master'
Adds NSAppleEventsUsageDescription to macOS build to tricker better permission handling.

See merge request openlp/packaging!18
2023-01-19 17:36:00 +00:00
Tomas Groth 31ebdc537a Adds NSAppleEventsUsageDescription to macOS build to tricker better permission handling. 2023-01-18 23:02:06 +01:00
Raoul Snyman 5b42f3260d Merge branch 'dmgbuild-fix' into 'master'
Fix to make dmgbuild work

See merge request openlp/packaging!17
2021-11-22 05:43:57 +00:00
Tomas Groth 854dba8e86 Fix to make dmgbuild work 2021-11-22 05:43:56 +00:00
Tomas Groth f3450e30f2 Merge branch 'fix-path-to-lrelease' into 'master'
Add a 'home' variable for the config files

See merge request openlp/packaging!16
2021-11-07 09:43:29 +00:00
Raoul Snyman 2e9751f690
Add a 'home' variable for the config files 2021-09-16 15:37:33 -07:00
Raoul Snyman 09e63c0a04 Merge branch 'update-qt-appveyor-path' into 'master'
Update Qt path in appveyor

See merge request openlp/packaging!15
2021-09-03 15:56:42 +00:00
Tomas Groth 7be279bb17 Update Qt path in appveyor 2021-09-03 13:21:29 +02:00
Tomas Groth f08beb7001 Merge branch 'update-macos-build' into 'master'
Some updates to the macOS builder

See merge request openlp/packaging!14
2021-09-03 09:09:40 +00:00
Raoul Snyman 128de147e0
Some updates to the macOS builder
- Apparently we don't need to sign the app anymore
- Add hooks for websockets
2021-09-02 17:57:02 -07:00
Tim Bentley cfdbeb7176 Merge branch 'new-pyqt5-path' into 'master'
Update windows Qt5 path for translations.

See merge request openlp/packaging!13
2021-03-26 10:13:18 +00:00
Tomas Groth 3aa582ca10 Update windows Qt5 path for translations. 2021-03-25 20:32:05 +00:00
Raoul Snyman 5afca33db1 Merge branch 'reenable-macos-dark' into 'master'
Re-enable dark mode on Mac OS now that pyinstaller supports it.

See merge request openlp/packaging!12
2020-12-04 05:14:27 +00:00
Tomas Groth 398510517f Re-enable dark mode on Mac OS now that pyinstaller supports it. 2020-12-04 06:07:35 +01:00
Raoul Snyman 565baaa2f6 Merge branch 'keynote-include' into 'master'
Fix typo that prevent inclusion of the keynotecontroller.

See merge request openlp/packaging!11
2020-09-30 20:04:02 +00:00
Tomas Groth 206e306c37 Fix typo that prevent inclusion of the keynotecontroller. 2020-09-30 21:46:18 +02:00
Raoul Snyman dcaebecb40 Merge branch 'wix-fixes' into 'master'
Make the windows installer able to start OpenLP directly after install.

See merge request openlp/packaging!10
2020-09-30 06:40:51 +00:00
Tomas Groth 4905e575de Try to make the windows installer able to start OpenLP directly after install. Also try to compress better. 2020-09-30 06:40:51 +00:00
Raoul Snyman de9ee75694 Merge branch 'mac-fixes' into 'master'
Fix a few mac related issues.

See merge request openlp/packaging!9
2020-09-20 20:09:09 +00:00
Tomas Groth f13b412e12 Fix a few mac related issues. 2020-09-20 21:55:26 +02:00
Tim Bentley b6edde850a Merge branch 'appveyor-macos' into 'master'
Fixes for MacOS build and enable using appveyor for macos

See merge request openlp/packaging!8
2020-07-10 19:43:13 +00:00
Tomas Groth b7cd96f662 Fixes for MacOS build and enable using appveyor for macos 2020-07-10 19:43:13 +00:00
Tomas Groth a645888667 Merge branch 'pymediainfo-hook' into 'master'
Pymediainfo hook

Closes #2

See merge request openlp/packaging!7
2019-12-21 22:20:11 +00:00
Raoul Snyman 62c6150942 Add a pymediainfo hook which also tells PyInstaller to copy the dll/dylib file 2019-12-21 15:15:46 -07:00
Raoul Snyman d419a9f7de Merge branch 'master' of gitlab.com:openlp/packaging 2019-12-21 15:15:33 -07:00
Tomas Groth 83da7f600f Merge branch 'make-release-export-optional' into 'master'
Make the export optional when running a release build

See merge request openlp/packaging!6
2019-12-20 06:03:49 +00:00
Raoul Snyman 1dccab556d Make the export optional when running a release build 2019-12-20 06:03:49 +00:00
Raoul Snyman 3f41bf12b8 Merge branch 'htmlhelp-x86-appveyor' into 'master'
Set htmlhelp to use progfilesx86 path.

See merge request openlp/packaging!5
2019-12-19 21:09:43 +00:00
Tomas Groth 95227423bd Set htmlhelp to use progfilesx86 path. 2019-12-19 21:09:43 +00:00
Raoul Snyman b745f7fcf8 Merge branch 'fix-macos-build' into 'master'
Fix various parts of the build script for the macOS build

See merge request openlp/packaging!4
2019-12-10 04:07:44 +00:00
Raoul Snyman bb1b6b773b Fix various parts of the build script for the macOS build 2019-12-10 04:07:44 +00:00
Tomas Groth 2a26e6c03d Merge branch 'fix-msi-pyinstaller' into 'master'
Fix MSI and PyInstaller builds

Closes #2

See merge request openlp/packaging!3
2019-11-13 21:34:04 +00:00
Raoul Snyman 08313281ea Fix MSI and PyInstaller builds 2019-11-13 21:34:04 +00:00
Raoul Snyman 9c12f4eec8 Fixed #2 with MSI build; fixed PyInstaller build 2019-11-13 08:33:41 -07:00
Raoul Snyman a762877cc5 Merge branch 'gitlab-packaging' into 'master'
Some updates to get packaing working after the gitlab migration.

See merge request openlp/packaging!2
2019-09-24 18:47:13 +00:00
Tomas Groth ce5b55ef1a Some updates to get packaing working after the gitlab migration. 2019-09-24 18:47:13 +00:00
Raoul Snyman 81e4db7463 Merge branch 'bzr2git' into 'master'
First stab at converting to use git while packaging.

See merge request openlp/packaging!1
2019-09-13 19:32:30 +00:00
Tomas Groth c9af8d577f First stab at converting to use git while packaging. 2019-09-13 19:32:29 +00:00