Skip to content

Commit 3318081

Browse files
committed
better AppImage support
1 parent 67bb7ec commit 3318081

File tree

2 files changed

+48
-22
lines changed

2 files changed

+48
-22
lines changed

REQUIREMENTS.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Perl Executing Browser - Requirements
44
## Compile-Time Requirements
55
The only Linux and Macintosh compile-time requirement of PEB is a GCC-based Qt development bundle version 5.2 or any later version.
66

7-
The source code of PEB is not MSVC-compatible and PEB can not be compiled using any MSVC-based Windows version of Qt. This means that:
8-
* PEB Windows binaries can be compiled only by a GCC-based Qt development bundle.
9-
* Only ```QtWebKit``` can be used by a Windows binary of PEB.
10-
Windows GCC-based Qt development bundles version 5.6.x or higher have neither ```QtWebEngine```, nor ```QtWebKit```.
11-
* Updated ``QtWebKit`` headers and libraries have to be manually added from the
7+
The source code of PEB is not MSVC-compatible and PEB can not be compiled using any MSVC-based Windows version of Qt. Only applications build for a MSVC-based Qt version 5.6.x or higher can use ```QtWebEngine``` on the Windows platform. Windows GCC-based Qt development bundles version 5.6.x or higher have neither ```QtWebEngine```, nor ```QtWebKit```.
8+
This means that:
9+
* Windows builds of PEB can only be compiled by a GCC-based Qt development bundle.
10+
* Windows builds of PEB can only use ```QtWebKit``` web engine.
11+
* Updated ``QtWebKit`` have to be manually added from the
1212
[QtWebKit repository of Konstantin Tokarev (annulen)](https://github.com/annulen/webkit/releases) to all Windows GCC-based Qt development bundles version 5.6.x or higher.
1313

1414
Compiled and tested successfully using:

appimage-maker.sh

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,52 @@
11
#!/usr/bin/env bash
22

3-
mkdir peb.app
3+
if [ ! -e ./peb.app ]; then
4+
mkdir ./peb.app
5+
fi
6+
7+
if [ -e ./peb ]; then
8+
cp -f ./peb ./peb.app/peb
9+
else
10+
cd ./src || exit
11+
12+
qmake -qt=qt5
13+
make
14+
15+
cd .. || exit
16+
cp -f ./peb ./peb.app/peb
17+
fi
418

5-
cp ./peb ./peb.app/peb
619
cp ./sdk/peb.desktop ./peb.app/peb.desktop
720
cp ./src/resources/icon/camel.png ./peb.app/peb.png
821

9-
cp -r ./perl ./peb.app/perl
10-
11-
cp -r ./resources ./peb.app/resources
12-
13-
# cp -r sdk peb.app/sdk
14-
# relocatable_perl="./peb.app/perl/bin/perl"
15-
#
16-
# if [ -e "$relocatable_perl" ]; then
17-
# printf "\\nGoing to compact the relocatable Perl for this copy of Perl Executing Browser.\\n"
18-
# $relocatable_perl ./peb.app/sdk/compactor.pl --nobackup
19-
# else
20-
# printf "\\nRelocatable Perl is not found for this copy of Perl Executing Browser.\\n"
21-
# fi
22-
#
23-
# rm -rf sdk
22+
if [ "$1" = "--add-resources" ]; then
23+
cp -rf ./resources ./peb.app/resources
24+
25+
perl5lib="PERL5LIB=$(pwd)/perl/lib"
26+
export perl5lib
27+
relocatable_perl="$(pwd)/perl/bin/perl"
28+
compactor_script="$(pwd)/sdk/compactor.pl"
29+
30+
if [ -e "$relocatable_perl" ]; then
31+
printf "\\nGoing to compact the relocatable Perl for this copy of Perl Executing Browser.\\n"
32+
"$relocatable_perl" "$compactor_script"
33+
34+
mkdir ./peb.app/perl
35+
cp -rf ./perl/bin ./peb.app/perl/bin
36+
cp -rf ./perl/lib ./peb.app/perl/lib
37+
38+
rm -rf ./perl/bin
39+
rm -rf ./perl/lib
40+
cp ./perl/bin-original ./perl/bin
41+
cp ./perl/lib-original ./perl/lib
42+
else
43+
printf "\\nRelocatable Perl is not found for this copy of Perl Executing Browser.\\n"
44+
fi
45+
fi
46+
47+
if [ "$1" = "--add-perl-only" ]; then
48+
cp -rf ./perl ./peb.app/perl
49+
fi
2450

2551
if [ ! -x linuxdeployqt-continuous-x86_64.AppImage ]; then
2652
wget --tries=5 --unlink "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"

0 commit comments

Comments
 (0)