upstream merge

.github/ISSUE_TEMPLATE/defect-report.md

@@ -0,0 +1,26 @@
+---
+name: Defect report
+about: Create a report to help us improve
+
+---
+
+**Describe the problem**
+A clear and concise description of what the problem is.
+
+**Versions**
+Which PhantomJS version? Tip: run `phantomjs --version`
+Which OS: Linux, Windows, macOS?
+
+**Steps to Reproduce**
+1.
+2.
+3.
+
+**Actual behavior**
+What you observed.
+
+**Expected behavior**
+What you expected to happen instead.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/website-incompatibility.md

@@ -0,0 +1,17 @@
+---
+name: Website incompatibility
+about: Report a website not working properly
+
+---
+
+**Summary**
+A concise description of the compatibility issue.
+
+**Test cases**
+Any URL or other web page that demonstrates the problem.
+
+**Initial analysis**
+If you did a preliminary troubleshooting, please share your finding.
+
+**Additional context**
+Add any other context or screenshots about the problem.

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 15
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - meta
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: false
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  Due to our very limited maintenance capacity, we need to prioritize our development focus on other tasks.
+  Therefore, this issue will be automatically closed (see #15395 for more details).
+  In the future, if we see the need to attend to this issue again, then it will be reopened.
+  Thank you for your contribution!

.github/workflows/amd64_linux_clang.yml

@@ -0,0 +1,20 @@
+name: amd64_linux_clang
+
+on: [push, pull_request]
+
+jobs:
+
+  amd64_linux_clang:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt -y -qq update
+    - run: sudo apt install -y clang cmake qt5-default libqt5webkit5-dev python
+      name: Install requirements
+    - run: clang++ --version && cmake --version && qmake --version && python --version
+      name: Display tools version
+    - run: CC=clang CXX=clang++ ./configure
+    - run: make
+    - run: file ./bin/phantomjs
+    - run: ./bin/phantomjs --version
+    - run: make check

.github/workflows/amd64_linux_gcc.yml

@@ -0,0 +1,21 @@
+name: amd64_linux_gcc
+
+on: [push, pull_request]
+
+jobs:
+
+  amd64_linux_gcc:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt -y -qq update
+    - run: sudo apt install -y g++ cmake qt5-default libqt5webkit5-dev python
+      name: Install requirements
+    - run: g++ --version && cmake --version && qmake --version && python --version
+      name: Display tools version
+    - run: ./configure
+    - run: make
+    - run: file ./bin/phantomjs
+    - run: ./bin/phantomjs --version
+    - run: make check
+

.github/workflows/amd64_windows_clang.yml

@@ -0,0 +1,31 @@
+name: amd64_windows_clang
+
+on: [push, pull_request]
+
+jobs:
+
+  amd64_windows_clang:
+    runs-on: windows-2019
+    env:
+      CC: clang
+      CXX: clang++
+    steps:
+    - uses: actions/checkout@v2
+    - run: echo "::add-path::C:\\msys64\\usr\\bin"
+    - run: pacman --version
+    - run: pacman -Sy
+    - run: pacman --noconfirm -S pacman-mirrors
+    - name: 'Install requirements'
+      run: pacman --noconfirm -S mingw64/mingw-w64-x86_64-clang mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-qtwebkit mingw64/mingw-w64-x86_64-python2
+    - run: echo "::add-path::C:\\msys64\\mingw64\\bin"
+    - run: clang++ --version && cmake --version && qmake --version
+      name: 'Display tools version'
+    - run: bash ./configure
+      name: './configure'
+      env:
+        CMAKE_CMD: 'cmake -G "MinGW Makefiles"'
+    - run: mingw32-make
+      name: 'make'
+    - run: file ./bin/phantomjs
+    - run: ldd ./bin/phantomjs
+    - run: ./bin/phantomjs --version

.github/workflows/amd64_windows_gcc.yml

@@ -0,0 +1,30 @@
+name: amd64_windows_gcc
+
+on: [push, pull_request]
+
+jobs:
+
+  amd64_windows_gcc:
+    runs-on: windows-2019
+    env:
+      CC: gcc
+    steps:
+    - uses: actions/checkout@v2
+    - run: echo "::add-path::C:\\msys64\\usr\\bin"
+    - run: pacman --version
+    - run: pacman -Sy
+    - run: pacman --noconfirm -S pacman-mirrors
+    - name: 'Install requirements'
+      run: pacman --noconfirm -S mingw64/mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-qtwebkit mingw64/mingw-w64-x86_64-python2
+    - run: echo "::add-path::C:\\msys64\\mingw64\\bin"
+    - run: g++ --version && cmake --version && qmake --version
+      name: 'Display tools version'
+    - run: bash ./configure
+      name: './configure'
+      env:
+        CMAKE_CMD: 'cmake -G "MinGW Makefiles"'
+    - run: mingw32-make
+      name: 'make'
+    - run: file ./bin/phantomjs
+    - run: ldd ./bin/phantomjs
+    - run: ./bin/phantomjs --version

.github/workflows/codestyle.yml

@@ -0,0 +1,18 @@
+name: Code style
+
+on: [push, pull_request]
+
+jobs:
+
+  codestyle:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt install -y clang-format-6.0
+      name: Install clang-format
+    - run: clang-format-6.0 --version
+    - run: bash ./tools/format-code.sh
+      name: Run code formatter
+    - run: git diff
+    - run: git diff --quiet HEAD
+      name: Check if the styling guide is followed

.github/workflows/i686_windows_gcc.yml

@@ -0,0 +1,30 @@
+name: i686_windows_gcc
+
+on: [push, pull_request]
+
+jobs:
+
+  i686_windows_gcc:
+    runs-on: windows-2019
+    env:
+      CC: i686-w64-mingw32-gcc
+    steps:
+    - uses: actions/checkout@v2
+    - run: echo "::add-path::C:\\msys64\\usr\\bin"
+    - run: pacman --version
+    - run: pacman -Sy
+    - run: pacman --noconfirm -S pacman-mirrors
+    - name: 'Install requirements'
+      run: pacman --noconfirm -S mingw-w64-cross-toolchain mingw32/mingw-w64-i686-cmake mingw32/mingw-w64-i686-qtwebkit mingw32/mingw-w64-i686-python2
+    - run: echo "::add-path::C:\\msys64\\mingw32\\bin"
+    - run: i686-w64-mingw32-gcc --version && cmake --version && qmake --version
+      name: 'Display tools version'
+    - run: bash ./configure
+      name: './configure'
+      env:
+        CMAKE_CMD: 'cmake -G "MinGW Makefiles"'
+    - run: mingw32-make
+      name: 'make'
+    - run: file ./bin/phantomjs
+    - run: ldd ./bin/phantomjs
+    - run: ./bin/phantomjs --version

.gitignore

@@ -60,3 +60,18 @@ bin/
 *.class
 build/
 .gradle/
+
+# CMake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+*_autogen
+

CMakeLists.txt

@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 3.5.0)
+project(phantomjs)
+
+set (CMAKE_CXX_STANDARD 11)
+
+find_package(Qt5 COMPONENTS Core Network WebKitWidgets REQUIRED)
+find_package(Threads REQUIRED)
+
+message("Using Qt version ${Qt5Core_VERSION}")
+if (Qt5Core_VERSION VERSION_LESS 5.5.0)
+  message(FATAL_ERROR "This version of Qt is not supported. Please use Qt 5.5 or later")
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+file(GLOB_RECURSE PHANTOMJS_SOURCES src/*.cpp)
+include_directories(src)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(THIRDPARTY_SOURCES src/mongoose/mongoose.c src/qcommandline/qcommandline.cpp src/linenoise/src/linenoise.c)
+include_directories(src/linenoise/src)
+include_directories(src/mongoose)
+include_directories(src/qcommandline)
+
+if (WIN32)
+  set(EXTRA_LIBS ws2_32)
+  add_definitions(-DQCOMMANDLINE_STATIC)
+else()
+  set(EXTRA_LIBS dl)
+endif()
+
+add_executable(${PROJECT_NAME} src/phantomjs.qrc ${PHANTOMJS_SOURCES} ${THIRDPARTY_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${EXTRA_LIBS} Qt5::Core Qt5::Network Qt5::WebKitWidgets Threads::Threads)
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
+add_custom_target(check COMMAND python test/run-tests.py -v)

CONTRIBUTING.md

@@ -37,6 +37,8 @@ For your proposed change, you need to have:
 * **an issue** (in the issue tracker) which describe your bug or feature
 * **a feature branch** in your git fork
 
+Make sure your code change follows the style guide. To format your code, run `./tools/format-code.sh`.
+
 ### Refer the Issue
 
 The commit message needs to link to the issue. This cross-reference is [very important](http://ariya.ofilabs.com/2012/01/small-scale-software-craftsmanship.html) for the following reasons.