summaryrefslogtreecommitdiffstats
path: root/.ci/scripts
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x.ci/scripts/clang/docker.sh3
-rw-r--r--.ci/scripts/clang/exec.sh3
-rwxr-xr-x.ci/scripts/clang/upload.sh3
-rw-r--r--.ci/scripts/common/post-upload.sh7
-rw-r--r--.ci/scripts/common/pre-upload.sh3
-rw-r--r--.ci/scripts/format/docker.sh3
-rw-r--r--.ci/scripts/format/exec.sh3
-rw-r--r--.ci/scripts/format/script.sh3
-rwxr-xr-x.ci/scripts/linux/docker.sh6
-rw-r--r--.ci/scripts/linux/exec.sh3
-rwxr-xr-x.ci/scripts/linux/upload.sh3
-rw-r--r--.ci/scripts/merge/apply-patches-by-label-private.py3
-rw-r--r--.ci/scripts/merge/apply-patches-by-label.py3
-rw-r--r--.ci/scripts/merge/check-label-presence.py3
-rw-r--r--.ci/scripts/merge/yuzubot-git-config.sh3
-rwxr-xr-x.ci/scripts/transifex/docker.sh3
-rwxr-xr-x.ci/scripts/windows/docker.sh3
-rw-r--r--.ci/scripts/windows/exec.sh3
-rw-r--r--.ci/scripts/windows/scan_dll.py3
-rw-r--r--.ci/scripts/windows/upload.ps112
-rwxr-xr-x.ci/scripts/windows/upload.sh3
21 files changed, 73 insertions, 6 deletions
diff --git a/.ci/scripts/clang/docker.sh b/.ci/scripts/clang/docker.sh
index db736f72b..792ef4aa8 100755
--- a/.ci/scripts/clang/docker.sh
+++ b/.ci/scripts/clang/docker.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Exit on error, rather than continuing with the rest of the script.
set -e
diff --git a/.ci/scripts/clang/exec.sh b/.ci/scripts/clang/exec.sh
index a213aac27..664fce5f8 100644
--- a/.ci/scripts/clang/exec.sh
+++ b/.ci/scripts/clang/exec.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
mkdir -p "ccache" || true
chmod a+x ./.ci/scripts/clang/docker.sh
# the UID for the container yuzu user is 1027
diff --git a/.ci/scripts/clang/upload.sh b/.ci/scripts/clang/upload.sh
index fe4e6b2ac..0b4b3e330 100755
--- a/.ci/scripts/clang/upload.sh
+++ b/.ci/scripts/clang/upload.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
. .ci/scripts/common/pre-upload.sh
REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh
index a4e3070fd..7f910b2b3 100644
--- a/.ci/scripts/common/post-upload.sh
+++ b/.ci/scripts/common/post-upload.sh
@@ -1,11 +1,14 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Copy documentation
-cp license.txt "$DIR_NAME"
+cp LICENSE.txt "$DIR_NAME"
cp README.md "$DIR_NAME"
if [[ -z "${NO_SOURCE_PACK}" ]]; then
- tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
+ tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md LICENSE.txt
cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
fi
diff --git a/.ci/scripts/common/pre-upload.sh b/.ci/scripts/common/pre-upload.sh
index a49e3fff3..705362a3c 100644
--- a/.ci/scripts/common/pre-upload.sh
+++ b/.ci/scripts/common/pre-upload.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
GITREV="`git show -s --format='%h'`"
ARTIFACTS_DIR="artifacts"
diff --git a/.ci/scripts/format/docker.sh b/.ci/scripts/format/docker.sh
index 778411e4a..a0f7a61cc 100644
--- a/.ci/scripts/format/docker.sh
+++ b/.ci/scripts/format/docker.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Run clang-format
cd /yuzu
chmod a+x ./.ci/scripts/format/script.sh
diff --git a/.ci/scripts/format/exec.sh b/.ci/scripts/format/exec.sh
index c50e90d66..40ab41abd 100644
--- a/.ci/scripts/format/exec.sh
+++ b/.ci/scripts/format/exec.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
chmod a+x ./.ci/scripts/format/docker.sh
# the UID for the container yuzu user is 1027
sudo chown -R 1027 ./
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh
index c2550c966..119abae6a 100644
--- a/.ci/scripts/format/script.sh
+++ b/.ci/scripts/format/script.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \
dist/*.svg dist/*.xml; then
echo Trailing whitespace found, aborting
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index 436155b3d..b9862d1c2 100755
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Exit on error, rather than continuing with the rest of the script.
set -e
@@ -51,6 +54,9 @@ mkdir -p AppDir/usr/optional/libgcc_s
# Deploy yuzu's needed dependencies
./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt
+# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
+find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
+
# Workaround for building yuzu with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
# See https://github.com/darealshinji/AppImageKit-checkrt
cp exec-x86_64.so AppDir/usr/optional/exec.so
diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh
index 78e8aeabf..fa3d78cc2 100644
--- a/.ci/scripts/linux/exec.sh
+++ b/.ci/scripts/linux/exec.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
mkdir -p "ccache" || true
chmod a+x ./.ci/scripts/linux/docker.sh
# the UID for the container yuzu user is 1027
diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh
index 3f2c2f208..8173c5728 100755
--- a/.ci/scripts/linux/upload.sh
+++ b/.ci/scripts/linux/upload.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
. .ci/scripts/common/pre-upload.sh
APPIMAGE_NAME="yuzu-${GITDATE}-${GITREV}.AppImage"
diff --git a/.ci/scripts/merge/apply-patches-by-label-private.py b/.ci/scripts/merge/apply-patches-by-label-private.py
index 16b45043e..c640c4c4d 100644
--- a/.ci/scripts/merge/apply-patches-by-label-private.py
+++ b/.ci/scripts/merge/apply-patches-by-label-private.py
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Download all pull requests as patches that match a specific label
# Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to>
diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py
index c288a70a1..8ddc8ff34 100644
--- a/.ci/scripts/merge/apply-patches-by-label.py
+++ b/.ci/scripts/merge/apply-patches-by-label.py
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Download all pull requests as patches that match a specific label
# Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to>
diff --git a/.ci/scripts/merge/check-label-presence.py b/.ci/scripts/merge/check-label-presence.py
index 048466d7e..51cf68129 100644
--- a/.ci/scripts/merge/check-label-presence.py
+++ b/.ci/scripts/merge/check-label-presence.py
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Checks to see if the specified pull request # has the specified tag
# Usage: python check-label-presence.py <Pull Request ID> <Name of Label>
diff --git a/.ci/scripts/merge/yuzubot-git-config.sh b/.ci/scripts/merge/yuzubot-git-config.sh
index d9d595bbc..d7f1f29db 100644
--- a/.ci/scripts/merge/yuzubot-git-config.sh
+++ b/.ci/scripts/merge/yuzubot-git-config.sh
@@ -1,2 +1,5 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
git config --global user.email "yuzu@yuzu-emu.org"
git config --global user.name "yuzubot" \ No newline at end of file
diff --git a/.ci/scripts/transifex/docker.sh b/.ci/scripts/transifex/docker.sh
index 05e1a98f5..6237b3f73 100755
--- a/.ci/scripts/transifex/docker.sh
+++ b/.ci/scripts/transifex/docker.sh
@@ -1,5 +1,8 @@
#!/bin/bash -e
+# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
# Setup RC file for tx
cat << EOF > ~/.transifexrc
[https://www.transifex.com]
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index 9f34530d6..790ba8218 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
set -e
#cd /yuzu
diff --git a/.ci/scripts/windows/exec.sh b/.ci/scripts/windows/exec.sh
index bf5c5fb63..ca74eeba5 100644
--- a/.ci/scripts/windows/exec.sh
+++ b/.ci/scripts/windows/exec.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
mkdir -p "ccache" || true
chmod a+x ./.ci/scripts/windows/docker.sh
# the UID for the container yuzu user is 1027
diff --git a/.ci/scripts/windows/scan_dll.py b/.ci/scripts/windows/scan_dll.py
index 163183f2e..f374e0d78 100644
--- a/.ci/scripts/windows/scan_dll.py
+++ b/.ci/scripts/windows/scan_dll.py
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
import pefile
import sys
import re
diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1
index ac2a38f1d..f2368be6f 100644
--- a/.ci/scripts/windows/upload.ps1
+++ b/.ci/scripts/windows/upload.ps1
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
param($BUILD_NAME)
$GITDATE = $(git show -s --date=short --format='%ad') -replace "-", ""
@@ -40,7 +43,7 @@ mkdir $MSVC_SOURCE
mkdir "artifacts"
# Build a tar.xz for the source of the release
-Copy-Item .\license.txt -Destination $MSVC_SOURCE
+Copy-Item .\LICENSE.txt -Destination $MSVC_SOURCE
Copy-Item .\README.md -Destination $MSVC_SOURCE
Copy-Item .\CMakeLists.txt -Destination $MSVC_SOURCE
Copy-Item .\src -Recurse -Destination $MSVC_SOURCE
@@ -54,6 +57,10 @@ Copy-Item .\CMakeModules -Recurse -Destination $MSVC_SOURCE
if ("$env:GITHUB_ACTIONS" -eq "true") {
echo "Hello GitHub Actions"
+ # With vcpkg we now have a few more dll files
+ ls .\build\bin\*.dll
+ cp .\build\bin\*.dll .\artifacts\
+
# Hopefully there is an exe in either .\build\bin or .\build\bin\Release
cp .\build\bin\yuzu*.exe .\artifacts\
Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse
@@ -109,6 +116,3 @@ Get-ChildItem . -Filter "*.zip" | Copy-Item -destination "artifacts"
Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts"
Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts"
}
-# Extra items
-git status
-cp .\build\src\common\scm_rev.cpp .\artifacts
diff --git a/.ci/scripts/windows/upload.sh b/.ci/scripts/windows/upload.sh
index 3c6a74218..4aa5be544 100755
--- a/.ci/scripts/windows/upload.sh
+++ b/.ci/scripts/windows/upload.sh
@@ -1,5 +1,8 @@
#!/bin/bash -ex
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
. .ci/scripts/common/pre-upload.sh
REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}"