Migrate to harmonic

.gitignore

@@ -1,4 +1,60 @@
-_build
-_compiler
-cross_compile
-__pycache__/
+# editor files
+*.swp
+/.vscode/
+*/.vs/
+
+# generated files
+_*/
+/packages/
+VERSION
+version.rc
+Version.h
+
+# byte-compiled python files
+*.py[cod]
+
+# packman package files
+*@*.7z
+*@*.zip
+
+# user files
+*.user
+user.repo.toml
+
+# binaries
+*.ico
+*.bmp
+*.png
+*.gif
+*.jpg
+*.jpeg
+*.tga
+*.psd
+*.raw
+*.exr
+*.hdr
+*.dds
+*.ktx
+*.spv
+*.dxbc
+*.dxil
+*.gltf
+*.glb
+*.fbx
+*.usd
+*.usda
+*.usdz
+*.obj
+*.mat
+/.lastformat
+
+# allow files in resources
+!/resources/
+!/resources/*
+!/resources/**/*
+
+# python logging file
+pyLogging.log
+
+# packman packaging file
+PACKAGE-DEPS.yaml

CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
-project(ignition-omniverse1 NONE)
+project(gazebo-omniverse1 NONE)
 
 # FIXME: This always builds debug mode
 add_custom_target(build ALL
-	${CMAKE_CURRENT_SOURCE_DIR}/build.sh -d
+	${CMAKE_CURRENT_SOURCE_DIR}/repo.sh build
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

PACKAGE-INFO.yaml

@@ -1,6 +1,6 @@
-Package : ignition-conection
+Package : gazebo-conection
 Version : 000-linux-x86_64
 Maintainers : N/A
 Description : N/A
-Repository : https://github.com/ignitionrobotics/ign-omni
+Repository : https://github.com/gazebosim/gz-omni
 Branch : main

build.sh

@@ -2,39 +2,6 @@
 
 set -e
 
-rebuild () {
-    "$SCRIPT_DIR/tools/packman/python.sh" "$SCRIPT_DIR/tools/repoman/clean.py" $@ || exit 1
-}
-
-clean () {
-    "$SCRIPT_DIR/tools/packman/python.sh" "$SCRIPT_DIR/tools/repoman/clean.py"
-    exit $?
-}
-
 SCRIPT_DIR=$(dirname ${BASH_SOURCE})
 
-POSITIONAL=()
-while [[ $# -gt 0 ]]
-do
-    case $1 in
-        -c|--clean)
-        clean
-        ;;
-        -x|--rebuild)
-        rebuild
-        shift
-        ;;
-        *)
-        POSITIONAL+=("$1")
-        shift
-        ;;
-    esac
-done
-
-set -- "${POSITIONAL[@]}" # restore positional parameters
-
-
-./prebuild.sh "$@" || exit $?
-
-ARGS_FLATTENED="$@"
-source "$SCRIPT_DIR/tools/packman/python.sh" "$SCRIPT_DIR/tools/repoman/build.py" $ARGS_FLATTENED || exit $?
+"$SCRIPT_DIR/tools/packman/python.sh" "$SCRIPT_DIR/tools/repoman/repoman.py" build "$@" || exit $?

colcon.pkg

@@ -1,7 +1,7 @@
-name: ignition-omniverse1
+name: gazebo-omniverse1
 type: cmake
 dependencies:
-  - ignition-common4
-  - ignition-msgs8
-  - ignition-transport11
-  - sdformat12
+  - gazebo-common5
+  - gazebo-msgs10
+  - gazebo-transport13
+  - sdformat14

deps/connect-sdk-deps.packman.xml

@@ -0,0 +1,21 @@
+<project toolsVersion="5.0">
+  <import path="../_build/target-deps/omni_connect_sdk/$config/dev/deps/all-deps.packman.xml">
+    <filter include="premake"/>
+    <filter include="python"/>
+    <filter include="usd_$config"/>
+    <filter include="carb_sdk_plugins"/>
+    <filter include="omni_usd_resolver"/>
+    <filter include="omni_client_library"/>
+    <filter include="omni_asset_validator"/>
+    <filter include="omni_transcoding"/>
+  </import>
+
+  <dependency name="premake" linkPath="../_build/host-deps/premake" />
+  <dependency name="python" linkPath="../_build/target-deps/python" />
+  <dependency name="usd_$config" linkPath="../_build/target-deps/usd/$config" />
+  <dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins" />
+  <dependency name="omni_usd_resolver" linkPath="../_build/target-deps/omni_usd_resolver" />
+  <dependency name="omni_client_library" linkPath="../_build/target-deps/omni_client_library" />
+  <dependency name="omni_asset_validator" linkPath="../_build/target-deps/omni_asset_validator" />
+  <dependency name="omni_transcoding" linkPath="../_build/target-deps/omni_transcoding/$config" />
+</project>

deps/host-deps.packman.xml

@@ -1,69 +1,16 @@
 <project toolsVersion="5.6">
-  <dependency name="premake" linkPath="../_build/host-deps/premake">
-    <package name="premake" version="5.0.9-nv-main-68e9a88a-${platform}" />
-  </dependency>
 
-  <dependency name="downloaded_msvc" linkPath="../_build/host-deps/downloaded_msvc">
-    <package name="msvc" version="2019-16.7.6-license" platforms="windows-x86_64" />
+  <!-- the folder must be called .../msvc for build.py to find MSBuild -->
+  <dependency name="msvc" linkPath="../_build/host-deps/msvc" tags="license-bypass">
+    <package name="msvc" version="2019-16.11.17-ndebug" platforms="windows-x86_64" />
   </dependency>
 
-  <dependency name="downloaded_winsdk" linkPath="../_build/host-deps/downloaded_winsdk">
+  <dependency name="winsdk" linkPath="../_build/host-deps/winsdk">
     <package name="winsdk" version="10.0.18362.0-license" platforms="windows-x86_64"/>
   </dependency>
 
-  <!--
-    Change the paths below *if you want to provide your own* VS 2019 toolchain or your own Windows SDK 10.17763.
-    The VS 2019 toolchain can be downloaded from here:
-     https://aka.ms/vs/16/release/vs_buildtools.exe
-     (Choose Desktop Development with C++, you can uncheck the included Windows SDK)
-    The Windows SDK 10.17763 can be downloaded from here:
-     https://go.microsoft.com/fwlink/p/?LinkID=2033908
-  -->
-  <dependency name="buildtools" linkPath="../_build/host-deps/buildtools">
-    <!--
-      If you have installed the VS 2019 toolchain to the default path replace the package element with the following:
-      <source path="C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/downloaded_msvc" platforms="windows-x86_64" />
-  </dependency>
+  <!-- This is explicitly listed here so that we don't have to specify detailed paths in premake5.lua's paths.clExeDir -->
   <dependency name="vc" linkPath="../_build/host-deps/vc">
-    <!--
-      If you have installed the VS 2019 toolchain to the default path replace the source element below as follows:
-      <source path="../_build/host-deps/buildtools/VC/Tools/MSVC/14.27.29110" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/buildtools/VC/Tools/MSVC/14.27.29110" platforms="windows-x86_64" />
-  </dependency>
-
-  <!-- WINDOWS SDK -->
-  <dependency name="winsdk" linkPath="../_build/host-deps/.winsdk">
-    <!--
-      If you have installed the Windows SDK to the default path replace the package element below with this:
-      <source path="C:/Program Files (x86)/Windows Kits/10" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/downloaded_winsdk" platforms="windows-x86_64" />
-  </dependency>
-
-  <dependency name="winsdk_bin" linkPath="../_build/host-deps/winsdk/bin">
-    <!--
-      If you have installed the Windows SDK to the default path replace the source element below with this:
-      <source path="../_build/host-deps/.winsdk/bin/10.0.17763.0" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/.winsdk/bin" platforms="windows-x86_64" />
-  </dependency>
-
-  <dependency name="winsdk_include" linkPath="../_build/host-deps/winsdk/include">
-    <!--
-      If you have installed the Windows SDK to the default path replace the source element below with this:
-      <source path="../_build/host-deps/.winsdk/include/10.0.17763.0" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/.winsdk/include" platforms="windows-x86_64" />
-  </dependency>
-
-  <dependency name="winsdk_lib" linkPath="../_build/host-deps/winsdk/lib">
-    <!--
-      If you have installed the Windows SDK to the default path replace the source element below with this:
-      <source path="../_build/host-deps/.winsdk/lib/10.0.17763.0" platforms="windows-x86_64" />
-    -->
-      <source path="../_build/host-deps/.winsdk/lib" platforms="windows-x86_64" />
+      <source path="../_build/host-deps/msvc/VC/Tools/MSVC/14.29.30133" platforms="windows-x86_64" />
   </dependency>
 </project>

deps/repo-deps.packman.xml

@@ -0,0 +1,23 @@
+<project toolsVersion="5.0">
+  <dependency name="repo_man" linkPath="../_repo/deps/repo_man">
+      <package name="repo_man" version="1.58.4" />
+  </dependency>
+  <dependency name="repo_build" linkPath="../_repo/deps/repo_build">
+      <package name="repo_build" version="0.63.1" />
+  </dependency>
+  <dependency name="repo_ci" linkPath="../_repo/deps/repo_ci">
+     <package name="repo_ci" version="0.8.1" />
+  </dependency>
+  <dependency name="repo_format" linkPath="../_repo/deps/repo_format">
+    <package name="repo_format" version="2.12.5" />
+  </dependency>
+  <dependency name="repo_package" linkPath="../_repo/deps/repo_package">
+    <package name="repo_package" version="5.9.9" />
+  </dependency>
+  <dependency name="repo_source" linkPath="../_repo/deps/repo_source">
+    <package name="repo_source" version="0.5.3"/>
+  </dependency>
+  <dependency name="repo_test" linkPath="../_repo/deps/repo_test">
+    <package name="repo_test" version="2.32.4"/>
+  </dependency>
+</project>

deps/target-deps.packman.xml

@@ -1,27 +1,10 @@
 <project toolsVersion="5.6">
-  <dependency name="python" linkPath="../_build/target-deps/python">
-    <package name="python" version="3.7.9-windows-x86_64" platforms="windows-x86_64" />
-    <package name="python" version="3.7.9-173.e9ee4ea0-${platform}" platforms="linux-x86_64" />
-  </dependency>
-
-  <dependency name="lua" linkPath="../_build/target-deps/lua">
-    <package name="lua" version="5.3.4-9882100-${platform}" />
-  </dependency>
-
-  <dependency name="nv_usd_py37_debug" linkPath="../_build/target-deps/nv_usd/debug">
-    <package name="nv-usd" version="20.08.1818.f41ff452-win64_py37_debug-main" platforms="windows-x86_64"/>
-    <package name="nv-usd" version="20.08.1818.f41ff452-linux64_py37-centos_debug-main" platforms="linux-x86_64" />
-    <package name="nv-usd" version="20.08.1818.f41ff452-linux-aarch64_py37_debug-main" platforms="linux-aarch64" />
-  </dependency>
 
-  <dependency name="nv_usd_py37_release" linkPath="../_build/target-deps/nv_usd/release">
-    <package name="nv-usd" version="20.08.1818.f41ff452-win64_py37_release-main" platforms="windows-x86_64"/>
-    <package name="nv-usd" version="20.08.1818.f41ff452-linux64_py37-centos_release-main" platforms="linux-x86_64" />
-    <package name="nv-usd" version="20.08.1818.f41ff452-linux-aarch64_py37_release-main" platforms="linux-aarch64" />
+  <dependency name="omni_connect_sdk" linkPath="../_build/target-deps/omni_connect_sdk/$config">
+    <package name="omni_connect_sdk.usd-pxr-23_11.py310.nucleus-on.${platform}.${config}" version="1.0.0" />
   </dependency>
-
-  <dependency name="omni_client_library" linkPath="../_build/target-deps/omni_client_library">
-    <package name="omni_client_library.py37.${platform}" version="1.13.19-main.2174+tc.b44c68ac" />
+  <dependency name="omni_core_materials" linkPath="../_build/target-deps/omni_core_materials">
+    <package name="omni_core_materials" version="1.1.2.1-0881c257" />
   </dependency>
 
 </project>

launcher.toml

@@ -1,10 +1,10 @@
 #displayed application name
-name = "Ignition Omni Connector"
+name = "Gazebo Omni Connector"
 #displayed before application name in launcher
 productArea = "Omniverse"
 
 #unique identifier for component, all lower case, persists between versions
-slug = "ignitionomni"
+slug = "gzomni"
 
 ## install and launch instructions by environment
 # Windows