| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Instead of trying to checkout non-existent branches and getting confusing fatal
error prints, check if the branch exists first.
Ref D12560
|
|
Issue revealed by rB546314fc9669 change, also error itself exited before
that commit.
Now we do accept git command to fail when trying to checkout the
specified branch from sub-modules, and only actually error in case the
fall-back branch (aka master) cannot be properly checked out.
Thanks fot Ray molenkamp (@LazyDodo) for report and initial patch
(D12560).
|
|
|
|
rB546314fc9669 broke `svn_libraries_base_url` utils API compatibility
for no good reasons, making new `branch` argument explicitely optional.
Reported on chat by Michael Kowalski (@makowalski), thanks!
|
|
Needed for studio sprite-fright frozen branch.
Also do not overwrite branch for git sub-modules when it is defined, and
fallback to `master` branch in case specified branch is not found in a
specific sub-repository.
|
|
|
|
|
|
Add a `source_archive_complete` target for `make` that creates a source
archive including the source packages of Blender's dependencies.
This expands `make_source_archive.py` to include files from
`${BUILD_DIR}/source_archive/packages/` as well.
Reviewed By: dfelinto
Maniphest Tasks: T86124
Differential Revision: https://developer.blender.org/D10727
|
|
- Add notes on portability.
- Use encoding argument for all file IO.
- Use integer math to calculate major/minor version, while float
division should be fine prefer matching Blender.
|
|
This is a Python version of the existing `make_source_archive.sh`
script. IMO it's easier to read, and it'll also be easier to extend with
the necessary functionality for D10598.
The number of lines of code is larger than `make_source_archive.sh`, but
it has considerably less invocations of `awk` ;-) And also the filtering
is integrated, instead of forking out to Python to prevent certain files
to be included in the tarball.
Reviewed By: dfelinto, campbellbarton
Differential Revision: https://developer.blender.org/D10629
|
|
Standard wiki build instructions for building Blender on macOS can now be used
on Macs with ARM processors.
This contains all libraries except for Embree and OpenImageDenoise, so Cycles
performance does not yet have full performance and features in this build. An
x86-64 build is likely to still render faster than arm64 until Embree is added.
Uses the new lib/darwin_arm64 folder. For simplicity and to keep download size
under control, both for end users and builders, we are not planning to ship
universal binaries. So this is a separate folder from lib/darwin.
Ref T78710
Differential Revision: https://developer.blender.org/D10276
|
|
|
|
|
|
|
|
Previously it only picked the appropriate version with the
blender-vX.XX-release branches.
|
|
The file subversion is no longer used in the Python API or user interface,
and is now internal to Blender.
User interface, Python API and file I/O metadata now use more consistent
formatting for version numbers. Official releases use "2.83.0", "2.83.1",
and releases under development use "2.90.0 Alpha", "2.90.0 Beta".
Some Python add-ons may need to lower the Blender version in bl_info to
(2, 83, 0) or (2, 90, 0) if they used a subversion number higher than 0.
https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Python_API#Compatibility
This change is in preparation of LTS releases, and also brings us more
in line with semantic versioning.
Fixes T76058.
Differential Revision: https://developer.blender.org/D7748
|
|
|
|
Makes it so compilation doesn't fail when the SVN updating
stumbles upon checkout which doesn't have correspondence in
a tag, but which isn't so risky as previous change.
|
|
This reverts commit 8e9e58895b32afc38f856053335c9b27324c6f9e.
The change broke behavior when typing `make update` from the root of
the sources: tests folder wouldn't be updated anymore.
Getting quite close to release now, so will revert to a safer change.
|
|
|
|
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
|
|
|
|
Thanks to @JRottm for pointing out this issue.
|
|
Also rename "make tgz" to "make source_archive" as it wasn't clear
this only archived the source, not binaries.
D6153 by @JRottm with minor edits
|
|
|
|
|
|
|
|
The submodules don't have remote branches configured, skip that test since
we assume pulling from the "origin" remote anyway.
|
|
Checking out release branches in submodules, and printing some more
informative messages when that fails.
|
|
|
|
Just skip convenience test that checks if a rebase/merge is in progress.
|
|
And fall back to python3 from our libraries for other commands, once checked
out with make update.
|
|
|
|
Differential Revision: https://developer.blender.org/D5715
|
|
|
|
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.
|
|
These will not stop the build on failure yet, first step is to get them passing
more reliably.
|
|
|
|
Specifically on Linux, when not having a tests checkout.
|
|
Needed for buildbot, but interactively solving svn conflicts in the middle
of manual make update is also not ideal.
|
|
|
|
|
|
|
|
|
|
Differential Revision: https://developer.blender.org/D5545
|
|
Already used by install_deps.sh
|
|
Differential Revision: https://developer.blender.org/D3700
|
|
|
|
Was broken since splitting BKE_blender_version from BKE_blender.
|
