only standard QtWebKit and no Perl Distribution Compactor

Author: ddmitov

CREDITS.md

@@ -44,14 +44,10 @@ https://github.com/richmoore/qt-examples/tree/master/sitespecificbrowser
 https://github.com/OtterBrowser/otter-browser/blob/master/src/modules/backends/web/qtwebengine/QtWebEnginePage.cpp  
 https://github.com/OtterBrowser/otter-browser/blob/master/src/modules/backends/web/qtwebengine/QtWebEnginePage.h  
 https://github.com/NixOS/nixpkgs/issues/16327  
-https://github.com/annulen/webkit  
 
-https://doc.qt.io/archives/4.6/webkit-fancybrowser-mainwindow-cpp.html  
 https://doc.qt.io/archives/qt-5.5/qwebpage.html#windowCloseRequested  
 https://doc.qt.io/qt-4.8/qmake-advanced-usage.html  
-https://doc.qt.io/qt-4.8/qwebframe.html  
 https://doc.qt.io/qt-4.8/signalsandslots.html  
-https://doc.qt.io/qt-4.8/qfileinfo.html  
 https://doc.qt.io/qt-4.8/qwebinspector.html  
 https://doc.qt.io/qt-4.8/qinputdialog.html  
 https://doc.qt.io/qt-5/qtglobal.html  
@@ -124,23 +120,14 @@ https://github.com/skaji/relocatable-perl
 http://strawberryperl.com/  
 
 https://perldoc.perl.org/Encode.html  
-https://perldoc.perl.org/File/Basename.html  
-https://perldoc.perl.org/File/Path.html  
-
-https://metacpan.org/pod/File::Copy::Recursive  
-https://metacpan.org/pod/Module::ScanDeps  
-
-https://www.perl.com/article/37/2013/8/18/Catch-and-Handle-Signals-in-Perl/  
+https://perldoc.perl.org/File/Temp.html  
 
 https://www.perlmonks.org/bare/?node_id=768448 "Permanently sort a hash"  
 https://www.perlmonks.org/?node_id=27443 "Checking to see if a particular Module is installed"  
-https://www.perlmonks.org/?node_id=982572 "ScanDeps usage"  
 
 https://stackoverflow.com/questions/4510550/using-perl-how-do-i-decode-or-create-those-encodings-on-the-web  
 https://stackoverflow.com/questions/5741101/easy-way-to-print-perl-array-with-a-little-formatting  
 https://stackoverflow.com/questions/15210532/use-utf8-gives-me-wide-character-in-print  
-https://stackoverflow.com/questions/787899/how-do-i-use-a-perl-module-from-a-relative-location  
-https://stackoverflow.com/questions/229357/what-is-the-best-way-in-perl-to-copy-files-into-a-yet-to-be-created-directory-tr  
 
 https://perlmaven.com/manipulating-perl-arrays  
 https://perlmaven.com/how-to-sort-a-hash-in-perl  

doc/APPIMAGE.md

@@ -2,18 +2,14 @@
 
 ## PEB AppImage Maker
 
-PEB or any PEB-based application can be easily packed as a 64-bit single-file Linux [AppImage](https://appimage.org/) executable by the [PEB AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh) script, which has two modes of operation:  
+PEB and any PEB-based application can be easily packed as a 64-bit single-file Linux [AppImage](https://appimage.org/) executable by the [PEB AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh) script, which has two modes of operation:  
 
 * packing a Perl application together with a PEB executable, Qt libraries and a relocatable Perl distribution:  
 
   ```bash
   ./appimage-maker.sh --include-resources
   ```
 
-  In this case, the PEB AppImage Maker invokes the [Perl Distribution Compactor](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/compactor.pl), which finds all dependencies of all Perl scripts in the ``{PEB_executable_directory}/resources/app`` directory and copies only the necessary Perl modules.
-
-  Perl Distribution Compactor depends on [Module::ScanDeps](https://metacpan.org/pod/Module::ScanDeps) and [File::Copy::Recursive](https://metacpan.org/pod/File::Copy::Recursive) CPAN modules, which are included in the ``{PEB_executable_directory}/sdk/lib`` directory.
-
 * packing only a PEB executable and its Qt libraries:  
 
   ```bash
@@ -32,7 +28,7 @@ The PEB AppImage Maker script must be started from the ``{PEB_executable_directo
 ``{PEB_executable_directory}/resources/app/appimage/{application_name}.appdata.xml``  
 
 ``{PEB_executable_directory}/resources/app/{application_name}.desktop``  
-is mandatory for any PEB-based application which will be packed by the PEB AppImage Maker.  
+is mandatory for any PEB-based application which is to be packed by the PEB AppImage Maker.  
 A minimal example of а ``.desktop`` file is available [here](https://github.com/ddmitov/perl-executing-browser/blob/master/resources/app/peb-demo.desktop).  
 ``Icon=app`` in the ``.desktop`` file must not be changed for the proper display of the application icon.  
 All registered categories in a ``.desktop`` file are available [here](https://standards.freedesktop.org/menu-spec/latest/apa.html).  

doc/REQUIREMENTS.md

@@ -2,13 +2,9 @@
 
 ## Compile-Time Requirements
 
-The only Linux and Mac compile-time requirement of PEB is a Qt development bundle version 5.2 or any later version.  
+The only Linux and Mac compile-time requirement of PEB is a Qt development bundle version 5.2 or higher.  
 
-Compiling PEB on Windows is subject to the following restrictions:  
-
-* PEB source code is not MSVC-compatible and PEB can not be linked against ``QtWebEngine``.
-* Windows builds of PEB can only be compiled by a GCC-based MinGW Qt using the ``QtWebKit`` web engine.
-* ``QtWebKit`` can be added to MinGW Qt versions 5.6.x or higher from the [repository of Konstantin Tokarev (annulen)](https://github.com/annulen/webkit/releases).
+PEB on Windows can be compiled only with a GCC-based MinGW Qt versions 5.2 to 5.6.
 
 Compiled and tested successfully using:
 
@@ -27,30 +23,12 @@ qmake -qt=qt5
 make
 ```
 
-Please note that PEB builds using the standard ``QtWebKit`` web engine are single-process applications consuming less memory than PEB builds using the multiprocess ``QtWebEngine``.  
+Please note that PEB builds using the standard ``QtWebKit`` web engine are single-process applications and they consume less memory than PEB builds using the multiprocess ``QtWebEngine``.  
 
 ## Compile-Time Settings
 
 PEB compile-time settings can be changed by editing the ``src/peb.pro`` project file according to the following instructions.  
 
-* Updated QtWebKit  
-  To use ``QtWebKit`` or ``QtWebEngine`` depending on the Qt version, which is the default setting:  
-
-  ```QMake
-  ANNULEN_QTWEBKIT = 0
-  ```
-
-  The default web engine for Qt versions up to 5.5.x is ``QtWebKit``.  
-  The default web engine for Qt versions 5.6.x or higher is ``QtWebEngine``.
-
-  To use [an updated QtWebKit from the repository of Konstantin Tokarev (annulen)](https://github.com/annulen/webkit/releases) with a Qt version 5.6.x or higher:
-
-  ```QMake
-  ANNULEN_QTWEBKIT = 1
-  ```
-
-  Setting ``ANNULEN_QTWEBKIT`` to ``1`` has no effect on Qt versions 5.5.x or lower.  
-
 * Mac Bundle  
   To make a bundle-less binary, which is the default setting:  
 

resources/app/index-windows.html

@@ -131,7 +131,6 @@
         <a class="btn btn-primary" href="perl_info.script">Perl Basic Information</a>
         <a class="btn btn-primary" href="sqlite.script">SQLite Test</a>
         <a class="btn btn-primary" href="javascript:clearTestData();">Clear Test Data</a>
-        <a class="btn btn-primary" href="javascript:location.reload();">Reload</a>
         <a class="btn btn-primary" href="https://www.google.com/">Google</a>
         <a class="btn btn-primary" href="javascript:about();" role="button">About</a>
       </div>

resources/app/index.html

@@ -108,7 +108,6 @@
         <a class="btn btn-primary" href="perl_info.script">Perl Basic Information</a>
         <a class="btn btn-primary" href="sqlite.script">SQLite Test</a>
         <a class="btn btn-primary" href="javascript:clearTestData();">Clear Test Data</a>
-        <a class="btn btn-primary" href="javascript:location.reload();">Reload</a>
         <a class="btn btn-primary" href="https://www.google.com/">Google</a>
         <a class="btn btn-primary" href="javascript:about();" role="button">About</a>
       </div>

sdk/appimage-maker.sh

@@ -35,17 +35,19 @@ if [ $mode == "none" ]; then
   exit 1
 fi
 
-# If no PEB binary is found, it is compiled from source:
-if [ ! -e "$(pwd)/peb" ]; then
-  cd "$(pwd)/src" || exit
+# PEB binary is always compiled from sources:
+cd "$(pwd)/src" || exit
 
-  qmake -qt=qt5
-  make
+rm -rf tmp
+rm -f .qmake.stash
+rm -f Makefile
 
-  cd .. || exit
-fi
+qmake -qt=qt5
+make
+
+cd .. || exit
 
-# If no 'linuxdeployqt' is found, it is downloaded from web:
+# If no 'linuxdeployqt' is found, it is downloaded from the web:
 linuxdeployqt="linuxdeployqt-continuous-$(arch).AppImage"
 
 if [ ! -x "$linuxdeployqt" ]; then
@@ -78,6 +80,9 @@ if [ $mode == "no-resources" ]; then
   cp "$(pwd)/LICENSE.md" "$(pwd)/peb.app/LICENSE.md"
   cp "$(pwd)/README.md" "$(pwd)/peb.app/README.md"
 
+  # Version:
+  export VERSION="1.0.0"
+
   # AppImage creation:
   "$(pwd)/$linuxdeployqt" "--appimage-extract"
   "$(pwd)/squashfs-root/AppRun" "$(pwd)/peb.app/peb" -qmake='qmake -qt=qt5' -no-translations -appimage
@@ -117,7 +122,7 @@ if [ $mode == "include-resources" ]; then
   # AppImage metadata file:
   if [ -e "$(pwd)/resources/app/appimage/$appimage_name.appdata.xml" ]; then
     mkdir -p "$(pwd)/$appimage_name.app/usr/share/metainfo"
-    cp -f "$(pwd)/resources/app/$appimage_name.appdata.xml" "$(pwd)/$appimage_name.app/usr/share/metainfo/$appimage_name.appdata.xml"
+    cp -f "$(pwd)/resources/app/appimage/$appimage_name.appdata.xml" "$(pwd)/$appimage_name.app/usr/share/metainfo/$appimage_name.appdata.xml"
   fi
 
   # Documentation:
@@ -126,39 +131,15 @@ if [ $mode == "include-resources" ]; then
   cp "$(pwd)/LICENSE.md" "$(pwd)/$appimage_name.app/LICENSE.md"
   cp "$(pwd)/README.md" "$(pwd)/$appimage_name.app/README.md"
 
-  # Copying the contents of the 'resources' directory
-  # without its 'perl' subdirectory:
-  mkdir "$(pwd)/$appimage_name.app/resources/"
-
-  declare -a RESOURCES
-  RESOURCES=("$(ls --ignore=perl "$(pwd)"/resources)")
-
-  for RESOURCE in "${RESOURCES[@]}"; do
-  	cp -r "$(pwd)/resources/${RESOURCE}" "$(pwd)/$appimage_name.app/resources/${RESOURCE}";
-  done
-
-  # Relocatable Perl packing:
-  relocatable_perl="$(pwd)/resources/perl/bin/perl"
-  compactor_script="$(pwd)/sdk/compactor.pl"
-
-  if [ -e "$relocatable_perl" ]; then
-    printf "\\nGoing to compact the relocatable Perl for this copy of Perl Executing Browser.\\n"
-    "$relocatable_perl" "$compactor_script" "--appimage=$appimage_name"
-  else
-    printf "\\nRelocatable Perl is not found for this copy of Perl Executing Browser.\\n"
-  fi
+  # Resources:
+  cp -r "$(pwd)/resources" "$(pwd)/$appimage_name.app/resources"
 
   # File cleaning:
   rm -f "$(pwd)/$appimage_name.app/resources/app/$appimage_name.desktop"
   rm -f "$(pwd)/$appimage_name.app/resources/app/$appimage_name.appdata.xml"
 
-  # File cleaning for the 'peb-demo' package:
-  if [ "$appimage_name" == "peb-demo" ]; then
-    export VERSION="1.0.0"
-    rm -f "$(pwd)/$appimage_name.app/resources/app/index-windows.html"
-    rm -f "$(pwd)/$appimage_name.app/resources/app/perl-scripts/messenger.pl"
-    rm -f "$(pwd)/$appimage_name.app/resources/app/perl-scripts/interactive-windows.pl"
-  fi
+  # Version:
+  export VERSION="1.0.0"
 
   # AppImage creation:
   "$(pwd)/$linuxdeployqt" "--appimage-extract"