Skip to content

Commit

Permalink
Merge pull request PixarAnimationStudios#185 from autodesk-forks/adsk…
Browse files Browse the repository at this point in the history 
…/feature/pipeline_adsk

Support build from PR and Ptex
  • Loading branch information
@zhangha182
zhangha182 authored and GitHub Enterprise committed Dec 9, 2022
2 parents 5a08b86 + 0cae99f commit c7fe333
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 13 deletions.
21 changes: 11 additions & 10 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ finally {
// Helper Functions

def checkoutGit() {
String branch = scm.branches[0].toString()
withGit {
COMMONSHELL.shell """
git clone -b ${branch} --recurse-submodules https://git.autodesk.com/autodesk-forks/usd .
git lfs pull
"""
}
checkout([$class: 'GitSCM',
branches: scm.branches,
doGenerateSubmoduleConfigurations: false,
extensions: [[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],[$class: 'GitLFSPull']],
submoduleCfg: [],
userRemoteConfigs: scm.userRemoteConfigs
])
}

def getBuildInfo(os, platform, config) {
Expand Down Expand Up @@ -336,15 +336,15 @@ def windowsBuild(buildInfo) {
call ${buildInfo.Python} -m pip install --upgrade pip
call ${buildInfo.Python} -m pip install PySide2
call ${buildInfo.Python} -m pip install PyOpenGL
call ${buildInfo.Python} build_scripts/build_usd.py --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_USE_PYTHON_3=ON" -v
call ${buildInfo.Python} build_scripts/build_usd.py --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --ptex --openvdb --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_USE_PYTHON_3=ON" -v
"""
}

def macBuild(buildInfo) {
sh """
${buildInfo.Python} -m pip install pyside2 ;
${buildInfo.Python} -m pip install PyOpenGL ;
${buildInfo.Python} build_scripts/build_usd.py --generator Xcode --toolset "buildsystem=1" --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_USE_PYTHON_3=ON" -v
${buildInfo.Python} build_scripts/build_usd.py --generator Xcode --toolset "buildsystem=1" --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --ptex --openvdb --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_USE_PYTHON_3=ON" -v
"""
}

Expand All @@ -359,7 +359,7 @@ def linuxBuild(buildInfo) {
${buildInfo.Python} -m pip install --upgrade pip
${buildInfo.Python} -m pip install PySide2 ;
${buildInfo.Python} -m pip install PyOpenGL ;
${buildInfo.Python} build_scripts/build_usd.py --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_USE_PYTHON_3=ON" -v
${buildInfo.Python} build_scripts/build_usd.py --build ${buildInfo.USDgen_build} --src ${buildInfo.USDgen_src} ${buildInfo.USDinst} --materialx --ptex --openvdb --tests --build-variant ${buildInfo.BuildVariant} --build-args USD,"-DPXR_USE_PYTHON_3=ON" -v
"""
}

Expand All @@ -381,6 +381,7 @@ def testStage(buildInfo, runTest) {
}
catch (err) {
echo "*** TEST FAILURE on ${buildInfo.Platform}.\nInternal error message: ${err.message} ***"
isLastTestsFailed(buildInfo)
postStatus('FAILURE', "${buildInfo.Platform}_unittest")
throw err
}
Expand Down
7 changes: 5 additions & 2 deletions adsk-build-scripts/deploy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,11 @@ def read_package_configs(source_dir, package):
# Read version definition file
definition_file = os.path.join(source_dir, '**', packageData['versioning']['definition_file'])
definition_file = glob.glob(definition_file, recursive=True)[0]
with open(definition_file) as f:
definition_content = f.read()
try:
with open(definition_file) as f:
definition_content = f.read()
except:
definition_content = ''

# Read versioning macros used in rc file
for macroDef in packageData['versioning']['macro_in_rc_file']:
Expand Down
65 changes: 64 additions & 1 deletion adsk-build-scripts/packageConfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,48 @@
"files_to_exclude" : ""
}
},
{
"name" : "blosc",
"rc" : {
"CompanyName" : "Autodesk Inc.\\0",
"FileDescription" : "Blosc Dynamic Link Library\\0",
"LegalCopyright" : "Copyright (C) 2009-2018 Francesc Alted <francesc@blosc.org>. Copyright (C) 2019-present Blosc Development team <blosc@blosc.org>.\\0",
"ProductName" : "Blosc\\0"
},
"versioning" : {
"definition_file" : "blosc.h",
"macro_in_def_file" : "",
"macro_in_rc_file" : [
["BLOSC_VERSION_MAJOR", {"map_to_def":"equal"}],
["BLOSC_VERSION_MINOR", {"map_to_def":"equal"}],
["BLOSC_VERSION_RELEASE", {"map_to_def":"equal"}],
["BLOSC_VERSION_BUILD", "0"]
],
"files_to_include" : "bin/blosc*.dll",
"files_to_exclude" : ""
}
},
{
"name" : "openvdb",
"rc" : {
"CompanyName" : "Autodesk Inc.\\0",
"FileDescription" : "OpenVDB Dynamic Link Library\\0",
"LegalCopyright" : "(c) Autodesk, Inc. 2022. All rights reserved.\\0",
"ProductName" : "OpenVDB\\0"
},
"versioning" : {
"definition_file" : "openvdb/version.h",
"macro_in_def_file" : "",
"macro_in_rc_file" : [
["OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER", {"map_to_def":"equal"}],
["OPENVDB_LIBRARY_MINOR_VERSION_NUMBER", {"map_to_def":"equal"}],
["OPENVDB_LIBRARY_PATCH_VERSION_NUMBER", {"map_to_def":"equal"}],
["OPENVDB_LIBRARY_BUILD", "0"]
],
"files_to_include" : "bin/openvdb*.dll",
"files_to_exclude" : ""
}
},
{
"name" : "openimageio",
"rc" : {
Expand All @@ -147,6 +189,27 @@
"files_to_exclude" : ""
}
},
{
"name" : "ptex",
"rc" : {
"CompanyName" : "Autodesk Inc.\\0",
"FileDescription" : "Ptex Dynamic Link Library\\0",
"LegalCopyright" : "Copyright 2014 Disney Enterprises, Inc. All rights reserved.\\0",
"ProductName" : "Ptex\\0"
},
"versioning" : {
"definition_file" : "",
"macro_in_def_file" : "",
"macro_in_rc_file" : [
["PTEX_VERSION_MAJOR", "2"],
["PTEX_VERSION_MINOR", "1"],
["PTEX_VERSION_PATCH", "33"],
["PTEX_VERSION_BUILD", "0"]
],
"files_to_include" : "lib/Ptex*.dll",
"files_to_exclude" : ""
}
},
{
"name" : "usd",
"rc" : {
Expand All @@ -165,7 +228,7 @@
["PXR_BUILD_VERSION", "0"]
],
"files_to_include" : "lib/*.dll,plugin/usd/*.dll,tests/lib/*.dll",
"files_to_exclude" : "lib/boost*.dll"
"files_to_exclude" : "lib/boost*.dll,lib/Ptex*.dll"
},
"signing" : {
"folders_to_include" : "bin,lib,plugin,share,tests",
Expand Down

0 comments on commit c7fe333

Please sign in to comment.