Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Usdu 158/fix linux build #280

Draft
wants to merge 12 commits into
base: dev
Choose a base branch
from
Draft

Usdu 158/fix linux build #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e98508e
Add Linux binaries
Oct 25, 2021
7b72fc5
Fix rpath
Oct 28, 2021
384d031
Use centos for tests
judubu Oct 28, 2021
fbcf19b
Use CentOS gpu image
judubu Nov 1, 2021
7bf5470
Fix UsdCs install folder
Nov 23, 2021
9c06bbd
Make sure int64 are treated as long int on Linux
judubu Dec 7, 2021
60afb21
Install UsdCs to the right folder
judubu Dec 7, 2021
c110497
Fix CMake swig target order
judubu Dec 7, 2021
cc57605
Updated build files
judubu Dec 7, 2021
b28d5cd
Force swig library name on Linux to UsdCs
judubu Dec 7, 2021
25bb1b6
Add updated API file
judubu Dec 7, 2021
8ddae56
Fix dependencies and install path
judubu Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .yamato/upm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ test_platforms:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
- name: linux
type: Unity::VM::GPU
image: package-ci/centos:stable
flavor: b1.large
test_backends:
- name: il2cpp
editor: 2020.3
Expand Down
9 changes: 6 additions & 3 deletions cmake/install_usd_bindings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET(INSTALL_DIR ${CMAKE_SOURCE_DIR}/../package/com.unity.formats.usd/Dependencies/USD.NET/generated)
SET(INSTALL_DIR ${CMAKE_SOURCE_DIR}/../package/com.unity.formats.usd/Dependencies/USD.NET/generated)

FILE(GLOB usd_tf ${CMAKE_BINARY_DIR}/generated/Tf*.cs)
FILE(INSTALL ${usd_tf} DESTINATION ${INSTALL_DIR}/pxr/base/tf)
Expand Down Expand Up @@ -29,8 +29,8 @@ FILE(INSTALL ${usd_sdf} DESTINATION ${INSTALL_DIR}/pxr/usd/sdf)
LIST(APPEND SWIG_FILES pxr/usd/sdf/*.cs)

FILE(GLOB usd_usdcs ${CMAKE_BINARY_DIR}/generated/UsdCs*.cs)
FILE(INSTALL ${usd_usdcs} DESTINATION ${INSTALL_DIR}/usdCs)
LIST(APPEND SWIG_FILES usdCs/*.cs)
FILE(INSTALL ${usd_usdcs} DESTINATION ${INSTALL_DIR}/UsdCs)
LIST(APPEND SWIG_FILES UsdCs/*.cs)

FILE(GLOB usd_usdgeom ${CMAKE_BINARY_DIR}/generated/UsdGeom*.cs)
FILE(INSTALL ${usd_usdgeom} DESTINATION ${INSTALL_DIR}/pxr/usd/usdGeom)
Expand Down Expand Up @@ -95,6 +95,9 @@ FILE(GLOB usd_std ${CMAKE_BINARY_DIR}/generated/Std*.cs)
FILE(INSTALL ${usd_std} DESTINATION ${INSTALL_DIR}/std)
LIST(APPEND SWIG_FILES std/*.cs)

FILE(GLOB usdCsCSHARP ${CMAKE_BINARY_DIR}/generated/*.cxx)
FILE(INSTALL ${usdCsCSHARP} DESTINATION ${INSTALL_DIR})

# Create a CMakeLists.txt file to list all the generated files
set(GENERATED_CMAKE ${CMAKE_SOURCE_DIR}/../src/USD.NET/generated/CMakeLists.txt)
FILE(REMOVE ${GENERATED_CMAKE})
Expand Down
47 changes: 23 additions & 24 deletions package/com.unity.formats.usd/Dependencies/USD.NET/USD.NET.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,21 +1703,20 @@ namespace pxr
public JsValue(bool value) {}
public JsValue(double value) {}
public JsValue(int value) {}
public JsValue(long value) {}
public JsValue(string value) {}
public JsValue(System.UInt64 value) {}
public JsValue(System.UInt32 value) {}
public virtual void Dispose();
protected virtual void Finalize();
public bool GetBool();
public int GetInt();
public long GetInt64();
public int GetInt64();
public pxr.JsObjectVector GetJsArray();
public pxr.JsObject GetJsObject();
public pxr.JsValue.Type GetJsType();
public double GetReal();
public string GetString();
public string GetTypeName();
public System.UInt64 GetUInt64();
public System.UInt32 GetUInt64();
public bool IsArray();
public bool IsBool();
public bool IsInt();
Expand Down Expand Up @@ -5774,44 +5773,44 @@ namespace pxr
}
}

[System.Reflection.DefaultMember(@"Item")] public class StdUInt64Vector : System.Collections.Generic.ICollection<System.UInt64>, System.Collections.Generic.IEnumerable<System.UInt64>, System.Collections.Generic.IList<System.UInt64>, System.Collections.IEnumerable, System.IDisposable
[System.Reflection.DefaultMember(@"Item")] public class StdUInt64Vector : System.Collections.Generic.ICollection<System.UInt32>, System.Collections.Generic.IEnumerable<System.UInt32>, System.Collections.Generic.IList<System.UInt32>, System.Collections.IEnumerable, System.IDisposable
{
protected bool swigCMemOwn;
public int Capacity { get; set; }
public virtual int Count { get; }
public bool IsFixedSize { get; }
public virtual bool IsReadOnly { get; }
public bool IsSynchronized { get; }
public virtual System.UInt64 this[int index] { get; set; }
public virtual System.UInt32 this[int index] { get; set; }
public StdUInt64Vector() {}
public StdUInt64Vector(pxr.StdUInt64Vector other) {}
public StdUInt64Vector(System.Collections.ICollection c) {}
public StdUInt64Vector(int capacity) {}
public virtual void Add(System.UInt64 x);
public virtual void Add(System.UInt32 x);
public void AddRange(pxr.StdUInt64Vector values);
public virtual void Clear();
public virtual bool Contains(System.UInt64 value);
public void CopyTo(System.UInt64[] array);
public virtual void CopyTo(System.UInt64[] array, int arrayIndex);
public void CopyTo(int index, System.UInt64[] array, int arrayIndex, int count);
public virtual bool Contains(System.UInt32 value);
public void CopyTo(System.UInt32[] array);
public virtual void CopyTo(System.UInt32[] array, int arrayIndex);
public void CopyTo(int index, System.UInt32[] array, int arrayIndex, int count);
public virtual void Dispose();
protected virtual void Finalize();
public pxr.StdUInt64Vector.StdUInt64VectorEnumerator GetEnumerator();
public pxr.StdUInt64Vector GetRange(int index, int count);
public virtual int IndexOf(System.UInt64 value);
public virtual void Insert(int index, System.UInt64 x);
public virtual int IndexOf(System.UInt32 value);
public virtual void Insert(int index, System.UInt32 x);
public void InsertRange(int index, pxr.StdUInt64Vector values);
public int LastIndexOf(System.UInt64 value);
public virtual bool Remove(System.UInt64 value);
public int LastIndexOf(System.UInt32 value);
public virtual bool Remove(System.UInt32 value);
public virtual void RemoveAt(int index);
public void RemoveRange(int index, int count);
public static pxr.StdUInt64Vector Repeat(System.UInt64 value, int count);
public static pxr.StdUInt64Vector Repeat(System.UInt32 value, int count);
public void Reverse();
public void Reverse(int index, int count);
public void SetRange(int index, pxr.StdUInt64Vector values);
public sealed class StdUInt64VectorEnumerator : System.Collections.Generic.IEnumerator<System.UInt64>, System.Collections.IEnumerator, System.IDisposable
public sealed class StdUInt64VectorEnumerator : System.Collections.Generic.IEnumerator<System.UInt32>, System.Collections.IEnumerator, System.IDisposable
{
public virtual System.UInt64 Current { get; }
public virtual System.UInt32 Current { get; }
public StdUInt64VectorEnumerator(pxr.StdUInt64Vector collection) {}
public virtual void Dispose();
public virtual bool MoveNext();
Expand Down Expand Up @@ -7604,17 +7603,17 @@ namespace pxr
public static bool TfStringStartsWith(string s, pxr.TfToken prefix);
public static bool TfStringStartsWith(string s, string prefix);
public static double TfStringToDouble(string txt);
public static long TfStringToInt64(string txt);
public static long TfStringToInt64(string txt, ref bool outOfRange);
public static int TfStringToInt64(string txt);
public static int TfStringToInt64(string txt, ref bool outOfRange);
public static pxr.StdStringVector TfStringTokenize(string source);
public static pxr.StdStringVector TfStringTokenize(string source, string delimiters);
public static pxr.SWIGTYPE_p_std__setT_std__string_t TfStringTokenizeToSet(string source);
public static pxr.SWIGTYPE_p_std__setT_std__string_t TfStringTokenizeToSet(string source, string delimiters);
public static int TfStringToLong(string txt);
public static int TfStringToLong(string txt, ref bool outOfRange);
public static string TfStringToLower(string source);
public static System.UInt64 TfStringToUInt64(string txt);
public static System.UInt64 TfStringToUInt64(string txt, ref bool outOfRange);
public static System.UInt32 TfStringToUInt64(string txt);
public static System.UInt32 TfStringToUInt64(string txt, ref bool outOfRange);
public static System.UInt32 TfStringToULong(string txt);
public static System.UInt32 TfStringToULong(string txt, ref bool outOfRange);
public static string TfStringToUpper(string source);
Expand Down Expand Up @@ -7829,7 +7828,7 @@ namespace pxr
public static int VtValueToint(pxr.VtValue value);
public static void VtValueToint(pxr.VtValue value, ref int output);
public static long VtValueTolong(pxr.VtValue value);
public static void VtValueTolong(pxr.VtValue value, ref long output);
public static void VtValueTolong(pxr.VtValue value, ref int output);
public static pxr.SdfAssetPath VtValueToSdfAssetPath(pxr.VtValue value);
public static void VtValueToSdfAssetPath(pxr.VtValue value, pxr.SdfAssetPath output);
public static pxr.SdfAssetPathArray VtValueToSdfAssetPathArray(pxr.VtValue value);
Expand All @@ -7845,7 +7844,7 @@ namespace pxr
public static System.UInt32 VtValueTouint(pxr.VtValue value);
public static void VtValueTouint(pxr.VtValue value, ref System.UInt32 output);
public static System.UInt64 VtValueToulong(pxr.VtValue value);
public static void VtValueToulong(pxr.VtValue value, ref System.UInt64 output);
public static void VtValueToulong(pxr.VtValue value, ref System.UInt32 output);
public static pxr.VtBoolArray VtValueToVtBoolArray(pxr.VtValue value);
public static void VtValueToVtBoolArray(pxr.VtValue value, pxr.VtBoolArray output);
public static pxr.VtDoubleArray VtValueToVtDoubleArray(pxr.VtValue value);
Expand Down
42 changes: 21 additions & 21 deletions package/com.unity.formats.usd/Dependencies/USD.NET/generated/UsdCs/UsdCs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,30 +65,30 @@ public static uint TfStringToULong(string txt)
return ret;
}

public static long TfStringToInt64(string txt, ref bool outOfRange)
public static int TfStringToInt64(string txt, ref bool outOfRange)
{
long ret = UsdCsPINVOKE.TfStringToInt64__SWIG_0(txt, ref outOfRange);
int ret = UsdCsPINVOKE.TfStringToInt64__SWIG_0(txt, ref outOfRange);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public static long TfStringToInt64(string txt)
public static int TfStringToInt64(string txt)
{
long ret = UsdCsPINVOKE.TfStringToInt64__SWIG_1(txt);
int ret = UsdCsPINVOKE.TfStringToInt64__SWIG_1(txt);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public static ulong TfStringToUInt64(string txt, ref bool outOfRange)
public static uint TfStringToUInt64(string txt, ref bool outOfRange)
{
ulong ret = UsdCsPINVOKE.TfStringToUInt64__SWIG_0(txt, ref outOfRange);
uint ret = UsdCsPINVOKE.TfStringToUInt64__SWIG_0(txt, ref outOfRange);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public static ulong TfStringToUInt64(string txt)
public static uint TfStringToUInt64(string txt)
{
ulong ret = UsdCsPINVOKE.TfStringToUInt64__SWIG_1(txt);
uint ret = UsdCsPINVOKE.TfStringToUInt64__SWIG_1(txt);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand Down Expand Up @@ -2614,7 +2614,7 @@ public static long VtValueTolong(VtValue value)
}

[Preserve]
public static void VtValueTolong(VtValue value, ref long output)
public static void VtValueTolong(VtValue value, ref int output)
{
UsdCsPINVOKE.VtValueTolong__SWIG_1(VtValue.getCPtr(value), ref output);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
Expand All @@ -2636,47 +2636,47 @@ public static void VtValueTostring(VtValue value, SWIGTYPE_p_std__string output)
}

[Preserve]
public static ulong VtValueToulong(VtValue value)
public static byte VtValueTobyte(VtValue value)
{
ulong ret = UsdCsPINVOKE.VtValueToulong__SWIG_0(VtValue.getCPtr(value));
byte ret = UsdCsPINVOKE.VtValueTobyte__SWIG_0(VtValue.getCPtr(value));
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

[Preserve]
public static void VtValueToulong(VtValue value, ref ulong output)
public static void VtValueTobyte(VtValue value, ref byte output)
{
UsdCsPINVOKE.VtValueToulong__SWIG_1(VtValue.getCPtr(value), ref output);
UsdCsPINVOKE.VtValueTobyte__SWIG_1(VtValue.getCPtr(value), ref output);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
}

[Preserve]
public static byte VtValueTobyte(VtValue value)
public static uint VtValueTouint(VtValue value)
{
byte ret = UsdCsPINVOKE.VtValueTobyte__SWIG_0(VtValue.getCPtr(value));
uint ret = UsdCsPINVOKE.VtValueTouint__SWIG_0(VtValue.getCPtr(value));
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

[Preserve]
public static void VtValueTobyte(VtValue value, ref byte output)
public static void VtValueTouint(VtValue value, ref uint output)
{
UsdCsPINVOKE.VtValueTobyte__SWIG_1(VtValue.getCPtr(value), ref output);
UsdCsPINVOKE.VtValueTouint__SWIG_1(VtValue.getCPtr(value), ref output);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
}

[Preserve]
public static uint VtValueTouint(VtValue value)
public static ulong VtValueToulong(VtValue value)
{
uint ret = UsdCsPINVOKE.VtValueTouint__SWIG_0(VtValue.getCPtr(value));
ulong ret = UsdCsPINVOKE.VtValueToulong__SWIG_0(VtValue.getCPtr(value));
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

[Preserve]
public static void VtValueTouint(VtValue value, ref uint output)
public static void VtValueToulong(VtValue value, ref uint output)
{
UsdCsPINVOKE.VtValueTouint__SWIG_1(VtValue.getCPtr(value), ref output);
UsdCsPINVOKE.VtValueToulong__SWIG_1(VtValue.getCPtr(value), ref output);
if (UsdCsPINVOKE.SWIGPendingException.Pending) throw UsdCsPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
Loading