Merge import-* folders

This commit is contained in:
Grégoire Roussel 2024-07-12 22:41:26 +02:00
parent 1458a6ab23
commit 9a88b8ff4b
8 changed files with 22 additions and 54 deletions

View File

@ -43,14 +43,10 @@ jobs:
run: | run: |
cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
cmake --build csvexport/build --parallel --config Release cmake --build csvexport/build --parallel --config Release
- name: Import-chrome utility - name: Import utilities
run: | run: |
cmake -B import-chrome/build -S import-chrome -DCMAKE_BUILD_TYPE=Release cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
cmake --build import-chrome/build --parallel --config Release cmake --build import/build --parallel --config Release
- name: Import-fuchsia utility
run: |
cmake -B import-fuchsia/build -S import-fuchsia -DCMAKE_BUILD_TYPE=Release
cmake --build import-fuchsia/build --parallel --config Release
- if: ${{ !startsWith(matrix.os, 'windows') }} - if: ${{ !startsWith(matrix.os, 'windows') }}
name: Library name: Library
run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
@ -63,8 +59,8 @@ jobs:
cp update/build/tracy-update bin cp update/build/tracy-update bin
cp capture/build/tracy-capture bin cp capture/build/tracy-capture bin
cp csvexport/build/tracy-csvexport bin cp csvexport/build/tracy-csvexport bin
cp import-chrome/build/tracy-import-chrome bin cp import/build/tracy-import-chrome bin
cp import-fuchsia/build/tracy-import-fuchsia bin cp import/build/tracy-import-fuchsia bin
- if: startsWith(matrix.os, 'windows') - if: startsWith(matrix.os, 'windows')
name: Find Artifacts name: Find Artifacts
id: find_artifacts_windows id: find_artifacts_windows
@ -74,8 +70,8 @@ jobs:
copy update\build\Release\tracy-update.exe bin copy update\build\Release\tracy-update.exe bin
copy capture\build\Release\tracy-capture.exe bin copy capture\build\Release\tracy-capture.exe bin
copy csvexport\build\Release\tracy-csvexport.exe bin copy csvexport\build\Release\tracy-csvexport.exe bin
copy import-chrome\build\Release\tracy-import-chrome.exe bin copy import\build\Release\tracy-import-chrome.exe bin
copy import-fuchsia\build\Release\tracy-import-fuchsia.exe bin copy import\build\Release\tracy-import-fuchsia.exe bin
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: ${{ matrix.os }} name: ${{ matrix.os }}

View File

@ -30,14 +30,10 @@ jobs:
run: | run: |
cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
cmake --build csvexport/build --parallel cmake --build csvexport/build --parallel
- name: Import-chrome utility - name: Import utilities
run: | run: |
cmake -B import-chrome/build -S import-chrome -DCMAKE_BUILD_TYPE=Release cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
cmake --build import-chrome/build --parallel cmake --build import/build --parallel
- name: Import-fuchsia utility
run: |
cmake -B import-fuchsia/build -S import-fuchsia -DCMAKE_BUILD_TYPE=Release
cmake --build import-fuchsia/build --parallel
- name: Library - name: Library
run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
- name: Test application - name: Test application
@ -70,8 +66,8 @@ jobs:
cp update/build/tracy-update bin cp update/build/tracy-update bin
cp capture/build/tracy-capture bin cp capture/build/tracy-capture bin
cp csvexport/build/tracy-csvexport bin cp csvexport/build/tracy-csvexport bin
cp import-chrome/build/tracy-import-chrome bin cp import/build/tracy-import-chrome bin
cp import-fuchsia/build/tracy-import-fuchsia bin cp import/build/tracy-import-fuchsia bin
strip bin/tracy-* strip bin/tracy-*
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:

View File

@ -4,8 +4,7 @@
"${workspaceFolder}/profiler", "${workspaceFolder}/profiler",
"${workspaceFolder}/capture", "${workspaceFolder}/capture",
"${workspaceFolder}/csvexport", "${workspaceFolder}/csvexport",
"${workspaceFolder}/import-chrome", "${workspaceFolder}/import",
"${workspaceFolder}/import-fuchsia",
"${workspaceFolder}/update", "${workspaceFolder}/update",
"${workspaceFolder}/test", "${workspaceFolder}/test",
"${workspaceFolder}", "${workspaceFolder}",

View File

@ -1,27 +0,0 @@
cmake_minimum_required(VERSION 3.16)
option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF)
option(NO_STATISTICS "Disable calculation of statistics" ON)
option(NO_PARALLEL_STL "Disable parallel STL" OFF)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
set(CMAKE_CXX_STANDARD 20)
project(
tracy-import-chrome
LANGUAGES C CXX
VERSION ${TRACY_VERSION_STRING}
)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
set(PROGRAM_FILES
src/import-chrome.cpp
)
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

View File

@ -9,7 +9,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
project( project(
tracy-import-fuchsia tracy-import
LANGUAGES C CXX LANGUAGES C CXX
VERSION ${TRACY_VERSION_STRING} VERSION ${TRACY_VERSION_STRING}
) )
@ -18,10 +18,14 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
set(PROGRAM_FILES add_executable(tracy-import-chrome
src/import-chrome.cpp
)
target_link_libraries(tracy-import-chrome PRIVATE TracyServer)
add_executable(tracy-import-fuchsia
src/import-fuchsia.cpp src/import-fuchsia.cpp
) )
target_link_libraries(tracy-import-fuchsia PRIVATE TracyServer)
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME}) set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})