Enable dullahan Linux builds (#4)

* Update cmake minimum requirement to 3.11 * Enable PIC generation * Remove Linux64 archive (was pointing to an internal HTTP server anyway) * Wire up a Linux build. As we have no prebuild CEF from LL yet, consume a prebuild CEF from spotify. This will obviously miss the proprietary codecs, but it's still better than no CEF at all * Enable Ubuntu 22.04 runner * Update build-cmd.sh Cleanup, install will duplicate files into bin/release and lib/release. Delete the shared library files in bin/release to avoid duplicate files in final archive * Enable C++11 ABI
secondlife · Apr 5, 2024 · 9c4274d · 9c4274d
1 parent 474c1c4
commit 9c4274d
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 89 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -8,10 +8,14 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-2022, macos-13]
+        os: [windows-2022, macos-13, ubuntu-22.04]
         addrsize: ["64"]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install Linux dependencies
+        if: runner.os == 'linux'
+        run: sudo apt update && sudo apt install -y  ninja-build
+
       - uses: secondlife/action-autobuild@v3
         with:
           addrsize: ${{ matrix.addrsize }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,14 @@
 # Dullahan CMake file - Callum Prentice - 2020-05-03
 
 ###############################################################################
-cmake_minimum_required(VERSION 3.4.3)
+cmake_minimum_required(VERSION 3.11)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    add_compile_options("-Wno-array-bounds")
+endif()
 
 ###############################################################################
 # Dullahan main project/solution
@@ -18,24 +25,50 @@ function(check_exists variable)
     endif()
 endfunction()
 
-###############################################################################
-# The user must pass in CEF_WRAPPER_DIR and CEF_WRAPPER_BUILD_DIR then we
-# derrive all the other ones we need based on those
-set(CEF_INCLUDE_DIR ${CEF_WRAPPER_DIR}/include)
-set(CEF_RELEASE_LIB_DIR ${CEF_WRAPPER_DIR}/Release)
-set(CEF_RELEASE_DLL_LIB_DIR ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/Release)
-set(CEF_RELEASE_BIN_DIR ${CEF_WRAPPER_DIR}/Release)
-set(CEF_RESOURCES_DIR ${CEF_WRAPPER_DIR}/Resources)
-
-# Check if all our variables exist and bail with
-# a fatal error if any of them are missing
-check_exists(CEF_WRAPPER_DIR)
-check_exists(CEF_WRAPPER_BUILD_DIR)
-check_exists(CEF_INCLUDE_DIR)
-check_exists(CEF_RELEASE_LIB_DIR)
-check_exists(CEF_RELEASE_DLL_LIB_DIR)
-check_exists(CEF_RELEASE_BIN_DIR)
-check_exists(CEF_RESOURCES_DIR)
+option( USE_SPOTIFY_CEF "Use a prebuild CEF from spotify" Off )
+option( SPOTIFY_CEF_URL "URL to the prebuild CEF from spotify" "" )
+
+if( USE_SPOTIFY_CEF )
+    include(FetchContent)
+
+    FetchContent_Declare( cef_prebuild URL  ${SPOTIFY_CEF_URL} )
+    FetchContent_MakeAvailable(cef_prebuild)
+
+    set(CEF_ROOT "${cef_prebuild_SOURCE_DIR}")
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_prebuild_SOURCE_DIR}/cmake")
+    find_package(CEF REQUIRED)
+endif()
+
+
+if( NOT USE_SPOTIFY_CEF )
+    ###############################################################################
+    # The user must pass in CEF_WRAPPER_DIR and CEF_WRAPPER_BUILD_DIR then we
+    # derrive all the other ones we need based on those
+    set(CEF_INCLUDE_DIR ${CEF_WRAPPER_DIR}/include)
+    set(CEF_RELEASE_LIB_DIR ${CEF_WRAPPER_DIR}/Release)
+    set(CEF_RELEASE_DLL_LIB_DIR ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/Release)
+    set(CEF_RELEASE_BIN_DIR ${CEF_WRAPPER_DIR}/Release)
+    set(CEF_RESOURCES_DIR ${CEF_WRAPPER_DIR}/Resources)
+
+    # Check if all our variables exist and bail with
+    # a fatal error if any of them are missing
+    check_exists(CEF_WRAPPER_DIR)
+    check_exists(CEF_WRAPPER_BUILD_DIR)
+    check_exists(CEF_INCLUDE_DIR)
+    check_exists(CEF_RELEASE_LIB_DIR)
+    check_exists(CEF_RELEASE_DLL_LIB_DIR)
+    check_exists(CEF_RELEASE_BIN_DIR)
+    check_exists(CEF_RESOURCES_DIR)
+else()
+    set(CEF_INCLUDE_DIR ${cef_prebuild_SOURCE_DIR}/include)
+    set(CEF_RELEASE_LIB_DIR ${cef_prebuild_SOURCE_DIR}/Release)
+    set(CEF_RELEASE_DLL_LIB_DIR ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/Release)
+    set(CEF_RELEASE_BIN_DIR ${cef_prebuild_SOURCE_DIR}/Release)
+    set(CEF_RESOURCES_DIR ${cef_prebuild_SOURCE_DIR}/Resources)
+
+    set( CEF_DLL_LIBRARY libcef_dll_wrapper )
+    set( CEF_LIBRARY ${CEF_LIB_RELEASE} )
+endif()
 
 ###############################################################################
 # location of CEF libraries we link against
@@ -77,27 +110,32 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     check_exists(COCOA_FRAMEWORK)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory -Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../lib' -Wl,--exclude-libs,ALL")
-    find_library(
-        CEF_LIBRARY_RELEASE
-        NAMES libcef.so
-        PATHS ${CEF_RELEASE_LIB_DIR}
-        PATH_SUFFIXES release
-    )
-    find_library(
-        CEF_DLL_LIBRARY_RELEASE
-        NAMES libcef_dll_wrapper.a
-        PATHS ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/
-        PATH_SUFFIXES release
-    )
+
+    if( NOT USE_SPOTIFY_CEF )
+        find_library(
+            CEF_LIBRARY_RELEASE
+            NAMES libcef.so
+            PATHS ${CEF_RELEASE_LIB_DIR}
+            PATH_SUFFIXES release
+        )
+        find_library(
+            CEF_DLL_LIBRARY_RELEASE
+            NAMES libcef_dll_wrapper.a
+            PATHS ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/
+            PATH_SUFFIXES release
+        )
+        set(CEF_LIBRARY ${CEF_LIBRARY_RELEASE} )
+        set(CEF_DLL_LIBRARY ${CEF_DLL_LIBRARY_RELEASE} )
+    else()
+        set( CEF_DLL_LIBRARY libcef_dll_wrapper )
+        set( CEF_LIBRARY ${CEF_LIB_RELEASE} )
+    endif()
 endif()
 
 ###############################################################################
 # Final layer of finding the right libs for each combination
 # of name, platform, configuration, type etc.
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(CEF_LIBRARY ${CEF_LIBRARY_RELEASE} )
-  set(CEF_DLL_LIBRARY ${CEF_DLL_LIBRARY_RELEASE} )
-else()
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(CEF_LIBRARY
       optimized ${CEF_LIBRARY_RELEASE}
   )
@@ -121,7 +159,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -xobjective-c++")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-    if( NOT ENABLE_CXX11_ABI ) 
+    if( NOT ENABLE_CXX11_ABI )
       add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
     endif()
 endif()
@@ -274,7 +312,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         COMMENT "Adding custom manifest...")
 endif()
 
-# Windows commands to copy CEF binaries and 'resources' folders to 
+# Windows commands to copy CEF binaries and 'resources' folders to
 # executable dir since they're needed at runtime
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -524,3 +562,27 @@ endif()
 if(CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_CONFIGURATION_TYPES "Release")
 endif()
+
+# Install the Dullahan library and host executable
+
+if( USE_SPOTIFY_CEF )
+  install( TARGETS dullahan_host DESTINATION bin/release )
+  install( TARGETS dullahan ${CEF_DLL_LIBRARY} DESTINATION lib/release )
+
+  foreach(binFile IN LISTS CEF_BINARY_FILES)
+	if(IS_DIRECTORY ${CEF_BINARY_DIR_RELEASE}/${binFile} )
+	  install( DIRECTORY ${CEF_BINARY_DIR_RELEASE}/${binFile} DESTINATION lib/release )
+	  install( DIRECTORY ${CEF_BINARY_DIR_RELEASE}/${binFile} DESTINATION bin/release )
+	else()
+	  install( PROGRAMS ${CEF_BINARY_DIR_RELEASE}/${binFile} DESTINATION lib/release )
+	  install( PROGRAMS ${CEF_BINARY_DIR_RELEASE}/${binFile} DESTINATION bin/release )
+	endif()
+  endforeach()
+  foreach(resFile IN LISTS CEF_RESOURCE_FILES)
+	if(IS_DIRECTORY ${CEF_RESOURCE_DIR}/${resFile} )
+	  install( DIRECTORY  ${CEF_RESOURCE_DIR}/${resFile}  DESTINATION resources)
+	else()
+	  install( FILES ${CEF_RESOURCE_DIR}/${resFile}  DESTINATION resources)
+	endif()
+  endforeach()
+endif()
diff --git a/autobuild.xml b/autobuild.xml
@@ -28,18 +28,6 @@
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>fe4c980f5e42196e4ba554e2093dfb3a</string>
-              <key>url</key>
-              <string>http://192.168.1.115/dev/pkg/cef_bin-81.3.10_gb223419_chromium-81.0.4044.138.201451352-linux64-201451352.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
           <key>windows</key>
           <map>
             <key>archive</key>

diff --git a/build-cmd.sh b/build-cmd.sh
@@ -232,53 +232,23 @@ case "$AUTOBUILD_PLATFORM" in
         #Force version regeneration.
         rm -f src/dullahan_version.h
 
-        # build the CEF c->C++ wrapper "libcef_dll_wrapper"
-        cd "${cef_no_wrapper_dir}"
-        rm -rf "${cef_no_wrapper_build_dir}"
-        mkdir -p "${cef_no_wrapper_build_dir}"
-        cd "${cef_no_wrapper_build_dir}"
-        opts="$LL_BUILD_RELEASE -m${AUTOBUILD_ADDRSIZE}"
-        plainopts="$(remove_cxxstd $opts)"
-        cmake -G  Ninja \
-              -DCMAKE_C_FLAGS="$plainopts" \
-              -DCMAKE_CXX_FLAGS="$opts" \
-              $(cmake_cxx_standard $LL_BUILD_RELEASE) \
-              ..
-        ninja libcef_dll_wrapper
-
-        cd "$stage"
-        cmake .. -G  Ninja \
-              -DCEF_WRAPPER_DIR="${cef_no_wrapper_dir}" \
-              -DCEF_WRAPPER_BUILD_DIR="${cef_no_wrapper_build_dir}" \
-              -DCMAKE_CXX_FLAGS:STRING="$opts" \
-              $(cmake_cxx_standard $LL_BUILD_RELEASE)
+        cmake -S . -B stage/build  -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_INSTALL_PREFIX=stage -DENABLE_CXX11_ABI=ON \
+        -DUSE_SPOTIFY_CEF=TRUE -DSPOTIFY_CEF_URL=https://cef-builds.spotifycdn.com/cef_binary_118.4.1%2Bg3dd6078%2Bchromium-118.0.5993.54_linux64_beta_minimal.tar.bz2
+		cmake --build stage/build
+		cmake --install stage/build
 
-        ninja
+        strip stage/lib/release/libcef.so
+	rm stage/bin/release/*.so*
+	rm stage/bin/release/*.json
 
-        g++ -std=c++11  -I "${cef_no_wrapper_dir}/include"  -I "${dullahan_source_dir}" -o "$stage/version"  "$top/tools/autobuild_version.cpp"
+        g++ -std=c++17  -I "${cef_no_wrapper_dir}/include"  -I "${dullahan_source_dir}" -o "$stage/version"  "$top/tools/autobuild_version.cpp"
 
         "$stage/version" > "$stage/VERSION.txt"
         rm "$stage/version"
-        
+
         mkdir -p "$stage/LICENSES"
-        mkdir -p "$stage/bin/release/"
-        mkdir -p "$stage/include"
         mkdir -p "$stage/include/cef"
-        mkdir -p "$stage/lib/release/swiftshader"
-        mkdir -p "$stage/resources"
-
-        cp libdullahan.a ${stage}/lib/release/
-        cp ${cef_no_wrapper_build_dir}/libcef_dll_wrapper/libcef_dll_wrapper.a $stage/lib/release
-
-        cp -a ${cef_no_wrapper_dir}/Release/*.so ${stage}/lib/release/
-        cp -a ${cef_no_wrapper_dir}/Release/swiftshader/* ${stage}/lib/release/swiftshader/
-
-        cp dullahan_host ${stage}/bin/release/
-
-        cp -a ${cef_no_wrapper_dir}/Release/*.bin ${stage}/bin/release/
-        cp -a ${cef_no_wrapper_dir}/Release/chrome-sandbox ${stage}/bin/release/
 
-        cp -R ${cef_no_wrapper_dir}/Resources/* ${stage}/resources/
         cp ${dullahan_source_dir}/dullahan.h ${stage}/include/cef/
         cp ${dullahan_source_dir}/dullahan_version.h ${stage}/include/cef/
         cp "$top/CEF_LICENSE.txt" "$stage/LICENSES"