Merge pull request #4 from isaac-sim/release/5.0

Release 5.0
isaac-sim · Jan 31, 2025 · 67930d1 · 67930d1
2 parents ba20067 + b0bf288
commit 67930d1
Show file tree

Hide file tree

Showing 267 changed files with 4,226 additions and 3,636 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,11 @@ PACKAGE-DEPS.yaml
 /.teamcity
 /tools/ci
 .lastformat
+
+# nvcode
+/.nvcode
+.nvcode.json
+
+# Accidental USD created at the mjcf data folder
+
+source/extensions/isaacsim.asset.importer.mjcf/data/mjcf/**/*.usd
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,7 +3,9 @@ include:
   - project: 'omniverse/devplat/gitlab/templates/common/kit-extension'
     file: 'modules/complete-pipeline.yml'
     ref: v1_latest
-
+  - project: 'omniverse/devplat/gitlab/templates/common/compliance'
+    file: 'modules/omniverse-repo-compliance.gitlab-ci.yml'
+    ref: v1_latest
 
 
 # ==============================================================================================================
@@ -165,3 +167,15 @@ release-new-version:
 autoupdate-kit:
   rules:
   - when: never
+
+# overrides for compliance/osec job
+osec:sonarqube:
+  variables:
+    SONAR_SOURCES: "source"
+    SONAR_CFAMILY_COMPILE_COMMANDS: "_build/linux-x86_64/release/compile_commands.json"
+    LINBUILD_EMBEDDED: "1"
+  before_script:
+    - set -eu && ./repo.sh build --generate --config release
+
+.osec:stage_base:
+  stage: .post
diff --git a/PACKAGE-LICENSES/assimp-LICENSE.txt b/PACKAGE-LICENSES/assimp-LICENSE.txt
diff --git a/deps/ext-deps.packman.xml b/deps/ext-deps.packman.xml
@@ -18,13 +18,13 @@
       <package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-linux-aarch64_py310_debug-kit-release-integ-23-04-105-0-0" platforms="linux-aarch64" checksum="b3c43e940fa613bd5c3fe6de7cd898e4f6304693f8d9ed76da359f04a0de8b02" />
   </dependency>
 
+  <dependency name="omniverse_asset_converter" linkPath="../_build/target-deps/omniverse_asset_converter">
+    <package name="omniverse_asset_converter" version="3.2.1+release.1822.6d5a39f3.gl.${platform}.release" platforms="${platform}" />
+  </dependency>
+
   <dependency name="tinyxml2" linkPath="../_build/target-deps/tinyxml2">
       <package name="tinyxml2" version="linux_x64_20200823_2c5a6bf" platforms="linux-x86_64" />
       <package name="tinyxml2" version="win_x64_20200824_2c5a6bf" platforms="windows-x86_64" />
   </dependency>
-  <dependency name="assimp" linkPath="../_build/target-deps/assimp">
-      <package name="assimp" version="5.0.0.50.aa41375a-windows-x86_64-release" platforms="windows-x86_64"/>
-      <package name="assimp" version="5.0.0.50.aa41375a-linux-x86_64-release" platforms="linux-x86_64"/>
-  </dependency>
 
 </project>
diff --git a/deps/kit-sdk-deps.packman.xml b/deps/kit-sdk-deps.packman.xml
@@ -1,40 +1,34 @@
 <project toolsVersion="5.0">
   <!-- Import dependencies from Kit SDK to ensure we're using the same versions. -->
   <import path="../_build/${platform}/${config}/kit/dev/all-deps.packman.xml">
-    <filter include="carb_sdk_plugins"/>
-    <filter include="doctest"/>
     <filter include="pybind11"/>
     <filter include="python"/>
-    <filter include="client_library" />
+    <filter include="usd-${config}" />
     <filter include="omni_usd_resolver" />
     <filter include="nv_usd_py310_${config}" />
   </import>
 
-  <!-- Import Physics plugins deps -->
-  <import path="../_build/target-deps/omni_physics/deps/target-deps.packman.xml">
-    <filter include="pxshared" />
-    <filter include="physx" />
-    <filter include="vhacd" />
-  </import>
 
-  <import path="../_build/target-deps/omni_physics/deps/schema-deps.packman.xml">
-    <filter include="usd_ext_physics_${config}" />
-  </import>
+
 
   <!-- Override the link paths to point to the correct locations. -->
-  <dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
+  <dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins">
+      <package name="carb_sdk+plugins.${platform}" version="180.6+release.7436.c5558fdf.gl" platforms="${platform}" />
+  </dependency>
+  <dependency name="usd-${config}" linkPath="../_build/target-deps/nv_usd/${config}" />
   <dependency name="nv_usd_py310_${config}" linkPath="../_build/target-deps/nv_usd/${config}" />
   <dependency name="pybind11" linkPath="../_build/target-deps/pybind11"/>
   <dependency name="python" linkPath="../_build/target-deps/python"/>
-  <dependency name="client_library" linkPath="../_build/target-deps/client_library" />
+  <dependency name="omni_client_library" linkPath="../_build/target-deps/omni_client_library">
+  <package name="omni_client_library.${platform}" version="2.53.0" platforms="${platform}" />
+  </dependency>
   <dependency name="omni_usd_resolver" linkPath="../_build/target-deps/omni_usd_resolver" />
+  <dependency name="usd_schema_semantics_${config}" linkPath="../_build/target-deps/usd_schema_semantics/${config}" />
 
-  <dependency name="pxshared" linkPath="../_build/target-deps/pxshared"/>
-  <dependency name="physx" linkPath="../_build/target-deps/physx" />
   <dependency name="vhacd" linkPath="../_build/target-deps/vhacd" />
-  <dependency name="usd_ext_physics_${config}" linkPath="../_build/target-deps/usd_ext_physics/${config}" />
 
-  <import path="../_build/${platform}/${config}/kit/dev/deps/linbuild.packman.xml">
+  <!-- <import path="../_build/${platform}/${config}/kit/dev/deps/linbuild.packman.xml">
     <filter include="linbuild" linkPath="../_build/host-deps/linbuild" tags="non-redist" />
   </import>
+   -->
 </project>
diff --git a/deps/kit-sdk.packman.xml b/deps/kit-sdk.packman.xml
@@ -1,5 +1,5 @@
 <project toolsVersion="5.0">
   <dependency name="kit_sdk_${config}" linkPath="../_build/${platform}/${config}/kit" tags="${config} non-redist">
-    <package name="kit-sdk" version="106.0.0+release.150235.1f3a71ae.tc.${platform}.${config}"/>
+     <package name="kit-kernel" version="106.5.0+release.162521.d02c707b.gl.${platform}.release"/>
   </dependency>
 </project>
diff --git a/deps/omni-physics.packman.xml b/deps/omni-physics.packman.xml
@@ -1,13 +1,10 @@
-<project toolsVersion="5.0">
+<project toolsVersion="5.6">
   <!-- Import Kit SDk target-deps xml file to steal some deps from it: -->
   <!-- <import path="../_build/${platform}/${config}/kit/dev/deps/target-deps.packman.xml">
     <filter include="omni_physics" />
   </import> -->
 
-  <!-- Pull those deps of the same version as in Kit SDK. Override linkPath to point correctly, other properties can also be override, including version. -->
-  <dependency name="omni_physics" linkPath="../_build/target-deps/omni_physics">
-    <!-- Uncomment and change the version/path below when using a custom package -->
-    <package name="omni_physics_dev" version="106.0.9908-2f73dac8-release_106.0-${platform}-${config}" platforms="windows-x86_64 linux-x86_64 linux-aarch64"/>
-    <!-- <source path="/path/to/omni_physics" /> -->
+  <dependency name="usd_ext_physics_${config}" linkPath="../_build/target-deps/usd_ext_physics/${config}">
+    <package name="usd_ext_physics" version="22.11+106.0.11913.7b63f9b1.gl.${platform}.${config}" platforms="windows-x86_64 linux-x86_64 linux-aarch64" />
   </dependency>
 </project>
diff --git a/deps/omni-usd-resolver.packman.xml b/deps/omni-usd-resolver.packman.xml
diff --git a/deps/repo-deps.packman.xml b/deps/repo-deps.packman.xml
@@ -1,38 +1,35 @@
 <project toolsVersion="5.0">
   <dependency name="repo_build" linkPath="../_repo/deps/repo_build">
-    <package name="repo_build" version="0.62.7" />
-  </dependency>
-  <dependency name="repo_changelog" linkPath="../_repo/deps/repo_changelog">
-   <package name="repo_changelog" version="0.8.4" />
+    <package name="repo_build" version="0.63.1" />
   </dependency>
   <dependency name="repo_docs" linkPath="../_repo/deps/repo_docs">
-    <package name="repo_docs" version="0.50.3" />
+    <package name="repo_docs" version="0.39.2" />
   </dependency>
   <dependency name="repo_kit_tools" linkPath="../_repo/deps/repo_kit_tools">
-    <package name="repo_kit_tools" version="0.15.3" />
-  </dependency>
-  <dependency name="repo_licensing" linkPath="../_repo/deps/repo_licensing" tags="non-redist">
-    <package name="repo_licensing" version="1.15.11" />
+    <package name="repo_kit_tools" version="0.20.6" />
   </dependency>
   <dependency name="repo_man" linkPath="../_repo/deps/repo_man">
-    <package name="repo_man" version="1.57.12" />
+    <package name="repo_man" version="1.70.2" />
   </dependency>
   <dependency name="repo_package" linkPath="../_repo/deps/repo_package">
-    <package name="repo_package" version="5.9.8" />
+    <package name="repo_package" version="5.12.3" />
   </dependency>
   <dependency name="repo_format" linkPath="../_repo/deps/repo_format">
-    <package name="repo_format" version="2.12.6" />
+    <package name="repo_format" version="2.13.0" />
   </dependency>
   <dependency name="repo_source" linkPath="../_repo/deps/repo_source">
-    <package name="repo_source" version="0.5.3" />
+    <package name="repo_source" version="0.6.0" />
   </dependency>
   <dependency name="repo_test" linkPath="../_repo/deps/repo_test">
-    <package name="repo_test" version="2.31.2" />
+    <package name="repo_test" version="2.37.0" />
   </dependency>
   <dependency name="repo_ci" linkPath="../_repo/deps/repo_ci">
-    <package name="repo_ci" version="0.6.1" />
+    <package name="repo_ci" version="0.8.5" />
+  </dependency>
+  <dependency name="repo_usd" linkPath="../_repo/deps/repo_usd">
+    <package name="repo_usd" version="5.0.4" />
   </dependency>
   <dependency name="repo_symstore" linkPath="../_repo/deps/repo_symstore">
-    <package name="repo_symstore" version="1.0.28" />
+    <package name="repo_symstore" version="1.0.21" />
   </dependency>
 </project>
diff --git a/index.rst b/index.rst
@@ -1,6 +1,6 @@
+==========================
 Omniverse MJCF Importer
-=======================
-
+==========================
 .. mdinclude:: README.md
 
 Extension Documentation
@@ -9,7 +9,20 @@ Extension Documentation
    :maxdepth: 1
    :glob:
 
-   source/extensions/omni.importer.mjcf/docs/index
-   source/extensions/omni.importer.mjcf/docs/Overview
-   source/extensions/omni.importer.mjcf/docs/CHANGELOG
-   CONTRIBUTING
+   source/extensions/isaacsim.asset.importer.mjcf/docs/index
+   source/extensions/isaacsim.asset.importer.mjcf/docs/Overview
+   source/extensions/isaacsim.asset.importer.mjcf/docs/CHANGELOG
+
+
+CONTRIBUTING
+~~~~~~~~~~~~~
+.. mdinclude:: CONTRIBUTING.md
+
+Deprecated Extension
+~~~~~~~~~~~~~~~~~~~~~
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   source/deprecated/omni.importer.mjcf/docs/CHANGELOG
+   source/deprecated/omni.importer.mjcf/docs/README
diff --git a/premake5.lua b/premake5.lua
@@ -15,4 +15,7 @@ dofile("_repo/deps/repo_kit_tools/kit-template/premake5.lua")
 
 -- The default kit dev app with extensions from this repo made available.
 -- define_app("omni.app.kit.dev")
-define_app("omni.importer.mjcf.app")
+define_app("isaacsim.asset.importer.mjcf.app")
+
+include ("source/deprecated/omni.importer.mjcf")
+-- include ("source/extensions/isaacsim.asset.importer.mjcf")/
diff --git a/repo.bat b/repo.bat
@@ -1,10 +1,18 @@
 @echo off
 
+:: Set OMNI_REPO_ROOT early so `repo` bootstrapping can target the repository
+:: root when writing out Python dependencies.
+:: Use SETLOCAL and ENDLOCAL to constrain these variables to this batch file.
+SETLOCAL
+set OMNI_REPO_ROOT="%~dp0"
+
 call "%~dp0tools\packman\python.bat" "%~dp0tools\repoman\repoman.py" %*
 if %errorlevel% neq 0 ( goto Error )
 
 :Success
+ENDLOCAL
 exit /b 0
 
 :Error
+ENDLOCAL
 exit /b %errorlevel%
diff --git a/repo.sh b/repo.sh
@@ -2,7 +2,12 @@
 
 set -e
 
+# Set OMNI_REPO_ROOT early so `repo` bootstrapping can target the repository
+# root when writing out Python dependencies.
+export OMNI_REPO_ROOT="$( cd "$(dirname "$0")" ; pwd -P )"
+
 SCRIPT_DIR=$(dirname ${BASH_SOURCE})
 cd "$SCRIPT_DIR"
 
+# Use "exec" to ensure that envrionment variables don't accidentally affect other processes.
 exec "tools/packman/python.sh" tools/repoman/repoman.py "$@"