Port usdzip to c++ with CLI11 (depends on #2107)

PixarAnimationStudios · Nov 28, 2022 · 3d34f41 · 3d34f41
1 parent 3b5b354
commit 3d34f41
Show file tree

Hide file tree

Showing 4 changed files with 377 additions and 245 deletions.
diff --git a/pxr/usd/bin/usdzip/CMakeLists.txt b/pxr/usd/bin/usdzip/CMakeLists.txt
@@ -1,10 +1,15 @@
 set(PXR_PREFIX pxr/usd)
 set(PXR_PACKAGE usd)
 
-pxr_python_bin(usdzip
-    DEPENDENCIES
+pxr_cpp_bin(usdzip
+        LIBRARIES
+        ar
+        arch
+        sdf
+        tf
         usd
-)
+        usdUtils
+        )
 
 pxr_install_test_dir(
     SRC testenv/testUsdZipInputFiles
@@ -22,7 +27,6 @@ pxr_install_test_dir(
 )
 
 pxr_register_test(testUsdZipInputFiles
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip flat.usdz src -l flat.txt"
     DIFF_COMPARE flat.txt
     EXPECTED_RETURN_CODE 0
@@ -34,7 +38,6 @@ pxr_install_test_dir(
 )
 
 pxr_register_test(testUsdZipInputFiles2
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip -r recursive.usdz src -l recursive.txt"
     DIFF_COMPARE recursive.txt
     EXPECTED_RETURN_CODE 0
@@ -46,7 +49,6 @@ pxr_install_test_dir(
 )
 
 pxr_register_test(testUsdZipInputFiles3
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip flat_inputs.usdz src/a.txt src/b.png"
     EXPECTED_RETURN_CODE 0
 )
@@ -57,26 +59,22 @@ pxr_install_test_dir(
 )
 
 pxr_register_test(testUsdZipInputFiles4
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip recursive_inputs.usdz src/a.txt src/b.png src/sub"
     EXPECTED_RETURN_CODE 0
 )
 
 pxr_register_test(testUsdZipMissingInput
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip nonexistent.usdz nonexistent.usd"
     EXPECTED_RETURN_CODE 1
 )
 
 pxr_register_test(testUsdZipAsset
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip -a root.usd package.usdz -l contents.txt"
     DIFF_COMPARE contents.txt
     EXPECTED_RETURN_CODE 0
 )
 
 pxr_register_test(testUsdZipARKitAsset
-    PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdzip --arkitAsset root.usd package.usdz -l contents_arkit.txt"
     DIFF_COMPARE contents_arkit.txt
     EXPECTED_RETURN_CODE 0

diff --git a/pxr/usd/bin/usdzip/testenv/testUsdZipInputFiles/baseline/recursive.txt b/pxr/usd/bin/usdzip/testenv/testUsdZipInputFiles/baseline/recursive.txt
@@ -1,4 +1,4 @@
 src/a.txt
 src/b.png
-src/sub/c.png
 src/sub/d.txt
+src/sub/c.png