Merge pull request #1 from scp-fs2open/master

Updating

Author: Kiloku

.clang-tidy

@@ -11,6 +11,7 @@ misc-*,\
 -misc-macro-parentheses,\
 -misc-misplaced-widening-cast,\
 -misc-static-assert,\
+-misc-unused-parameters,\
 -modernize-make-unique,\
 "
 WarningsAsErrors: ''

.github/workflows/pr-workflow.yaml

@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         configuration: [Debug, Release]
-        compiler: [gcc-5, gcc-8, clang-4.0]
-    name: Check Linux compilation
+        compiler: [gcc-5, gcc-9, clang-4.0]
+    name: Linux
     runs-on: ubuntu-16.04
     steps:
       - name: Prepare Environment
@@ -19,7 +19,7 @@ jobs:
           sudo add-apt-repository ppa:beineri/opt-qt571-xenial
           sudo add-apt-repository ppa:msulikowski/valgrind # For fixing a bug with valgrind 3.11 which does not recognize the rdrand instruction
           sudo apt-get -yq update
-          sudo apt-get -yq install cmake ninja-build libopenal-dev libreadline6-dev libpng12-dev libjpeg62-dev liblua5.1-0-dev libjansson-dev libsdl2-dev libfreetype6-dev valgrind qt57base g++-5 g++-8 clang-4.0 clang-tidy-4.0 libc++-dev libc++abi-dev
+          sudo apt-get -yq install cmake ninja-build libopenal-dev libreadline6-dev libpng12-dev libjpeg62-dev liblua5.1-0-dev libjansson-dev libsdl2-dev libfreetype6-dev valgrind qt57base g++-5 g++-9 clang-4.0 clang-tidy-4.0 libc++-dev libc++abi-dev
           # Fix a header bug present in ubuntu...
           sudo ln -s /usr/include/libcxxabi/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h
       - uses: actions/checkout@v1
@@ -35,9 +35,9 @@ jobs:
             export CC=gcc-5
             export CXX=g++-5
           fi
-          if [ "$COMPILER" = "gcc-8" ]; then
-            export CC=gcc-8
-            export CXX=g++-8
+          if [ "$COMPILER" = "gcc-9" ]; then
+            export CC=gcc-9
+            export CXX=g++-9
           fi
           if [ "$COMPILER" = "clang-4.0" ]; then
             export CC=clang-4.0
@@ -85,7 +85,7 @@ jobs:
           - configuration: Release
             compiler: MinGW
             arch: x64
-    name: Check Windows compilation
+    name: Windows
     runs-on: windows-2019
     steps:
       - name: Prepare Environment
@@ -120,9 +120,18 @@ jobs:
         run: |
           if [ "$COMPILER" = "MinGW" ]; then
               cmake --build . --config "$CONFIGURATION"
-             ./bin/unittests --gtest_shuffle
           else
               cmake --build . --config "$CONFIGURATION" -- /verbosity:minimal
+          fi
+      - name: Run Tests
+        working-directory: ./build
+        env:
+          CONFIGURATION: ${{ matrix.configuration }}
+          COMPILER: ${{ matrix.compiler }}
+        shell: bash
+        run: |
+          if [ "$COMPILER" = "MinGW" ]; then
+             ./bin/unittests --gtest_shuffle
+          else
               "./bin/$CONFIGURATION/unittests" --gtest_shuffle
           fi
-

.travis.yml

@@ -1,6 +1,6 @@
 language: bash
 sudo: required
-dist: trusty
+dist: xenial
 cache:
   directories:
     - $HOME/cmake-3.8
@@ -18,7 +18,6 @@ addons:
       - libjansson-dev
       - libsdl2-dev
       - libfreetype6-dev
-      - valgrind
       - qt57base
   coverity_scan:
     project:
@@ -73,33 +72,34 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
             - *global_deps
             - g++-5
     - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-8 CXX=g++-8
+      env: CONFIGURATION="Debug" CC=gcc-9 CXX=g++-9
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
-            - g++-8
+            - g++-9
             - *global_deps
     - os: linux
       env: CONFIGURATION="Debug" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - llvm-toolchain-xenial-8
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
             - *global_deps
             - clang-4.0
-            - clang-tidy-4.0
+            - clang-tidy-8
             - libc++-dev
+            - libc++abi-dev
       script:
         - ./ci/travis/script.sh
         - ./ci/travis/clang_tidy.sh
@@ -117,32 +117,33 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
             - *global_deps
             - g++-5
     - os: linux
-      env: CONFIGURATION="Release" CC=gcc-8 CXX=g++-8
+      env: CONFIGURATION="Release" CC=gcc-9 CXX=g++-9
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
-            - g++-8
+            - g++-9
             - *global_deps
     - os: linux
       env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
+            - llvm-toolchain-xenial-4
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
           packages:
             - *global_deps
             - clang-4.0
             - libc++-dev
+            - libc++abi-dev
     - os: osx
       env: CONFIGURATION="Release"
 

ci/travis/before_install.sh

@@ -3,8 +3,11 @@
 set -ex
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    # Nothing to do here
-    :
+    export DEBIAN_FRONTEND=noninteractive
+
+    sudo add-apt-repository -y "ppa:msulikowski/valgrind" # For fixing a bug with valgrind 3.11 which does not recognize the rdrand instruction
+    sudo apt-get -yq update
+    sudo apt-get -yq install valgrind
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     # Nothing to do here
     :

ci/travis/clang_tidy.sh

@@ -13,7 +13,7 @@ echo "Running clang-tidy on changed files"
 git diff -U0 --no-color $TRAVIS_COMMIT_RANGE | \
     $TRAVIS_BUILD_DIR/ci/travis/clang-tidy-diff.py -path "$TRAVIS_BUILD_DIR/build" -p1 \
     -regex 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$|tools/.*' \
-    -clang-tidy-binary /usr/bin/clang-tidy-4.0 2>/dev/null | \
+    -clang-tidy-binary /usr/bin/clang-tidy-8 2>/dev/null | \
     tee clang-tidy-output.txt
 
 if [[ -n $(grep "warning: " clang-tidy-output.txt) ]] || [[ -n $(grep "error: " clang-tidy-output.txt) ]]; then

ci/travis/install.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -ex
 
@@ -11,7 +11,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     	wget -O /tmp/cmake.tar.gz --no-check-certificate https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz
     	tar -xzf /tmp/cmake.tar.gz -C $HOME/cmake-3.8/ --strip-components=1
     fi
-	export PATH=$HOME/cmake-3.8/bin:$PATH
+    export PATH=$HOME/cmake-3.8/bin:$PATH
 
     cd $HOME
 
@@ -22,6 +22,11 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
         wget -O linuxdeployqt -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" # (64-bit)
         chmod a+x ./linuxdeployqt
     fi
+
+    if [[ "$CC" =~ ^clang.*$ ]]; then
+      # Fix a header bug present in ubuntu...
+      sudo ln -s /usr/include/libcxxabi/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h
+    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     gem install xcpretty
 

ci/travis/valgrind.supp

@@ -126,4 +126,39 @@
    fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
    fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
 }
-
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:_dl_signal_error
+   fun:_dl_open
+   fun:dlopen_doit
+   fun:_dl_catch_error
+   fun:_dlerror_run
+   fun:dlopen@@GLIBC_2.2.5
+   obj:*
+   obj:*
+   fun:call_init.part.0
+   fun:call_init
+   fun:_dl_init
+   fun:dl_open_worker
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:_dl_signal_error
+   fun:_dl_open
+   fun:dlopen_doit
+   fun:_dl_catch_error
+   fun:_dlerror_run
+   fun:dlopen@@GLIBC_2.2.5
+   obj:*
+   obj:*
+   fun:call_init.part.0
+   fun:call_init
+   fun:_dl_init
+   fun:dl_open_worker
+}

cmake/platform-win32.cmake

@@ -8,7 +8,7 @@ SET(WIN32_LIBS
 	odbccp32
 	vfw32
 	winmm
-	wsock32
+	ws2_32
 	psapi
 )
 

code/ai/ai_profiles.cpp

@@ -517,10 +517,6 @@ void parse_ai_profiles_tbl(const char *filename)
 		mprintf(("TABLES: Unable to parse '%s'!  Error message = %s.\n", (filename) ? filename : "<default ai_profiles.tbl>", e.what()));
 		return;
 	}
-
-	// add tbl/tbm to multiplayer validation list
-	extern void fs2netd_add_table_validation(const char *tblname);
-	fs2netd_add_table_validation(filename);
 }
 
 void ai_profiles_init()

code/ai/aicode.cpp

@@ -58,6 +58,7 @@
 #include "physics/physics.h"
 #include "playerman/player.h"
 #include "render/3d.h"
+#include "scripting/api/objs/waypoint.h"
 #include "scripting/api/objs/wing.h"
 #include "scripting/scripting.h"
 #include "ship/afterburner.h"
@@ -4594,8 +4595,9 @@ void ai_waypoints()
 				// adds scripting hook for 'On Waypoints Done' --wookieejedi
 				Script_system.SetHookObject("Ship", &Objects[Ships[Pl_objp->instance].objnum]);
 				Script_system.SetHookVar("Wing", 'o', scripting::api::l_Wing.Set(Ships[Pl_objp->instance].wingnum));
+				Script_system.SetHookVar("Waypointlist", 'o', scripting::api::l_WaypointList.Set(scripting::api::waypointlist_h(aip->wp_list)));
 				Script_system.RunCondition(CHA_ONWAYPOINTSDONE);
-				Script_system.RemHookVars(2, "Ship", "Wing");
+				Script_system.RemHookVars(3, "Ship", "Wing", "Waypointlist");
 			}
 		}
 	}