Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-12Merge branch 'blender-v2.81-release'Sergey Sharybin
2019-11-12Fix issues with make_update.py when run from release branchSergey Sharybin
The issue was rooting to the fact that the script was iterating into every directory inside of blender.git/../lib/ and attempted to switch them to the desired path. This doesn't work in an environment where both master and release branch are built (or any environment where non-needed SVN directories are not automatically removed). This change makes it so script explicitly generates a list of directories which are required for the build. For example, the script now stores an exact folder with ABI such as win64_vc14. Only those explicitly listed directories will be updated. This allows to: - Solve compilation failure of 2.81 branch after checkout for win64_vc15 libraries has been created. - Fail compilation if actually expected tag is missing (for example, when trying to build release branch prior to libraries tag). Now, there was a confusing logic about possible .svn folder in lib_dirpath (effectively, blender.git/../lib/.svn) which is not something what is supposed to happen with the setup of buildbot we are using for quite some time now. This logic has been removed now. This change includes old-style string format(), mainly because it is not know that the buidlbot scripts are run using python3 on CentOS builder. Differential Revision: https://developer.blender.org/D6230
2019-11-09make_update.py: update windows library folderRay Molenkamp
2019-10-11Build: also use release branch for source/tools moduleBrecht Van Lommel
2019-10-11Fix issue in "make update" checking out submodule branch on buildbotBrecht Van Lommel
2019-10-11Fix "make update" not using the right branch for source/toolsBrecht Van Lommel
2019-10-09Fix "make update" not working on buildbot after recent changesBrecht Van Lommel
The submodules don't have remote branches configured, skip that test since we assume pulling from the "origin" remote anyway.
2019-10-09Build: prepare "make update" to work for new release cycle branchingBrecht Van Lommel
Checking out release branches in submodules, and printing some more informative messages when that fails.
2019-10-09Buildbot: Checkout precomiled CentOS librariesSergey Sharybin
2019-10-08Fix "make update" error with old git versions, for the buildbotBrecht Van Lommel
Just skip convenience test that checks if a rebase/merge is in progress.
2019-09-30macOS: don't require python3 to be installed to run "make update"Brecht Van Lommel
And fall back to python3 from our libraries for other commands, once checked out with make update.
2019-09-08Build: skip Blender repository pull in "make update" when not possibleBrecht Van Lommel
This prints a more informative message, and is convenient when working with local changes or in a branch where you only need to update submodules or tests.
2019-09-05Buildbot: enable tests to run againBrecht Van Lommel
These will not stop the build on failure yet, first step is to get them passing more reliably.
2019-09-03Fix buildbot unsuccessfully trying to update Blender repository for branchesBrecht Van Lommel
2019-08-31Build: don't require svn to be available for "make update" when not usedBrecht Van Lommel
Specifically on Linux, when not having a tests checkout.
2019-08-31Build: use non-interactive svn commands for "make update"Brecht Van Lommel
Needed for buildbot, but interactively solving svn conflicts in the middle of manual make update is also not ideal.
2019-08-30Tests: auto download test files when running "make test"Brecht Van Lommel
2019-08-30Tests: move "make test" on macOS and Linux to Python scriptBrecht Van Lommel
2019-08-30Build: integrate make_update.py into Windows make.batBrecht Van Lommel
2019-08-30Build: support updating for release branches in make_update.pyBrecht Van Lommel
2019-08-30Build: move "make update" on macOS and Linux to Python scriptBrecht Van Lommel
Differential Revision: https://developer.blender.org/D5545