Blender Git Loki

Git Commits -> Revision 8e9e588

Revision 8e9e588 by Sergey Sharybin (master)
November 12, 2019, 13:01 (GMT)
Fix issues with make_update.py when run from release branch

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

Commit Details:

Full Hash: 8e9e58895b32afc38f856053335c9b27324c6f9e
Parent Commit: 65bc504
Lines Changed: +12, -10

Tehnyt: Miika HämäläinenViimeksi p?ivitetty: 07.11.2014 14:18 MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021