Merge branch 'main' into v1.0.0-rc.4-dev

Author: rodlie

docs

@@ -411,6 +411,7 @@ endif()
 
 if(UNIX AND NOT APPLE)
     option(INSTALL_DOCS "Install documentation on Linux/BSD" ON)
+    #option(INSTALL_OFFLINE_DOCS "Install offline documentation on Linux/BSD" OFF)
     target_link_libraries(
         ${PROJECT_NAME}
         PRIVATE
@@ -487,11 +488,13 @@ if(UNIX AND NOT APPLE)
             DESTINATION
             ${CMAKE_INSTALL_DOCDIR}
         )
-        install(
-            DIRECTORY
-            ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/offline/
-            DESTINATION
-            ${CMAKE_INSTALL_DOCDIR}/html
-        )
+        #if(${INSTALL_OFFLINE_DOCS})
+        #    install(
+        #        DIRECTORY
+        #        ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/offline/
+        #        DESTINATION
+        #        ${CMAKE_INSTALL_DOCDIR}/html
+        #    )
+        #endif()
     endif()
 endif()

src/app/CMakeLists.txt

@@ -1474,7 +1474,7 @@ void AppSupport::setFont(const QString &path)
 
 QString AppSupport::getOfflineDocs()
 {
-#ifdef Q_OS_LINUX
+/*#ifdef Q_OS_LINUX
     if (isFlatpak()) {
         // we can't have offline docs in a flatpak
         return QString();
@@ -1486,7 +1486,8 @@ QString AppSupport::getOfflineDocs()
     for (const auto &path : paths) {
         qDebug() << "Checking for docs ..." << path;
         if (QFile::exists(path)) { return path; }
-    }
+    }*/
+    // offline docs are currently disabled
     return QString();
 }
 

src/core/appsupport.cpp

@@ -6,8 +6,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+# This is just a run_docker.sh wrapper for GitHub Actions CI
+
 set -e -x
 
 CWD=`pwd`
@@ -26,29 +27,9 @@ COMMIT=${COMMIT:-`git rev-parse --short=8 HEAD`}
 BRANCH=${BRANCH:-`git rev-parse --abbrev-ref HEAD`}
 CUSTOM=${CUSTOM:-"CI"}
 HEAD_REPO_URL=${HEAD_REPO_URL:-""}
-
 REL=${REL:-0}
-APPIMG=20240401
-SDK=1.0.0
-URL=https://github.com/friction2d/friction-sdk/releases/download/v${SDK}
-APPIMAGE_TAR=friction-appimage-tools-${APPIMG}.tar.xz
-SDK_TAR=friction-sdk-${SDK}r9-linux-x86_64.tar.xz
-
-mkdir -p distfiles/sdk || true
-
-cd distfiles
-if [ ! -d "linux" ]; then
-    if [ ! -f "${APPIMAGE_TAR}" ]; then
-        wget ${URL}/${APPIMAGE_TAR}
-    fi
-    tar xvf ${APPIMAGE_TAR}
-fi
-
-cd sdk
-if [ ! -f "${SDK_TAR}" ]; then
-    wget ${URL}/${SDK_TAR}
-fi
-
-cd ${CWD}
+DOWNLOAD_SDK=${DOWNLOAD_SDK:-1}
+SDK_VERSION=${SDK_VERSION:-"1.0.0"}
+SDK_REV=${SDK_REV:-"r11"}
 
-HEAD_REPO_URL=${HEAD_REPO_URL} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} CUSTOM=${CUSTOM} ./src/scripts/run_docker.sh
+SDK_VERSION=${SDK_VERSION} SDK_REV=${SDK_REV} DOWNLOAD_SDK=${DOWNLOAD_SDK} HEAD_REPO_URL=${HEAD_REPO_URL} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} CUSTOM=${CUSTOM} ./src/scripts/run_docker.sh

src/scripts/build.sh

@@ -84,17 +84,19 @@ macdeployqt src/app/Friction.app
 rm -f src/app/Friction.app/Contents/Frameworks/{libQt5MultimediaWidgets.5.dylib,libQt5Svg.5.dylib}
 rm -rf src/app/Friction.app/Contents/PlugIns/{bearer,iconengines,imageformats,mediaservice,printsupport,styles}
 
-if [ -f "${CWD}/docs/offline/index.html" ]; then
-    cp -a ${CWD}/docs/offline src/app/Friction.app/Contents/Resources/docs
-fi
+# disable offline docs for now
+#if [ -f "${CWD}/docs/offline/index.html" ]; then
+#    cp -a ${CWD}/docs/offline src/app/Friction.app/Contents/Resources/docs
+#fi
 
 mkdir dmg
 mv src/app/Friction.app dmg/
 (cd dmg ; ln -sf /Applications Applications)
 
-if [ -f "${CWD}/docs/offline/index.html" ]; then
-    (cd dmg ; ln -sf Friction.app/Contents/Resources/docs/index.html Documentation.html)
-fi
+# disable offline docs for now
+#if [ -f "${CWD}/docs/offline/index.html" ]; then
+#    (cd dmg ; ln -sf Friction.app/Contents/Resources/docs/index.html Documentation.html)
+#fi
 
 # https://github.com/actions/runner-images/issues/7522
 max_tries=10

src/scripts/build_mac.sh

@@ -6,8 +6,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,29 +29,53 @@ COMMIT=${COMMIT:-""}
 TAG=${TAG:-""}
 CUSTOM=${CUSTOM:-""}
 MKJOBS=${MKJOBS:-4}
-SDK_VERSION=${SDK_VERSION:-""}
 ONLY_SDK=${ONLY_SDK:-0}
-SDK_TAR="${DISTFILES}/sdk/friction-sdk-${SDK_VERSION}r9-linux-x86_64.tar"
+DOWNLOAD_SDK=${DOWNLOAD_SDK:-1}
 TAR_VERSION=${TAR_VERSION:-""}
 HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
-# Build SDK
+SDK_VERSION=${SDK_VERSION:-"1.0.0"}
+SDK_REV=${SDK_REV:-"r11"}
+SDK_URL=${SDK_URL:-"https://github.com/friction2d/friction-sdk/releases/download/v${SDK_VERSION}"}
+SDK_FILE=${SDK_FILE:-"friction-sdk-${SDK_VERSION}${SDK_REV}-linux-x86_64.tar"}
+SDK_PATH="${DISTFILES}/sdk/${SDK_FILE}"
+
+APPIMAGE_TOOLS=${APPIMAGE_TOOLS:-"friction-appimage-tools-20240401.tar.xz"}
+APPIMAGETOOL_V=${APPIMAGETOOL_V:-"bfe6e0c"}
+APPIMAGERUNTIME_V=${APPIMAGERUNTIME_V:-"1bb1157"}
+
+if [ ! -d "${DISTFILES}/sdk" ]; then
+    mkdir -p ${DISTFILES}/sdk
+fi
+
+if [ ! -d "${DISTFILES}/linux" ]; then
+    (cd ${DISTFILES};
+        wget ${SDK_URL}/${APPIMAGE_TOOLS}
+        tar xvf ${APPIMAGE_TOOLS}
+    )
+fi
+
+# Build/Install SDK
 if [ ! -d "${SDK}" ]; then
     mkdir -p "${SDK}/lib"
     mkdir -p "${SDK}/bin"
     (cd "${SDK}"; ln -sf lib lib64)
 fi
-if [ -f "${SDK_TAR}.xz" ]; then
-(cd ${SDK}/.. ; tar xf ${SDK_TAR}.xz )
+
+if [ -f "${SDK_PATH}.xz" ] || [ "${DOWNLOAD_SDK}" = 1 ]; then
+    if [ ! -f "${SDK_PATH}.xz" ]; then
+        (cd ${DISTFILES}/sdk ; wget ${SDK_URL}/${SDK_FILE}.xz )
+    fi
+    (cd ${SDK}/.. ; tar xf ${SDK_PATH}.xz )
 else
-SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk01.sh
-SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk02.sh
-SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk03.sh
-(cd ${SDK}/.. ;
-    rm -rf friction/src
-    tar cvvf ${SDK_TAR} friction
-    xz -9 ${SDK_TAR}
-)
+    SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk01.sh
+    SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk02.sh
+    SDK=${SDK} DISTFILES=${DISTFILES} MKJOBS=${MKJOBS} ${BUILD}/build_vfxplatform_sdk03.sh
+    (cd ${SDK}/.. ;
+        rm -rf friction/src
+        tar cvvf ${SDK_PATH} friction
+        xz -9 ${SDK_PATH}
+    )
 fi
 
 if [ "${ONLY_SDK}" = 1 ]; then
@@ -87,4 +110,6 @@ SDK=${SDK} \
 DISTFILES=${DISTFILES} \
 BUILD=${BUILD} \
 VERSION=${VERSION} \
+APPIMAGETOOL_V=${APPIMAGETOOL_V} \
+APPIMAGERUNTIME_V=${APPIMAGERUNTIME_V} \
 ${BUILD}/build_vfxplatform_package.sh

src/scripts/build_vfxplatform.sh

@@ -94,9 +94,6 @@ cmake -G Ninja \
 -DCMAKE_PREFIX_PATH=${SDK} \
 -DCMAKE_BUILD_TYPE=Release \
 -DLINUX_DEPLOY=ON \
--DSKIA_USE_SYSTEM_LIBS=OFF \
--DSKIA_SYNC_EXTERNAL=ON \
--DUSE_EGL=ON \
 -DFRICTION_OFFICIAL_RELEASE=${REL_STATUS} \
 -DQSCINTILLA_INCLUDE_DIRS=${SDK}/include \
 -DQSCINTILLA_LIBRARIES_DIRS=${SDK}/lib \
@@ -107,6 +104,9 @@ cmake -G Ninja \
 -DGIT_BRANCH=${GIT_BRANCH} \
 -DCUSTOM_BUILD=${CUSTOM} \
 -DSKIA_STATIC=ON \
+-DBUILD_SKIA=OFF \
+-DSKIA_LIB_PATH=${SDK}/lib \
+-DSKIA_USE_SYSTEM_LIBS=OFF \
 ..
 
 VERSION=`cat version.txt`

src/scripts/build_vfxplatform_friction.sh

@@ -6,8 +6,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,8 +26,8 @@ VERSION=${VERSION:-""}
 APPID="graphics.friction.Friction"
 FRICTION_PKG=friction-${VERSION}
 
-APPIMAGETOOL=bfe6e0c
-APPIMAGERUNTIME=1bb1157
+APPIMAGETOOL_V=${APPIMAGETOOL_V:-"bfe6e0c"}
+APPIMAGERUNTIME_V=${APPIMAGERUNTIME_V:-"1bb1157"}
 
 if [ "${VERSION}" = "" ]; then
     echo "Missing version"
@@ -202,8 +201,8 @@ ln -sf usr/share/applications/${APPID}.desktop .
 ln -sf usr/share/icons/hicolor/256x256/apps/${APPID}.png .
 ln -sf usr/share/icons/hicolor/256x256/apps/${APPID}.png .DirIcon
 )
-tar xf ${DISTFILES}/linux/appimagetool-${APPIMAGETOOL}.tar.bz2
-ARCH=x86_64 ./appimagetool/AppRun --verbose --runtime-file=${DISTFILES}/linux/runtime-x86_64-${APPIMAGERUNTIME}.bin ${FRICTION_PORTABLE}
+tar xf ${DISTFILES}/linux/appimagetool-${APPIMAGETOOL_V}.tar.bz2
+ARCH=x86_64 ./appimagetool/AppRun --verbose --runtime-file=${DISTFILES}/linux/runtime-x86_64-${APPIMAGERUNTIME_V}.bin ${FRICTION_PORTABLE}
 
 cp -a *.AppImage ${DISTFILES}/builds/${VERSION}/
 

src/scripts/build_vfxplatform_package.sh

@@ -6,8 +6,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,22 +25,16 @@ clang -v
 SDK=${SDK:-"/opt/friction"}
 SRC=${SDK}/src
 DIST=${DIST:-"/mnt"}
-MKJOBS=${MKJOBS:-32}
+MKJOBS=${MKJOBS:-4}
 
 NINJA_V=1.11.1
-#GN_V=82d673ac
+CMAKE_V=3.26.3
 UNWIND_V=1.4.0
-#GPERF_V=4df0b85
-#SKIA_V=4c434dbee3
+SKIA_V=386256b297e93bbe06ee82abdcc701357d9ccd99
+SKIA_URL=https://github.com/friction2d/skia
 
 NINJA_BIN=${SDK}/bin/ninja
-#GN_BIN=${SDK}/bin/gn
-
-#GPERF_DIR=${SDK}/gperftools
-#GPERF_LIB=${GPERF_DIR}/.libs/libtcmalloc.a
-
-#SKIA_DIR=${SDK}/skia
-#SKIA_LIB=${SKIA_DIR}/out/build/libskia.a
+CMAKE_BIN=${SDK}/bin/cmake
 
 STATIC_CFLAGS="-fPIC"
 DEFAULT_CFLAGS="-I${SDK}/include"
@@ -76,30 +69,41 @@ if [ ! -f "${NINJA_BIN}" ]; then
     cp -a ninja ${NINJA_BIN}
 fi # ninja
 
-# gn
-# if [ ! -f "${GN_BIN}" ]; then
-#     cd ${SRC}
-#     GN_SRC=gn-${GN_V}
-#     rm -rf ${GN_SRC} || true
-#     tar xf ${DIST}/${GN_SRC}.tar.xz
-#     cd ${GN_SRC}
-#     python build/gen.py
-#     ${NINJA_BIN} -C out
-#     cp -a out/gn ${GN_BIN}
-# fi # gn
+# cmake
+if [ ! -f "${CMAKE_BIN}" ]; then
+    cd ${SRC}
+    CMAKE_SRC=cmake-${CMAKE_V}
+    rm -rf ${CMAKE_SRC} || true
+    tar xf ${DIST}/ffmpeg/${CMAKE_SRC}.tar.gz
+    cd ${CMAKE_SRC}
+    ./configure ${COMMON_CONFIGURE} --parallel=${MKJOBS} -- -DCMAKE_USE_OPENSSL=OFF
+    make -j${MKJOBS}
+    make install
+fi # cmake
 
 # skia
-# if [ ! -f "${SKIA_LIB}" ]; then
-#     cd ${SRC}
-#     SKIA_SRC=skia-${SKIA_V}
-#     rm -rf ${SKIA_SRC} || true
-#     rm -rf ${SKIA_DIR} || true
-#     tar xf ${DIST}/${SKIA_SRC}.tar.xz
-#     mv ${SKIA_SRC} ${SKIA_DIR}
-#     cd ${SKIA_DIR}
-#     ${GN_BIN} gen out/build --args='is_official_build=true is_debug=false cc="clang" cxx="clang++" extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_dng_sdk=false'
-#     ${NINJA_BIN} -C out/build -j${MKJOBS} skia
-# fi # skia
+if [ ! -f "${SDK}/lib/libskia.a" ]; then
+    cd ${SRC}
+    rm -rf skia-${SKIA_V} || true
+    git clone ${SKIA_URL} skia-${SKIA_V}
+    cd skia-${SKIA_V}
+    git checkout ${SKIA_V}
+    git submodule update -i --recursive
+    mkdir build
+    cd build
+    cmake -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=${SDK} \
+    -DCMAKE_CXX_COMPILER=clang++ \
+    -DCMAKE_C_COMPILER=clang \
+    -DSKIA_USE_SYSTEM_LIBS=OFF \
+    -DSKIA_SYNC_EXTERNAL=ON \
+    -DSKIA_STATIC=ON \
+    -DSKIA_USE_EGL=ON \
+    -DLINUX_DEPLOY=ON \
+    ..
+    cmake --build .
+    cp -a libskia.a ${SDK}/lib/
+fi # skia
 
 # libunwind
 if [ ! -f "${SDK}/lib/pkgconfig/libunwind.pc" ]; then
@@ -113,22 +117,4 @@ if [ ! -f "${SDK}/lib/pkgconfig/libunwind.pc" ]; then
     make install
 fi # libunwind
 
-# gperftools
-# if [ ! -f "${GPERF_LIB}" ]; then
-#     cd ${SRC}
-#     GPERF_SRC=gperftools-${GPERF_V}
-#     rm -rf ${GPERF_SRC} || true
-#     rm -rf ${GPERF_DIR} || true
-#     tar xf ${DIST}/${GPERF_SRC}.tar.xz
-#     mv ${GPERF_SRC} ${GPERF_DIR}
-#     cd ${GPERF_DIR}
-#     ./autogen.sh
-#     CC=clang CXX=clang++ \
-#     CFLAGS="${DEFAULT_CFLAGS}" \
-#     CXXFLAGS="${DEFAULT_CFLAGS}" \
-#     LDFLAGS="${DEFAULT_LDFLAGS} -lunwind" \
-#     ./configure ${STATIC_CONFIGURE} --enable-libunwind
-#     make -j${MKJOBS}
-# fi # gperftools
-
 echo "SDK PART 1 DONE"