Skip to content

Commit

Permalink
Merge branch 'refs/heads/core4' into feature/object-viewer-widget-qt5
Browse files Browse the repository at this point in the history
  • Loading branch information
zerotacg committed Aug 27, 2024
2 parents 9a65759 + c5495f3 commit 5abec51
Show file tree
Hide file tree
Showing 396 changed files with 13,864 additions and 11,748 deletions.
78 changes: 78 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
FROM ubuntu:22.04

RUN apt update; \
DEBIAN_FRONTEND=noninteractive \
apt install --yes \
autoconf \
automake \
bison \
build-essential \
ccache \
clang-15 \
freeglut3-dev \
libavcodec-dev \
libavdevice-dev \
libavformat-dev \
libcpptest-dev \
libcurl4-openssl-dev \
libfreetype6-dev \
libgif-dev \
libgsf-1-dev \
libjpeg-dev \
liblua5.2-dev \
libluabind-dev \
liblzma-dev \
libmysqlclient-dev \
libogg-dev \
libopenal-dev \
libpng-dev \
libpostproc-dev \
libsquish-dev \
libssl-dev \
libswscale-dev \
libvorbis-dev \
libxml2-dev \
mingw-w64 \
mingw-w64-tools \
ninja-build \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
libqtpropertybrowser-dev \
qt6-base-dev \
qt6-l10n-tools \
qt6-tools-dev \
qt6-tools-dev-tools


RUN apt install --yes \
doxygen \
gdb \
git \
graphviz \
libxrandr-dev \
wget

# work arround as there is no debug version available
RUN cp /lib/x86_64-linux-gnu/libcpptest.so /lib/x86_64-linux-gnu/libcpptestd.so


ARG CMAKE_VERSION=3.27.9
ARG CMAKE_INSTALL_DIR=/opt/cmake-$CMAKE_VERSION
ARG USERNAME=ryzom
ARG USER_UID=1000
ARG USER_GID=$USER_UID

RUN wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh
RUN mkdir --parents "$CMAKE_INSTALL_DIR" \
&& sh /tmp/cmake.sh --skip-license --prefix="$CMAKE_INSTALL_DIR" \
&& ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/"* /usr/local/bin

RUN groupadd --gid $USER_GID $USERNAME \
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
&& apt-get update \
&& apt-get install --yes sudo \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME

USER $USERNAME
34 changes: 34 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"dockerfile": "Dockerfile"
},
"containerUser": "ryzom",
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools-extension-pack"
],
"settings": {
"cmake.configureArgs": [
"-DWITH_STATIC=ON",
"-DWITH_NEL_TESTS=OFF",
"-DWITH_NEL_SAMPLES=ON",
"-DWITH_LUA51=OFF",
"-DWITH_LUA52=ON",
"-DWITH_RYZOM=ON",
"-DWITH_RYZOM_SERVER=ON",
"-DWITH_RYZOM_CLIENT=ON",
"-DWITH_RYZOM_TOOLS=ON",
"-DWITH_NEL_TOOLS=ON",
"-DWITH_NELNS=ON",
"-DWITH_NELNS_LOGIN_SYSTEM=ON",
"-DWITH_NELNS_SERVER=ON",
"-DWITH_QT5=ON",
"-DWITH_LIBGSF=ON",
"-DWITH_MONGODB=OFF",
"-DWITH_PCH=OFF"
]
}
}
}
}
140 changes: 140 additions & 0 deletions .github/workflows/build-client.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
name: build client on multiple platforms

on:
push:
branches: [ "core4", "feature/*" ]
paths-ignore:
- '.github/workflows/**.yml'
- '!.github/workflows/build-client.yml'
pull_request:
branches: [ "core4" ]
paths-ignore:
- '.github/workflows/**.yml'
- '!.github/workflows/build-client.yml'

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false

matrix:
os:
- ubuntu-22.04
- ubuntu-20.04
- windows-2022
- windows-2019
- macos-13
- macos-12
include:
- os: windows-2022
cmake_preset: windows-client
- os: windows-2019
cmake_preset: windows-client
- os: ubuntu-22.04
ubuntu_version: 22.04
cmake_preset: linux-client
- os: ubuntu-20.04
ubuntu_version: 20.04
cmake_preset: linux-client
- os: macos-13
cmake_preset: macos-client
cmake_options: -DHUNTER_USE_CACHE_SERVERS=NO
- os: macos-12
cmake_preset: macos-client
cmake_options: -DHUNTER_USE_CACHE_SERVERS=NO

steps:
- uses: actions/checkout@v4
- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
id: strings
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
echo "hunter-dir=${{ github.workspace }}/.hunter" >> "$GITHUB_OUTPUT"
- uses: lukka/[email protected]
if: runner.os == 'Linux'
with:
cmakeVersion: 3.27.9

- name: Dependencies Linux
if: runner.os == 'Linux'
run: |
wget --quiet https://packages.microsoft.com/config/ubuntu/${{ matrix.ubuntu_version }}/packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt update
sudo apt remove --yes man-db
sudo apt update
sudo apt install -y --no-install-recommends \
libasound2-dev \
libgl1-mesa-dev \
libjack-dev \
libpulse-dev \
libxrandr-dev \
libxrender-dev \
libxxf86vm-dev \
libmsquic
wget https://raw.githubusercontent.com/microsoft/msquic/main/src/inc/msquic.h
wget https://raw.githubusercontent.com/microsoft/msquic/main/src/inc/msquic_posix.h
wget https://raw.githubusercontent.com/microsoft/msquic/main/src/inc/quic_sal_stub.h
sudo mv msquic.h msquic_posix.h quic_sal_stub.h /usr/include/
- uses: actions/cache/[email protected]
with:
path: ${{ steps.strings.outputs.hunter-dir }}
key: ${{ matrix.os }}-hunter

- uses: actions/cache/[email protected]
if: runner.os == 'Windows'
with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
key: ${{ matrix.os }}-chocolatey

- name: Dependencies Windows
if: runner.os == 'Windows'
run: |
choco install directx-sdk
- uses: actions/cache/save@v4
with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
key: ${{ matrix.os }}-chocolatey

- name: Configure CMake
env:
MACOSX_DEPLOYMENT_TARGET: 10.12
run: >
cmake --preset ${{ matrix.cmake_preset }}
${{ matrix.cmake_options }}
-DHUNTER_CONFIGURATION_TYPES=Release
-DHUNTER_ENABLED=ON
-DHUNTER_ROOT=${{ steps.strings.outputs.hunter-dir }}
-S ${{ github.workspace }}
- uses: actions/cache/save@v4
with:
path: ${{ steps.strings.outputs.hunter-dir }}
key: ${{ matrix.os }}-hunter

- name: Build
env:
MACOSX_DEPLOYMENT_TARGET: 10.12
run: cmake --build --preset client

- name: Package
run: cmake --build --preset client --target package

- uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: ${{ matrix.os }}-logs
path: build/**/*.log

- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-client-package
path: build/ryzomcore-*
if-no-files-found: error
118 changes: 118 additions & 0 deletions .github/workflows/build-studio.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
name: build studio

on:
push:
branches: [ "core4", "feature/*" ]
paths-ignore:
- '.github/workflows/**.yml'
- '!.github/workflows/build-studio.yml'
pull_request:
branches: [ "core4" ]
paths-ignore:
- '.github/workflows/**.yml'
- '!.github/workflows/build-studio.yml'

jobs:
strings:
runs-on: ubuntu-latest
outputs:
build-output-dir: ${{ steps.strings.outputs.build-output-dir }}
steps:
- name: Set reusable strings
id: strings
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
build:
needs:
- strings
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Dependencies
run: |
sudo apt update
sudo apt install --yes software-properties-common
sudo apt update
sudo apt install --yes \
cmake build-essential ninja-build ccache \
bison autoconf automake \
libpng-dev \
libjpeg-dev \
libgif-dev libfreetype6-dev \
freeglut3-dev \
liblua5.2-dev libluabind-dev libcpptest-dev \
libogg-dev libvorbis-dev libopenal-dev \
libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev \
libmysqlclient-dev \
libxml2-dev \
libcurl4-openssl-dev libssl-dev \
libsquish-dev \
liblzma-dev \
libgsf-1-dev \
qtbase5-dev qttools5-dev qttools5-dev-tools libqtpropertybrowser-dev
- name: Configure CMake
run: >
cmake -B ${{ needs.strings.outputs.build-output-dir }}
-G "Ninja"
-DWITH_QT5=ON
-DWITH_STUDIO=ON
-DWITH_RYZOM=OFF
-DWITH_NEL_TOOLS=OFF
-DWITH_NEL_SAMPLES=OFF
-DWITH_NEL_TESTS=OFF
-S ${{ github.workspace }}
- name: Build
run: cmake --build ${{ needs.strings.outputs.build-output-dir }} --target studio

build-static:
needs:
- strings
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Dependencies
run: |
sudo apt update
sudo apt install --yes software-properties-common
sudo apt update
sudo apt install --yes \
cmake build-essential ninja-build ccache \
bison autoconf automake \
libpng-dev \
libjpeg-dev \
libgif-dev libfreetype6-dev \
freeglut3-dev \
liblua5.2-dev libluabind-dev libcpptest-dev \
libogg-dev libvorbis-dev libopenal-dev \
libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev \
libmysqlclient-dev \
libxml2-dev \
libcurl4-openssl-dev libssl-dev \
libsquish-dev \
liblzma-dev \
libgsf-1-dev \
qtbase5-dev qttools5-dev qttools5-dev-tools libqtpropertybrowser-dev
- name: Configure CMake
run: >
cmake -B ${{ needs.strings.outputs.build-output-dir }}
-G "Ninja"
-DWITH_QT5=ON
-DWITH_STUDIO=ON
-DWITH_STATIC=ON
-DWITH_RYZOM=OFF
-DWITH_NEL_TOOLS=OFF
-DWITH_NEL_SAMPLES=OFF
-DWITH_NEL_TESTS=OFF
-S ${{ github.workspace }}
- name: Build
run: cmake --build ${{ needs.strings.outputs.build-output-dir }} --target studio
Loading

0 comments on commit 5abec51

Please sign in to comment.