Merge branch 'test_edit' into test_merge

ggarra13 · Oct 3, 2023 · 5e184dd · 5e184dd
2 parents 38595df + 83b9cf4
commit 5e184dd
Show file tree

Hide file tree

Showing 267 changed files with 4,938 additions and 4,661 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -7,7 +7,6 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      TLRENDER_MMAP: ON
       TLRENDER_PYTHON: OFF
       TLRENDER_GLFW: ON
       TLRENDER_OCIO: ON
@@ -18,6 +17,8 @@ jobs:
       TLRENDER_PNG: ON
       TLRENDER_EXR: ON
       TLRENDER_FFMPEG: ON
+      TLRENDER_USD: OFF
+      TLRENDER_NFD: OFF
       TLRENDER_QT5: ON
       TLRENDER_PROGRAMS: ON
       TLRENDER_EXAMPLES: ON
@@ -29,74 +30,26 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Update
-      run: sudo apt-get update
-
-    - name: Install lcov
-      if: env.TLRENDER_GCOV == 'ON'
-      run: sudo apt-get install lcov
-
-    - name: Install OpenGL dev
-      run: sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev
-
-    - name: Install ALSA dev
-      run: sudo apt-get install libasound2-dev
-
-    - name: Install PulseAudio dev
-      run: sudo apt-get install libpulse-dev
-
-    - name: Install Python dev
-      if: env.TLRENDER_PYTHON == 'ON'
-      run: sudo apt-get install python3.8-dev
-
-    - name: Install Qt dev
-      if: env.TLRENDER_QT5 == 'ON'
-      run: sudo apt-get install qtdeclarative5-dev libqt5quick5 qtbase5-dev libqt5svg5-dev qtchooser qt5-qmake qtbase5-dev-tools
-
     - name: Setup environment
       run: |
         echo "$PWD/build/install/bin" >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=$PWD/build/install/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
         echo "PYTHONPATH=$PWD/build/install/lib:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Build tlRender
-      run: |
-        mkdir build
-        cd build
-        cmake ../etc/SuperBuild \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_INSTALL_PREFIX=$PWD/install \
-          -DCMAKE_PREFIX_PATH=$PWD/install \
-          -DTLRENDER_MMAP=$TLRENDER_MMAP \
-          -DTLRENDER_PYTHON=$TLRENDER_PYTHON \
-          -DTLRENDER_GLFW=$TLRENDER_GLFW \
-          -DTLRENDER_OCIO=$TLRENDER_OCIO \
-          -DTLRENDER_AUDIO=$TLRENDER_AUDIO \
-          -DTLRENDER_JPEG=$TLRENDER_JPEG \
-          -DTLRENDER_TIFF=$TLRENDER_TIFF \
-          -DTLRENDER_STB=$TLRENDER_STB \
-          -DTLRENDER_PNG=$TLRENDER_PNG \
-          -DTLRENDER_EXR=$TLRENDER_EXR \
-          -DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
-          -DTLRENDER_QT5=$TLRENDER_QT5 \
-          -DTLRENDER_PROGRAMS=$TLRENDER_PROGRAMS \
-          -DTLRENDER_EXAMPLES=$TLRENDER_EXAMPLES \
-          -DTLRENDER_TESTS=$TLRENDER_TESTS \
-          -DTLRENDER_GCOV=$TLRENDER_GCOV
-        cmake --build . -j 4 --config Debug
+      run: bash etc/Linux/linux-build-gha.sh Debug
 
     - name: Run tests
       run: |
         cd build
         cd tlRender/src/tlRender-build
-        ctest --rerun-failed --output-on-failure
+        xvfb-run tests/tltest/tltest
     
     - name: Code coverage
       if: env.TLRENDER_GCOV == 'ON'
       run: |
-        cd build
-        cd tlRender/src/tlRender-build
-        sh ../../../../etc/Linux/lcov.sh
+        cd build/tlRender/src/tlRender-build
+        bash ../../../../etc/Linux/lcov.sh
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3
@@ -108,9 +61,8 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      TLRENDER_MMAP: OFF
       TLRENDER_PYTHON: OFF
-      TLRENDER_GLFW: OFF
+      TLRENDER_GLFW: ON
       TLRENDER_OCIO: OFF
       TLRENDER_AUDIO: OFF
       TLRENDER_JPEG: OFF
@@ -119,23 +71,15 @@ jobs:
       TLRENDER_PNG: OFF
       TLRENDER_EXR: OFF
       TLRENDER_FFMPEG: OFF
+      TLRENDER_USD: OFF
       TLRENDER_NFD: OFF
       TLRENDER_QT5: OFF
-      TLRENDER_PROGRAMS: ON
-      TLRENDER_EXAMPLES: ON
       TLRENDER_TESTS: ON
-      TLRENDER_GCOV: OFF
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-
-    - name: Update
-      run: sudo apt-get update
-
-    - name: Install OpenGL dev
-      run: sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev
 
     - name: Setup environment
       run: |
@@ -144,43 +88,18 @@ jobs:
         echo "PYTHONPATH=$PWD/build/install/lib:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Build tlRender
-      run: |
-        mkdir build
-        cd build
-        cmake ../etc/SuperBuild \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_INSTALL_PREFIX=$PWD/install \
-          -DCMAKE_PREFIX_PATH=$PWD/install \
-          -DTLRENDER_MMAP=$TLRENDER_MMAP \
-          -DTLRENDER_PYTHON=$TLRENDER_PYTHON \
-          -DTLRENDER_GLFW=$TLRENDER_GLFW \
-          -DTLRENDER_OCIO=$TLRENDER_OCIO \
-          -DTLRENDER_AUDIO=$TLRENDER_AUDIO \
-          -DTLRENDER_JPEG=$TLRENDER_JPEG \
-          -DTLRENDER_TIFF=$TLRENDER_TIFF \
-          -DTLRENDER_STB=$TLRENDER_STB \
-          -DTLRENDER_PNG=$TLRENDER_PNG \
-          -DTLRENDER_EXR=$TLRENDER_EXR \
-          -DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
-          -DTLRENDER_NFD=$TLRENDER_NFD \
-          -DTLRENDER_QT5=$TLRENDER_QT5 \
-          -DTLRENDER_PROGRAMS=$TLRENDER_PROGRAMS \
-          -DTLRENDER_EXAMPLES=$TLRENDER_EXAMPLES \
-          -DTLRENDER_TESTS=$TLRENDER_TESTS \
-          -DTLRENDER_GCOV=$TLRENDER_GCOV
-        cmake --build . -j 4 --config Debug
+      run: bash etc/Linux/linux-build-gha.sh Debug
 
     - name: Run tests
       run: |
         cd build
         cd tlRender/src/tlRender-build
-        ctest --rerun-failed --output-on-failure
+        xvfb-run tests/tltest/tltest
 
   macos-build:
     runs-on: macos-latest
 
     env:
-      TLRENDER_MMAP: ON
       TLRENDER_PYTHON: OFF
       TLRENDER_GLFW: ON
       TLRENDER_OCIO: ON
@@ -191,6 +110,7 @@ jobs:
       TLRENDER_PNG: ON
       TLRENDER_EXR: ON
       TLRENDER_FFMPEG: ON
+      TLRENDER_USD: OFF
       TLRENDER_NFD: OFF
       TLRENDER_QT5: OFF
       TLRENDER_PROGRAMS: ON
@@ -214,31 +134,7 @@ jobs:
     - name: Build tlRender
       run: |
         export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
-        mkdir build
-        cd build
-        cmake ../etc/SuperBuild \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_INSTALL_PREFIX=$PWD/install \
-          -DCMAKE_PREFIX_PATH=$PWD/install \
-          -DTLRENDER_MMAP=$TLRENDER_MMAP \
-          -DTLRENDER_PYTHON=$TLRENDER_PYTHON \
-          -DTLRENDER_GLFW=$TLRENDER_GLFW \
-          -DTLRENDER_OCIO=$TLRENDER_OCIO \
-          -DTLRENDER_AUDIO=$TLRENDER_AUDIO \
-          -DTLRENDER_JPEG=$TLRENDER_JPEG \
-          -DTLRENDER_TIFF=$TLRENDER_TIFF \
-          -DTLRENDER_STB=$TLRENDER_STB \
-          -DTLRENDER_PNG=$TLRENDER_PNG \
-          -DTLRENDER_EXR=$TLRENDER_EXR \
-          -DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
-          -DTLRENDER_NFD=$TLRENDER_NFD \
-          -DTLRENDER_QT5=$TLRENDER_QT5 \
-          -DTLRENDER_PROGRAMS=$TLRENDER_PROGRAMS \
-          -DTLRENDER_EXAMPLES=$TLRENDER_EXAMPLES \
-          -DTLRENDER_TESTS=$TLRENDER_TESTS \
-          -DTLRENDER_GCOV=$TLRENDER_GCOV \
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-        cmake --build . -j 4 --config Debug
+        bash etc/macOS/macos-build-gha.sh Debug
 
     - name: Run tests
       run: |
@@ -247,11 +143,11 @@ jobs:
         cd tlRender/src/tlRender-build
         tests/tltest/tltest
 
+
   windows-build:
     runs-on: windows-latest
 
     env:
-      TLRENDER_MMAP: ON
       TLRENDER_PYTHON: OFF
       TLRENDER_GLFW: ON
       TLRENDER_OCIO: ON
@@ -262,53 +158,23 @@ jobs:
       TLRENDER_PNG: ON
       TLRENDER_EXR: ON
       TLRENDER_FFMPEG: OFF
+      TLRENDER_USD: OFF
       TLRENDER_NFD: OFF
       TLRENDER_QT5: OFF
       TLRENDER_PROGRAMS: ON
       TLRENDER_EXAMPLES: ON
       TLRENDER_TESTS: ON
-      TLRENDER_GCOV: OFF
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Setup environment
+      shell: cmd
       run: |
-        echo "$pwd\build\install\bin;$pwd\build\install\lib;$env:path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
+        echo "%CD%\build\install\bin;%CD%\build\install\lib" >> $GITHUB_PATH
         
     - name: Build tlRender
-      run: |
-        mkdir build
-        cd build
-        cmake ..\etc\SuperBuild `
-          -DCMAKE_BUILD_TYPE=Debug `
-          -DCMAKE_INSTALL_PREFIX=install `
-          -DCMAKE_PREFIX_PATH=install `
-          -DTLRENDER_MMAP=${{ env.TLRENDER_MMAP }} `
-          -DTLRENDER_PYTHON=${{ env.TLRENDER_PYTHON }} `
-          -DTLRENDER_GLFW=${{ env.TLRENDER_GLFW }} `
-          -DTLRENDER_OCIO=${{ env.TLRENDER_OCIO }} `
-          -DTLRENDER_AUDIO=${{ env.TLRENDER_AUDIO }} `
-          -DTLRENDER_JPEG=${{ env.TLRENDER_JPEG }} `
-          -DTLRENDER_TIFF=${{ env.TLRENDER_TIFF }} `
-          -DTLRENDER_STB=${{ env.TLRENDER_STB }} `
-          -DTLRENDER_PNG=${{ env.TLRENDER_PNG }} `
-          -DTLRENDER_EXR=${{ env.TLRENDER_EXR }} `
-          -DTLRENDER_FFMPEG=${{ env.TLRENDER_FFMPEG }} `
-          -DTLRENDER_NFD=${{ env.TLRENDER_NFD }} `
-          -DTLRENDER_QT5=${{ env.TLRENDER_QT5 }} `
-          -DTLRENDER_PROGRAMS=${{ env.TLRENDER_PROGRAMS }} `
-          -DTLRENDER_EXAMPLES=${{ env.TLRENDER_EXAMPLES }} `
-          -DTLRENDER_TESTS=${{ env.TLRENDER_TESTS }} `
-          -DTLRENDER_GCOV=${{ env.TLRENDER_GCOV }}
-        cmake --build . -j 4 --config Debug
-
-    - name: Run tests
-      run: |
-        cd build
-        cd tlRender\src\tlRender-build
-        tests\tltest\Debug\tltest
-        #ctest --rerun-failed --output-on-failure
-
+      shell: cmd
+      run: etc\Windows\windows-build-gha.bat Debug
diff --git a/CMakeGraphVizOptions.cmake b/CMakeGraphVizOptions.cmake
@@ -0,0 +1,9 @@
+# Example:
+# > cmake --graphviz=tlRenderLibraries.dot -S ..\..\..\..\tlRender -DTLRENDER_TESTS=OFF
+# > dot tlRenderLibraries.dot -Tpng > tlRenderLibraries.png
+
+set(GRAPHVIZ_GRAPH_HEADER "node [ fontsize = 24 ];")
+set(GRAPHVIZ_EXECUTABLES FALSE)
+set(GRAPHVIZ_INTERFACE_LIBS FALSE)
+set(GRAPHVIZ_EXTERNAL_LIBS FALSE)
+set(GRAPHVIZ_IGNORE_TARGETS glad tlPlay tlApp tlGLApp tlBakeApp tlResourceApp tlPlayGLApp tlPlayQtApp)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,6 @@ project(
 #-------------------------------------------------------------------------------
 # Build options
 
-set(TLRENDER_MMAP TRUE CACHE BOOL "Enable memory-mapped file I/O")
 set(TLRENDER_PYTHON FALSE CACHE BOOL "Enable Python support (for OTIO Python adapters)")
 set(TLRENDER_API "GL_4_1" CACHE STRING "Graphics API (GL_4_1, GL_4_1_Debug, GLES_2)")
 set(TLRENDER_GLFW TRUE CACHE BOOL "Enable support for GLFW")
@@ -60,9 +59,6 @@ set(TLRENDER_GPROF FALSE CACHE BOOL "Enable gprof code profiling")
 list(PREPEND CMAKE_MODULE_PATH
     ${PROJECT_SOURCE_DIR}/cmake/Modules)
 
-if(TLRENDER_MMAP)
-    add_definitions(-DTLRENDER_MMAP)
-endif()
 if(TLRENDER_PYTHON)
     add_definitions(-DTLRENDER_PYTHON)
 endif()