Skip to content

Commit

Permalink
re-renaming to include cpp specifier
Browse files Browse the repository at this point in the history
  • Loading branch information
mattelser committed Sep 26, 2023
1 parent 06387cc commit 7796442
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cp
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.so
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.pyd
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.lib
exts/cesium.omniverse.tests/cesium/omniverse/tests/bindings/CesiumOmniverseTestsPythonBindings.cpython-310-x86_64-linux-gnu.so
exts/cesium.omniverse.tests/cesium/omniverse/tests/bindings/CesiumOmniverseTestsPythonBindings.cp310-win_amd64.pyd
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cpython-310-x86_64-linux-gnu.so
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cp310-win_amd64.pyd

# Installed libraries
exts/cesium.omniverse/bin/
exts/cesium.usd.plugins/bin/
exts/cesium.omniverse.tests/bin/
exts/cesium.omniverse.cpp.tests/bin/

# Installed plugins
exts/cesium.usd.plugins/plugins/
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.tests.runner.kit"
"${workspaceFolder}/apps/cesium.omniverse.cpp.tests.runner.kit"
],
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ set(LINT_SOURCE_DIRECTORIES
"${PROJECT_SOURCE_DIR}/src/core"
"${PROJECT_SOURCE_DIR}/src/public"
"${PROJECT_SOURCE_DIR}/tests"
"${PROJECT_SOURCE_DIR}/cesiumTestsExtension")
"${PROJECT_SOURCE_DIR}/cesiumOmniverseCppTestsExtension")

# Source directories for coverage
set(COVERAGE_SOURCE_DIRECTORIES "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src")
Expand Down Expand Up @@ -438,7 +438,7 @@ add_subdirectory(src)
if(CESIUM_OMNI_ENABLE_TESTS)
enable_testing()
add_subdirectory(tests)
add_subdirectory(cesiumTestsExtension)
add_subdirectory(cesiumOmniverseCppTestsExtension)
endif()

# Ninja and various Makefiles generators support generating compile_commands.json
Expand Down Expand Up @@ -513,9 +513,9 @@ set(KIT_EXTENSION_BINDINGS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse/ces
set(KIT_PLUGIN_EXTENSION_BINDINGS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins/cesium/usd/plugins")
set(KIT_EXTENSION_PLUGINS_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.usd.plugins/plugins")

set(KIT_EXTENSION_TESTS_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse.tests/bin")
set(KIT_EXTENSION_TESTS_BIN_PATH "${PROJECT_SOURCE_DIR}/exts/cesium.omniverse.cpp.tests/bin")
set(KIT_EXTENSION_TESTS_BINDINGS_PATH
"${PROJECT_SOURCE_DIR}/exts/cesium.omniverse.tests/cesium/omniverse/tests/bindings")
"${PROJECT_SOURCE_DIR}/exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings")

# You may see warnings like:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ app = true

[dependencies]
"cesium.omniverse.dev" = {}
"cesium.tests" = {}
"cesium.omniverse.tests" = {}

[settings]
app.window.title = "Cesium for Omniverse Tests App"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CesiumTests.h"
#include "CesiumOmniverseTests.h"

#include <carb/BindingsPythonUtils.h>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ setup_lib(
SOURCES
${SOURCES}
INCLUDE_DIRS
"${PROJECT_SOURCE_DIR}/cesiumTestsExtension/include"
"${PROJECT_SOURCE_DIR}/cesiumOmniverseTestsExtension/include"
LIBRARIES
CesiumOmniverseCore
doctest::doctest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
#define DOCTEST_CONFIG_SUPER_FAST_ASSERTS

#include "CesiumTests.h"
#include "CesiumOmniverseTests.h"

#include "cesium/omniverse/Context.h"
#include "cesium/omniverse/LoggerSink.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .bindings import acquire_cesium_omniverse_tests_interface, release_cesium_omniverse_tests_interface


class CesiumTestsExtension(omni.ext.IExt):
class CesiumOmniverseTestsExtension(omni.ext.IExt):
def __init__(self):
super().__init__()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ icon = "doc/resources/icon.png"
preview_image = "doc/resources/icon.png"

[[native.plugin]]
path = "bin/cesium.omniverse.tests.plugin"
path = "bin/cesium.omniverse.cpp.tests.plugin"

# Paths are relative to the extension folder
readme = "doc/README.md"
icon = "doc/resources/icon.png"

[[python.module]]
name = "cesium.omniverse.tests"
name = "cesium.omniverse.cpp.tests"
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions genStubs.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set NVIDIA_PYTHON_EXECUTABLE=%NVIDIA_PYTHON_ROOT%\python.exe
set FLAT_LIBRARIES_DIR=%TEMP%\CesiumOmniverseFlatLibs
set CESIUM_OMNI_STUB_PATH=%PROJECT_ROOT%\exts\cesium.omniverse\cesium\omniverse\bindings\CesiumOmniversePythonBindings.pyi
set CESIUM_USD_STUB_PATH=%PROJECT_ROOT%\exts\cesium.usd.plugins\cesium\usd\plugins\CesiumUsdSchemas\__init__.pyi
set CESIUM_TESTS_STUB_PATH=%PROJECT_ROOT%\exts\cesium.omniverse.tests\cesium\tests\bindings\CesiumOmniverseTestsPythonBindings.pyi
set CESIUM_TESTS_STUB_PATH=%PROJECT_ROOT%\exts\cesium.omniverse.cpp.tests\cesium\omniverse\cpp\tests\bindings\CesiumOmniverseCppTestsPythonBindings.pyi

set PYTHONPATH=%NVIDIA_USD_PYTHON_LIBS%;%PYTHONPATH%

Expand All @@ -37,12 +37,12 @@ cd %FLAT_LIBRARIES_DIR%\lib
echo "Generating stubs"
%NVIDIA_PYTHON_EXECUTABLE% -c "from mypy import stubgen; stubgen.main()" -m CesiumOmniversePythonBindings -v
%NVIDIA_PYTHON_EXECUTABLE% -c "from mypy import stubgen; stubgen.main()" -m _CesiumUsdSchemas -v
%NVIDIA_PYTHON_EXECUTABLE% -c "from mypy import stubgen; stubgen.main()" -m CesiumOmniverseTestsPythonBindings -v
%NVIDIA_PYTHON_EXECUTABLE% -c "from mypy import stubgen; stubgen.main()" -m CesiumOmniverseCppTestsPythonBindings -v

echo "Copying stubs"
copy out\CesiumOmniversePythonBindings.pyi %CESIUM_OMNI_STUB_PATH%
copy out\_CesiumUsdSchemas.pyi %CESIUM_USD_STUB_PATH%
copy out\CesiumOmniverseTestsPythonBindings.pyi %CESIUM_TESTS_STUB_PATH%
copy out\CesiumOmniverseCppTestsPythonBindings.pyi %CESIUM_TESTS_STUB_PATH%

echo "Formatting stubs"
black %CESIUM_OMNI_STUB_PATH%
Expand Down
6 changes: 3 additions & 3 deletions genStubs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ NVIDIA_PYTHON_EXECUTABLE=$NVIDIA_PYTHON_ROOT/python
FLAT_LIBRARIES_DIR="/tmp/CesiumOmniverseFlatLibs"
CESIUM_OMNI_STUB_PATH="$PROJECT_ROOT/exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.pyi"
CESIUM_USD_STUB_PATH="$PROJECT_ROOT/exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/__init__.pyi"
CESIUM_TESTS_STUB_PATH="$PROJECT_ROOT/exts/cesium.omniverse.tests/cesium/tests/bindings/CesiumOmniverseTestsPythonBindings.pyi"
CESIUM_TESTS_STUB_PATH="$PROJECT_ROOT/exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.pyi"

export PYTHONPATH="$NVIDIA_USD_PYTHON_LIBS:$PYTHONPATH"

Expand All @@ -37,12 +37,12 @@ cd "$FLAT_LIBRARIES_DIR/lib"
echo "Generating stubs"
$NVIDIA_PYTHON_EXECUTABLE -c 'from mypy import stubgen; stubgen.main()' -m CesiumOmniversePythonBindings -v
$NVIDIA_PYTHON_EXECUTABLE -c 'from mypy import stubgen; stubgen.main()' -m _CesiumUsdSchemas -v
$NVIDIA_PYTHON_EXECUTABLE -c 'from mypy import stubgen; stubgen.main()' -m CesiumOmniverseTestsPythonBindings -v
$NVIDIA_PYTHON_EXECUTABLE -c 'from mypy import stubgen; stubgen.main()' -m CesiumOmniverseCppTestsPythonBindings -v

echo "Copying stubs"
cp "out/CesiumOmniversePythonBindings.pyi" $CESIUM_OMNI_STUB_PATH
cp "out/_CesiumUsdSchemas.pyi" $CESIUM_USD_STUB_PATH
cp "out/CesiumOmniverseTestsPythonBindings.pyi" $CESIUM_TESTS_STUB_PATH
cp "out/CesiumOmniverseCppTestsPythonBindings.pyi" $CESIUM_TESTS_STUB_PATH

echo "Formatting stubs"
black $CESIUM_OMNI_STUB_PATH
Expand Down

0 comments on commit 7796442

Please sign in to comment.