Bringing dev_win_ip up to date with dev

.travis.yml

@@ -0,0 +1,158 @@
+#
+# 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.
+#
+
+# USD requires several dependencies that are available via
+# apt-get if using the trusty build environment.
+sudo: required
+dist: trusty
+
+language: cpp
+
+branches:
+  only:
+    - master
+    - 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-iostreams1.55.0 libboost-iostreams1.55-dev
+  - 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
+
+  ### double-conversion
+  ### USD docs currently claim we require 1.1.1, but apt-get gives us 2.0.1 on trusty.
+  ### Building 1.1.1 as a shared library is annoying, so we'll go with this for now.
+  - sudo apt-get install libdouble-conversion-dev
+
+  ### Intel TBB v4.3 update 1
+  - if [ ! -d "$HOME/tbb43_20141023oss/lib" ]; then
+      wget https://www.threadingbuildingblocks.org/sites/default/files/software_releases/linux/tbb43_20141023oss_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';
+    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
+  # XXX: To workaround issue #3, create a symlink at opensubdiv3/ pointing to opensubdiv/
+  - rm -f $HOME/osd/include/opensubdiv3 && ln -s $HOME/osd/include/opensubdiv $HOME/osd/include/opensubdiv3
+
+  ### 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 ..;
+      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';
+    fi
+
+  ######
+  ### DEPENDENCIES FOR USDIMAGING
+  #####
+
+  ### PySide 1.2.2
+  - sudo apt-get install python-pyside pyside-tools
+
+cache:
+  directories:
+    - $HOME/openexr
+    - $HOME/osd
+    - $HOME/oiio
+    - $HOME/ptex
+    - $HOME/tbb43_20141023oss
+
+script:
+  - mkdir build && cd build
+  - cmake -DTBB_ROOT_DIR=$HOME/tbb43_20141023oss -DOPENEXR_LOCATION=$HOME/openexr -DOIIO_LOCATION=$HOME/oiio -DOPENSUBDIV_ROOT_DIR=$HOME/osd -DPTEX_LOCATION=$HOME/ptex -DPXR_VALIDATE_GENERATED_CODE=OFF ..
+  - echo 'Building with -j4'
+  # XXX: Need to explicitly build cameraUtil before hd due to missing dependency declaration.
+  # This is fixed in commit 880b04.
+  - make -j4 cameraUtil
+  - make -j4
+  # Default install location is /usr/local; we need sudo access to write there.
+  - sudo make install

BUILDING.md

@@ -87,6 +87,23 @@ properly based on the install location of the build. However, if you plan to rel
 the build, you must inform the build by setting the cmake variable ```PXR_INSTALL_LOCATION``` to the intended final
 directory where these files will be located. This variable may be a ':'-delimited list of paths.
 
+##### Shared library prefix
+
+By default shared libraries will have the prefix 'lib'. This means, for a given
+component such as [usdGeom](pxr/usd/lib/usdGeom), the build will generate a corresponding 
+libusdGeom object (libusdGeom.so on Linux, libusdGeom.dll on Windows 
+and libusdGeom.dylib on Mac). You can change the prefix (or remove it) through 
+```PXR_LIB_PREFIX```. For example,
+
+```
+-DPXR_LIB_PREFIX=pxr
+```
+
+Will generate pxrusdGeom.so on Linux, pxrusdGeom.dll on Windows and 
+pxrusdGeom.dylib on Mac for the usdGeom component.
+
+> Note: This prefix does not apply to shared objects used for Python bindings.
+
 ## USD Developer Options
 
 ##### ASCII Parser Editing/Validation

CHANGELOG.md

@@ -0,0 +1,60 @@
+# Change Log
+
+## [0.7.1] - 2016-09-21
+
+### Added
+- UsdMaterial schema for shading, intended to replace UsdLook. Also added
+  support for this new schema to Hydra.
+- Initial version of UsdUI schema library, intended for encoding GUI 
+  information on USD prims.
+- Parallel teardown of some data members in UsdStage, speeding up overall
+  teardown by ~2x.
+- Support for packed vertex normals to Hydra, reducing GPU memory consumption
+  by 20-30% in some cases.
+- Ability to compare two composed stages to usddiff by specifying the
+  "--compose" or "-c" options.
+- Support for soft-selection for collapsed USD assemblies in Maya.
+- Support for exporting color sets and UV sets as indexed primvars from Maya.
+
+### Changed
+- Refactored Hydra libraries to move higher-level concepts out of the core
+  hd library and into hdx.
+- Removed use of opensubdiv3/ include path from imaging code in favor of
+  standard opensubdiv/ include.
+- Modified UsdStage to automatically load newly-discovered payloads if
+  their nearest ancestor's payload was also loaded. For example, consumers
+  will no longer have to explicitly call UsdStage::Load to ensure payloads
+  are loaded when switching variants on a prim, so long as their nearest
+  ancestor is also loaded.
+- Refactoring and other changes to help with Mac and Windows ports.
+- Updated doxygen and other documentation.
+
+### Fixed
+- Fixed issue that caused Alembic plugin (usdAbc) to be misconfigured at
+  build time, which required users to manually update its plugInfo.json
+  and set an environment variable at runtime to make it work. This plugin
+  is now installed to $PREFIX/plugin/usd/ and requires no additional
+  steps to use once it has been built.
+- Fixed issue with .usdc files that resulted in corrupted files on Windows.
+  The file structure was changed, so the .usdc version has been bumped
+  from 0.0.1 to 0.1.0. USD will continue to write 0.0.1 files by default,
+  but will begin writing 0.1.0 files in the near future.
+
+  Users may choose to write files with the new version immediately
+  by setting the environment variable `USD_WRITE_NEW_USDC_FILES_AS_VERSION`
+  to "0.1.0".
+
+  Note that 0.0.1 files are still readable using this release, 
+  except for those that have been generated on Windows using 0.7.0. 
+  Early testers on Windows will need to regenerate those files
+  with this release.
+- Fixed issue that caused usdGenSchema to generate files that could
+  not be compiled.
+- Added a workaround for TBB-related issue in Maya that caused hangs when 
+  using the USD Maya plugin. This can be enabled at build time by 
+  specifying the `PXR_MAYA_TBB_BUG_WORKAROUND` option to CMake.
+- Various other bug fixes and performance improvements.
+
+## [0.7.0] - 2016-08-01
+
+Initial release

CMakeLists.txt

@@ -1,5 +1,10 @@
 project(usd)
-cmake_minimum_required(VERSION 2.8.8)
+
+if (WIN32)
+    cmake_minimum_required(VERSION 3.1.1)
+else()
+    cmake_minimum_required(VERSION 2.8.8)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/defaults
                       ${CMAKE_SOURCE_DIR}/cmake/modules

ISSUE_TEMPLATE.md

@@ -1,8 +1,10 @@
-### System Information (OS, Hardware, etc.)
+### Description of Issue
+
+### Steps to Reproduce
+1. 
+
+### System Information (OS, Hardware)
 
 ### Package Versions
 
 ### Build Flags
-
-### Steps to Reproduce
-1. 

README.md

@@ -9,14 +9,21 @@ interchange between graphics applications.
 
 For more details, please visit the web site [here](http://openusd.org).
 
+Build Status
+------------
+
+|       | master | dev |
+| ----- | ------ | --- |
+| Linux | [![Build Status](https://travis-ci.org/PixarAnimationStudios/USD.svg?branch=master)](https://travis-ci.org/PixarAnimationStudios/USD) | [![Build Status](https://travis-ci.org/PixarAnimationStudios/USD.svg?branch=dev)](https://travis-ci.org/PixarAnimationStudios/USD) |
+| Windows | N/A | [![Build status](https://ci.appveyor.com/api/projects/status/knuwy0hfhewn1o34/branch/dev_win_ip_g?svg=true)](https://ci.appveyor.com/project/c64kernal/usd/branch/dev_win_ip_g) |
+
 Additional Documentation
 ------------------------
 
 * [User Documentation and Tutorials](http://openusd.org/docs/index.html)
 * [API Documentation](http://openusd.org/docs/api/index.html)
 * [Advanced Build Configuration](BUILDING.md)
 
-
 Getting Help
 ------------
 
@@ -44,18 +51,18 @@ Dependencies
 | ---- | --------- |
 | C++ compiler                                                      | GCC 4.8, Clang 3.5, MSVC 14.0(VS 2015) |
 | C compiler                                                        | GCC 4.8, Clang 3.5, MSVC 14.0(VS 2015) |
-| [CMake](https://cmake.org/documentation/)                         | 2.8.8              |
+| [CMake](https://cmake.org/documentation/)                         | 2.8.8 (Linux/OS X), 3.1.1 (Windows)    |
 | [Python](https://python.org)                                      | 2.7.5              |
-| [Boost](https://boost.org)                                        | 1.55               |
-| [OpenEXR](https://openexr.org)                                    | 2.2.0              |
+| [Boost](https://boost.org)                                        | 1.55 (Linux), 1.61.0 (OS X/Windows)    |
+| [OpenEXR](http://www.openexr.com)                                 | 2.2.0              |
 | [DoubleConversion](https://github.com/google/double-conversion)   | 1.1.1              |
 | [Intel TBB](https://www.threadingbuildingblocks.org/)             | 4.3.1              |
 | [OpenSubdiv](https://github.com/PixarAnimationStudios/OpenSubdiv) | 3.0.5              |
 | [GLEW](http://glew.sourceforge.net/)                              | 1.10.0             |
 | [OpenImageIO](https://sites.google.com/site/openimageio/home)     | 1.5.11             |
 | [Ptex](http://ptex.us/)                                           | 2.0.30             |
-| [Qt](http://doc.qt.io/qt-4.8)                                     | 4.8.0              |
 | [Pyside](http://wiki.qt.io/PySide)                                | 1.2.2              |
+| [PyOpenGL](https://pypi.python.org/pypi/PyOpenGL/3.1.0)           | 3.1.0              |
 
 
 Getting and Building the Code
@@ -86,7 +93,6 @@ cmake                                       \
 -DPTEX_INCLUDE_DIR=/path/to/ptex            \
 -DOIIO_BASE_DIR=/path/to/openimageio        \
 -DBOOST_ROOT=/path/to/boost                 \
--DQT_QMAKE_EXECUTABLE=/path/to/qmake        \
 ..
 
 make -j <NUM_CORES> install
@@ -95,7 +101,7 @@ make -j <NUM_CORES> install
 #### On OS X (experimental)
 
 The following will generate an Xcode project that can be used to build USD.
-See notes in the [Supported Platforms](#Supported-Platforms) section
+See notes in the [Supported Platforms](#supported-platforms) section
 for more information.
 
 ```bash
@@ -107,7 +113,6 @@ cmake                                       \
 -DPTEX_INCLUDE_DIR=/path/to/ptex            \
 -DOIIO_BASE_DIR=/path/to/openimageio        \
 -DBOOST_ROOT=/path/to/boost/include         \
--DQT_QMAKE_EXECUTABLE=/path/to/qmake        \
 ..
 
 make -j <NUM_CORES> install
@@ -117,7 +122,7 @@ make -j <NUM_CORES> install
 
 The following will generate a Visual Studio 2015 (the minimum required version)
 sln file which can be used to build USD. See notes in the 
-[Supported Platforms](#Supported-Platforms) section for more information.
+[Supported Platforms](#supported-platforms) section for more information.
 
 ```powershell
 C:\Program Files\CMake\bin\cmake.exe             ^
@@ -128,7 +133,6 @@ C:\Program Files\CMake\bin\cmake.exe             ^
     -DPTEX_INCLUDE_DIR=C:\path\to\ptex           ^ 
     -DOIIO_BASE_DIR=C:\path\to\openimageio       ^ 
     -DBOOST_ROOT=C:\path\to\boost                ^ 
-    -DQT_QMAKE_EXECUTABLE=C:\path\to\qmak        ^
     --build .. --config Release --target install
 
 ```  
@@ -149,9 +153,12 @@ Launch usdview with a sample asset.
 
 ```bash
 $ export PYTHONPATH=$PYTHONPATH:USD_INSTALL_ROOT/lib/python
-$ usdview extras/usd/tutorials/convertingLayerFormats/sphere.usda
+$ usdview extras/usd/tutorials/convertingLayerFormats/Sphere.usda
 ```
 
+> Note: Replace ```USD_INSTALL_ROOT``` with the location set in your build,
+> usually via ```CMAKE_INSTALL_PREFIX```.
+
 Contributing
 ------------