diff --git a/LICENSE b/LICENSE index 4085b0fe..f4dd9c6c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,16 @@ -MIT License +Apache 2.0 License -Copyright (c) 2020-present Syoyo Fujita +Copyright (c) 2020-2023 Syoyo Fujita +Copyright (c) 2024-Present Light Transport Entertainment Inc. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + http://www.apache.org/licenses/LICENSE-2.0 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/MANIFEST.in b/MANIFEST.in index 7c65a17c..74e7e557 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -75,74 +75,12 @@ include src/external/dr_wav.h include src/external/fast_float/LICENSE-APACHE include src/external/fast_float/LICENSE-MIT include src/external/fast_float/README.md -include src/external/fast_float/include/fast_float/ascii_number.h -include src/external/fast_float/include/fast_float/bigint.h -include src/external/fast_float/include/fast_float/decimal_to_binary.h -include src/external/fast_float/include/fast_float/digit_comparison.h -include src/external/fast_float/include/fast_float/fast_float.h -include src/external/fast_float/include/fast_float/fast_table.h -include src/external/fast_float/include/fast_float/float_common.h -include src/external/fast_float/include/fast_float/parse_number.h -include src/external/fast_float/include/fast_float/simple_decimal_conversion.h +include src/external/fast_float/include/fast_float/*.h include src/external/fpng.cpp include src/external/fpng.h -include src/external/itoa -include src/external/itoa/include -include src/external/itoa/include/itoa -include src/external/itoa/include/itoa/jeaiii_to_text.h -include src/external/itoa/itoa -include src/external/itoa/itoa/0_OLD_VERSIONS.txt -include src/external/itoa/itoa/int_to_chars_jeaiii.h -include src/external/itoa/itoa/itoa_jeaiii.cpp -include src/external/itoa/itoa/to_chars.cpp -include src/external/itoa/itoa/to_text_from_integer.h -include src/external/itoa/LICENSE -include src/external/itoa/README.md -include src/external/itoa/test -include src/external/itoa/test/main.cpp -include src/external/itoa/test/test.sln -include src/external/itoa/test/test.vcxproj -include src/external/itoa/test/test.vcxproj.filters include src/external/jsonhpp/LICENSE.MIT -include src/external/jsonhpp/nlohmann/adl_serializer.hpp -include src/external/jsonhpp/nlohmann/byte_container_with_subtype.hpp -include src/external/jsonhpp/nlohmann/detail/conversions/from_json.hpp -include src/external/jsonhpp/nlohmann/detail/conversions/to_chars.hpp -include src/external/jsonhpp/nlohmann/detail/conversions/to_json.hpp -include src/external/jsonhpp/nlohmann/detail/exceptions.hpp -include src/external/jsonhpp/nlohmann/detail/hash.hpp -include src/external/jsonhpp/nlohmann/detail/input/binary_reader.hpp -include src/external/jsonhpp/nlohmann/detail/input/input_adapters.hpp -include src/external/jsonhpp/nlohmann/detail/input/json_sax.hpp -include src/external/jsonhpp/nlohmann/detail/input/lexer.hpp -include src/external/jsonhpp/nlohmann/detail/input/parser.hpp -include src/external/jsonhpp/nlohmann/detail/input/position_t.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/internal_iterator.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/iter_impl.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/iteration_proxy.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/iterator_traits.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/json_reverse_iterator.hpp -include src/external/jsonhpp/nlohmann/detail/iterators/primitive_iterator.hpp -include src/external/jsonhpp/nlohmann/detail/json_pointer.hpp -include src/external/jsonhpp/nlohmann/detail/json_ref.hpp -include src/external/jsonhpp/nlohmann/detail/macro_scope.hpp -include src/external/jsonhpp/nlohmann/detail/macro_unscope.hpp -include src/external/jsonhpp/nlohmann/detail/meta/cpp_future.hpp -include src/external/jsonhpp/nlohmann/detail/meta/detected.hpp -include src/external/jsonhpp/nlohmann/detail/meta/identity_tag.hpp -include src/external/jsonhpp/nlohmann/detail/meta/is_sax.hpp -include src/external/jsonhpp/nlohmann/detail/meta/type_traits.hpp -include src/external/jsonhpp/nlohmann/detail/meta/void_t.hpp -include src/external/jsonhpp/nlohmann/detail/output/binary_writer.hpp -include src/external/jsonhpp/nlohmann/detail/output/output_adapters.hpp -include src/external/jsonhpp/nlohmann/detail/output/serializer.hpp -include src/external/jsonhpp/nlohmann/detail/string_escape.hpp -include src/external/jsonhpp/nlohmann/detail/value_t.hpp include src/external/jsonhpp/nlohmann/json.hpp include src/external/jsonhpp/nlohmann/json_fwd.hpp -include src/external/jsonhpp/nlohmann/ordered_map.hpp -include src/external/jsonhpp/nlohmann/thirdparty/hedley/hedley.hpp -include src/external/jsonhpp/nlohmann/thirdparty/hedley/hedley_undef.hpp include src/external/jsteemann/LICENSE include src/external/jsteemann/README.md include src/external/jsteemann/atoi.h @@ -524,8 +462,8 @@ include src/performance.cc include src/performance.hh include src/pprinter.cc include src/pprinter.hh -include src/prim-composition.cc -include src/prim-composition.hh +include src/composition.cc +include src/composition.hh include src/prim-pprint.hh include src/prim-reconstruct.cc include src/prim-reconstruct.hh @@ -606,4 +544,4 @@ include src/external/OpenFBX/src/ofbx.cpp include src/external/OpenFBX/src/ofbx.h include src/usdFbx.cc include src/usdFbx.hh -#recursive-include src/external/pybind11 * +recursive-include src/external/pybind11 * diff --git a/README.md b/README.md index 2b6dbc29..096c8b44 100644 --- a/README.md +++ b/README.md @@ -466,8 +466,7 @@ You can build pure Windows build of TinyUSDZ on Linux CI machine. ## License -TinyUSDZ is licensed under MIT license and Apache 2.0 license. -(Doing relicensing from MIT to Apache 2.0. Will be fully relicensed to Apache 2.0 at some point) +TinyUSDZ is licensed under Apache 2.0 license. ### Third party licenses diff --git a/pyproject.toml b/pyproject.toml index eafb499d..d7ab7a5f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,4 +13,9 @@ line-length = 140 [project] name = "tinyusdz" version = "0.8.0rc5" -readme = {file = "README.md", content-type: "text/markdown"} +description = "Python binding of TinyUSDZ" +license = "Apache-2.0" +authors = ["Syoyo Fujita ", + "Light Transport Entertainment, Inc. " + ] +readme = {file = "README.md", content-type = "text/markdown"} diff --git a/setup.py b/setup.py index 337c6bf3..32e3bc39 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='tinyusdz', version='0.8.0rc5', author='Light Transport Entertainment Inc.', - author_email='syoyo@lighttransport.com, lighttransport.eth@mail3.me', + author_email='syoyo@lighttransport.com', # `python/tinyusdz` as root for `tinyusdz` module packages=['tinyusdz'], package_dir={'': 'python'}, @@ -19,5 +19,5 @@ setup( '-DTINYUSDZ_WITH_TOOL_USDC_PARSER=Off'], long_description=open("./python/README.md", 'r').read(), long_description_content_type='text/markdown', - license='MIT', + license_files=('LICENSE'), ) diff --git a/src/composition.cc b/src/composition.cc index 76a3a2a4..17b8183d 100644 --- a/src/composition.cc +++ b/src/composition.cc @@ -202,12 +202,19 @@ bool LoadAsset(AssetResolutionResolver &resolver, fmt::format("Failed to resolve asset path `{}`", asset_path)); } else { PUSH_WARN(fmt::format("Asset not found: `{}`", asset_path)); +#if 0 // for debugging. print cwd. #if defined(__linux__) - char pathname[512]; - memset(pathname, 0, 512); - getcwd(pathname, 512); + char pathname[4096]; + memset(pathname, 0, 4096); + char *pathname_p = getcwd(pathname, 4096); - PUSH_WARN(fmt::format(" cwd = {}", std::string(pathname))); + if (pathname_p == nullptr) { + PUSH_ERROR_AND_RETURN( + "Getting current working directory failed."); + } + + PUSH_WARN(fmt::format(" cwd = {}", std::string(pathname_p))); +#endif #endif PUSH_WARN( fmt::format(" current working path: `{}`", current_working_path));