Merge release v19.03

Author: pixar-oss

.appveyor.yml

@@ -0,0 +1,65 @@
+#
+# Copyright 2016 Pixar
+#
+# Licensed under the Apache License, Version 2.0 (the "Apache License")
+# with the following modification; you may not use this file except in
+# compliance with the Apache License and the following modification to it:
+# Section 6. Trademarks. is deleted and replaced with:
+#
+# 6. Trademarks. This License does not grant permission to use the trade
+#    names, trademarks, service marks, or product names of the Licensor
+#    and its affiliates, except as required to comply with Section 4(c) of
+#    the License and to reproduce the content of the NOTICE file.
+#
+# You may obtain a copy of the Apache License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the Apache License with the above modification is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the Apache License for the specific
+# language governing permissions and limitations under the Apache License.
+#
+image: Visual Studio 2017
+
+clone_folder: c:\projects\USD
+
+branches:
+    only:
+        - dev
+        - master
+
+platform:
+    - x64
+
+install:
+    - ps: $env:USD_YY_VERSION = (Get-Content .\cmake\defaults\Version.cmake | Where-Object {$_ -match 'PXR_MINOR_VERSION'}).Split("( )")[2].Trim('"').PadLeft(2, "0")
+    - ps: $env:USD_MM_VERSION = (Get-Content .\cmake\defaults\Version.cmake | Where-Object {$_ -match 'PXR_PATCH_VERSION'}).Split("( )")[2].Trim('"').PadLeft(2, "0")
+    - ps: Update-AppveyorBuild -Version "$env:USD_YY_VERSION.$env:USD_MM_VERSION-$env:APPVEYOR_REPO_BRANCH-build$env:APPVEYOR_BUILD_NUMBER"
+
+cache:
+    - C:\USDgen\build\boost -> build_scripts/build_usd.py
+    - C:\USDgen\build\IlmBase -> build_scripts/build_usd.py
+    - C:\USDgen\build\OpenEXR -> build_scripts/build_usd.py
+    - C:\USDgen\build\OpenSubdiv-3_1_1 -> build_scripts/build_usd.py
+    - C:\USDgen\build\zlib-1.2.11 -> build_scripts/build_usd.py
+    - C:\USDgen\src -> build_scripts/build_usd.py
+
+init:
+    - set PATH=c:/Python27-x64;c:/Python27-x64/Scripts;%PATH%
+    - C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Community\VC\Auxiliary\Build\vcvarsall.bat amd64
+
+
+before_build:
+    - python -m pip install --upgrade pip
+    - pip install pyside
+    - pip install PyOpenGL
+    - 
+
+build_script:
+
+    - cd c:\projects\USD
+    - python build_scripts/build_usd.py -vvv --build C:/USDgen/build --src C:/USDgen/src c:/USDinst
+    - cd c:\USDgen\build
+    - dir

.travis.yml

@@ -27,6 +27,25 @@
 sudo: required
 dist: trusty
 
+os:
+    - linux
+    - osx
+
+osx_image: xcode10.1
+
+compiler:
+    - gcc
+    - clang
+
+matrix:
+
+    # On Linux build with gcc and on OSX build with clang
+    exclude:
+        - os: osx
+          compiler: gcc
+        - os: linux
+          compiler: clang
+
 language: cpp
 
 branches:
@@ -35,116 +54,26 @@ branches:
     - dev
 
 before_install:
-  - sudo apt-get -qq update
-
-install:
-  ######
-  ### DEPENDENCIES FOR USD CORE
-  #####
-
-  ### boost v1.55
-  ### We install only the packages we need for faster turnaround
-  - sudo apt-get install libboost-python1.55.0 libboost-python1.55-dev
-  - sudo apt-get install libboost-regex1.55.0 libboost-regex1.55-dev
-  - sudo apt-get install libboost-system1.55.0 libboost-system1.55-dev
-  - sudo apt-get install libboost-program-options1.55.0 libboost-program-options1.55-dev
-
-  ### Intel TBB v4.4 update 6
-  - if [ ! -d "$HOME/tbb44_20160803oss/lib" ]; then
-      wget https://github.com/01org/tbb/releases/download/4.4.6/tbb44_20160803oss_lin.tgz -O /tmp/tbb.tgz;
-      tar -xvzf /tmp/tbb.tgz -C $HOME;
-    else
-      echo 'Using cached TBB';
-    fi
-
-  ### ilmbase and OpenEXR 2.2.0
-  - if [ ! -d "$HOME/openexr/lib" ]; then
-      wget http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.0.tar.gz -O /tmp/ilmbase.tgz;
-      tar -xvzf /tmp/ilmbase.tgz -C $HOME;
-      pushd $HOME/ilmbase-2.2.0;
-      ./configure --prefix=$HOME/openexr;
-      make && make install;
-      popd;
-      wget http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz -O /tmp/openexr.tgz;
-      tar -xvzf /tmp/openexr.tgz -C $HOME;
-      pushd $HOME/openexr-2.2.0;
-      ./configure --prefix=$HOME/openexr --with-pkg-config=no LDFLAGS="-Wl,-rpath -Wl,$HOME/openexr/lib";
-      make && make install;
-      popd;
-    else
-      echo 'Using cached OpenEXR';
+  - if [ $TRAVIS_OS_NAME == linux ] ; then
+        sudo apt-get -qq update ;
     fi
 
-  ######
-  ### DEPENDENCIES FOR IMAGING
-  #####
-
-  ### GLEW 1.10.0
-  - sudo apt-get install libglew-dev
-
-  ### OpenSubdiv 3.0.5
-  - sudo apt-get install libxrandr-dev libxcursor-dev libxinerama-dev libglfw-dev
-  - if [ ! -d "$HOME/osd/lib" ]; then
-      wget https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_0_5.tar.gz -O /tmp/osd.tgz;
-      tar -xvzf /tmp/osd.tgz -C $HOME;
-      pushd $HOME/OpenSubdiv-3_0_5;
-      mkdir build && cd build;
-      cmake -DCMAKE_INSTALL_PREFIX=$HOME/osd -DNO_EXAMPLES=1 -DNO_TUTORIALS=1 -DNO_REGRESSION=1 -D NO_MAYA=1 -D NO_PTEX=1 -D NO_DOC=1 -D NO_OMP=1 -D NO_TBB=1 -D NO_CUDA=1 -D NO_OPENCL=1 -D NO_CLEW=1 ..;
-      make && make install;
-      popd;
-    else
-      echo 'Using cached OpenSubdiv';
-    fi
-
-  ### OpenImageIO 1.5.11
-  - sudo apt-get install libboost-filesystem1.55.0 libboost-filesystem1.55-dev
-  - sudo apt-get install libboost-thread1.55.0 libboost-thread1.55-dev
-  - if [ ! -d "$HOME/oiio/lib" ]; then
-      wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.11.tar.gz -O /tmp/oiio.tgz;
-      tar -xvzf /tmp/oiio.tgz -C $HOME;
-      pushd $HOME/oiio-Release-1.5.11;
-      mkdir build && cd build;
-      cmake -DCMAKE_INSTALL_PREFIX=$HOME/oiio -DILMBASE_HOME=$HOME/openexr -DOPENEXR_HOME=$HOME/openexr -DUSE_PYTHON=OFF -DOIIO_BUILD_TOOLS=OFF -DOIIO_BUILD_TESTS=OFF ..;
-      make && make install;
-      popd;
-    else
-      echo 'Using cached OpenImageIO';
-    fi
-
-  ### Ptex 2.0.30
-  - if [ ! -d "$HOME/ptex/lib" ]; then
-      wget https://github.com/wdas/ptex/archive/v2.0.30.tar.gz -O /tmp/ptex.tgz;
-      tar -xvzf /tmp/ptex.tgz -C $HOME;
-      pushd $HOME/ptex-2.0.30/src;
-      make;
-      mv $HOME/ptex-2.0.30/install/* $HOME/ptex;
-      popd;
-    else
-      echo 'Using cached Ptex';
+install:
+  - if [ $TRAVIS_OS_NAME == linux ] ; then
+        sudo apt-get install libglew-dev libxrandr-dev libxcursor-dev libxinerama-dev libxi-dev;
+        sudo apt-get install python-pyside pyside-tools ;
+        sudo pip install PyOpenGL ;
+    elif [ $TRAVIS_OS_NAME == osx ] ; then
+        sudo pip install pyside2 ;
+        sudo pip install PyOpenGL ;
     fi
 
-  ######
-  ### DEPENDENCIES FOR USDVIEW
-  #####
-
-  ### PySide 1.2.2
-  - sudo apt-get install python-pyside pyside-tools
-
-  ### PyOpenGL 3.1.0
-  - sudo pip install PyOpenGL
-
 cache:
-  directories:
-    - $HOME/openexr
-    - $HOME/osd
-    - $HOME/oiio
-    - $HOME/ptex
-    - $HOME/tbb43_20141023oss
+    directories:
+        - $HOME/USDgen/src
+
 
 script:
-  - mkdir build && cd build
-  - cmake -DTBB_ROOT_DIR=$HOME/tbb44_20160803oss -DOPENEXR_LOCATION=$HOME/openexr -DOIIO_LOCATION=$HOME/oiio -DOPENSUBDIV_ROOT_DIR=$HOME/osd -DPTEX_LOCATION=$HOME/ptex -DPXR_VALIDATE_GENERATED_CODE=OFF -DPXR_BUILD_TESTS=ON ..
-  - echo 'Building with -j4'
-  - make -j4
-  # Default install location is /usr/local; we need sudo access to write there.
-  - sudo make install
+  - mkdir -p $HOME/USDinst
+  - mkdir -p $HOME/USDgen
+  - travis_wait 90 python build_scripts/build_usd.py -v --build $HOME/USDgen/build --src $HOME/USDgen/src $HOME/USDinst

BUILDING.md

@@ -44,7 +44,7 @@ cmake                                       \
 cmake --build . --target install -- -j <NUM_CORES>
 ```
 
-#### On OS X
+#### On macOS
 
 The following will generate an Xcode project that can be used to build USD.
 
@@ -165,6 +165,12 @@ jpg, png, tga, and hdr. With OpenImageIO enabled, support extends to exr, tif,
 zfile, and tx file formats, which allows for the use of more advanced features
 like subimages and mipmaps.
 
+##### OpenColorIO 
+
+This plugin can optionally be enabled by specifying the cmake flag
+```PXR_BUILD_OPENCOLORIO_PLUGIN=TRUE```. When enabled, OpenColorIO provides 
+color management for Hydra viewports. 
+
 ##### Embree Rendering
 
 This component contains an example rendering backend for Hydra and usdview, based on the
@@ -309,7 +315,7 @@ flags:
 | ------------------------------ |-----------------------------------------| ------- |
 | PXR_SET_EXTERNAL_NAMESPACE     | The outer namespace identifier          | ```pxr```     |
 | PXR_SET_INTERNAL_NAMESPACE     | The internal namespace identifier       | ```pxrInternal_v_x_y``` (for version x.y.z) |
-| PXR_ENABLE_NAMESPACES          | Enable namespaces                       | ```OFF```    |
+| PXR_ENABLE_NAMESPACES          | Enable namespaces                       | ```ON```    |
 
 When enabled, there are a set of macros provided in a generated header,
 pxr/pxr.h, which facilitates using namespaces: