Hey,
I am using this program to build Blender automatically
@echo off
set branch=%1
set base_path=%2
if [%1] == [] set branch=master
set branches_path=./branches/
set path_end=_branch/
set full_path=%branches_path%%branch%%path_end%
cd /d %base_path%
echo CHECKOUT
call git checkout %branch%
echo UPDATE
call ./make.bat update
echo BUILD
call ./make.bat release builddir %full_path%
echo DONE
Where “branch” is the name of the branch to build and “base_path” is the path to my blender folder.
It seemed to work for a while but now when I switch the branch to another one, it does not seem to build it properly, I always have the same Blender it seems.
For example if I try to build master, the date in the “about blender” is still 2021-06-29, and I don’t have access to any of features after this date.
Do you have any idea ? Is there an issue with the way I start the build ?
Thanks !
I’d look at the output of your git checkout and make update commands perhaps something (like unstaged changes) are preventing it from doing it’s job.
Well actually I have a difference when I do it manually, which give me that :
>>> git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
PS
>>> ./make.bat update
No explicit msvc version requested, autodetecting version.
**********************************************************************
** Visual Studio 2019 Developer Command Prompt v16.8.4
** Copyright (c) 2020 Microsoft Corporation
**********************************************************************
[vcvarsall.bat] Environment initialized for: 'x64'
Compiler Detection successful, detected VS2019
Updating Precompiled Libraries and Tests
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive cleanup F:/prog/blender_git/blender\..\lib\win64_vc15
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive switch https://svn.blender.org/svnroot/bf-blender/trunk/lib/win64_vc15 F:/prog/blender_git/blender\..\lib\win64_vc15
At revision 62649.
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive update F:/prog/blender_git/blender\..\lib\win64_vc15
Updating 'F:\prog\blender_git\lib\win64_vc15':
At revision 62649.
Updating Blender Git Repository
C:\Program Files\Git\cmd\git.exe pull --rebase
remote: Enumerating objects: 385, done.
remote: Counting objects: 100% (292/292), done.
remote: Compressing objects: 100% (37/37), done.
Receiving objects: delta 132), reused 106 (delta 102), pack-reused 0 49% (69/139)
Receiving objects: 100% (139/139), 21.21 KiB | 868.00 KiB/s, done.
Resolving deltas: 100% (132/132), completed with 123 local objects.
From git://git.blender.org/blender
08241b313c6..de70bcbb368 master -> origin/master
+ 64dadc542f4...a5ab9062cbf fixed_width_integers -> origin/fixed_width_integers (forced update)
Updating 08241b313c6..de70bcbb368
Fast-forward
release/scripts/startup/nodeitems_builtins.py | 1 +
source/blender/blenkernel/BKE_node.h | 1 +
source/blender/blenkernel/intern/node.cc | 1 +
source/blender/makesdna/DNA_node_types.h | 8 ++
source/blender/makesrna/RNA_enum_types.h | 1 +
source/blender/makesrna/intern/rna_nodetree.c | 37 +++++++++
source/blender/nodes/CMakeLists.txt | 1 +
source/blender/nodes/NOD_function.h | 1 +
source/blender/nodes/NOD_static_types.h | 1 +
.../nodes/function/nodes/node_fn_float_to_int.cc | 95 ++++++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 100644 source/blender/nodes/function/nodes/node_fn_float_to_int.cc
Updating Submodules
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
From git://git.blender.org/blender-addons
* branch master -> FETCH_HEAD
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
From git://git.blender.org/blender-addons-contrib
* branch master -> FETCH_HEAD
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
From git://git.blender.org/blender-translations
* branch master -> FETCH_HEAD
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
From git://git.blender.org/blender-dev-tools
* branch master -> FETCH_HEAD
Already up to date.
And when I do it through the program I have that :
CHECKOUT
Your branch is up to date with 'origin/master'.
UPDATE
No explicit msvc version requested, autodetecting version.
**********************************************************************
** Visual Studio 2019 Developer Command Prompt v16.8.4
** Copyright (c) 2020 Microsoft Corporation
**********************************************************************
[vcvarsall.bat] Environment initialized for: 'x64'
Compiler Detection successful, detected VS2019
Updating Precompiled Libraries and Tests
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive cleanup F:/prog/blender_git/blender\..\lib\win64_vc15
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive switch https://svn.blender.org/svnroot/bf-blender/trunk/lib/win64_vc15 F:/prog/blender_git/blender\..\lib\win64_vc15
At revision 62649.
C:\Program Files\SlikSvn\bin\svn.exe --non-interactive update F:/prog/blender_git/blender\..\lib\win64_vc15
Updating 'F:\prog\blender_git\lib\win64_vc15':
At revision 62649.
Updating Blender Git Repository
C:\Program Files\Git\cmd\git.exe pull --rebase
Already up to date.
Updating Submodules
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
Already up to date.
C:\Program Files\Git\cmd\git.exe pull --rebase origin master
Already up to date.
Both are on the same revision, but the first one finds some updates, and the second one doesn’t.
looks ok, next one up, the build log, there should be a Build.log in your build folder that may shed some light.
Everything looks good as well, all the .lib created from the .vcxproj and then :
Build succeeded.
0 Warning(s)
0 Error(s)
Well it just worked now on master, maybe because I did the make update manually ?
I’m trying to build another branch to see if I still have the same issue.
Ok, so when I changed the branch, I got that the first, but the second time it worked, don’t if you have a solution for that ?
F:/prog/blender_git/blender/intern/cycles/kernel/..\kernel/kernel_shader.h(1055): warning : integer conversion resulted in a change of sign [f:\prog\blender_git\branches\cycles-x_branch\intern\cycles\kernel\cycles_kernel_cuda.vcxproj]
cycles_render.lib(session.obj) : error LNK2019: unresolved external symbol "public: bool __cdecl ccl::PathTrace::copy_render_tile_from_device(void)" (?copy_render_tile_from_device@PathTrace@ccl@@QEAA_NXZ) referenced in function "public: bool __cdecl ccl::Session::copy_render_tile_from_device(void)" (?copy_render_tile_from_device@Session@ccl@@QEAA_NXZ) [f:\prog\blender_git\branches\cycles-x_branch\source\creator\blender.vcxproj]
cycles_integrator.lib(path_trace_work_gpu.obj) : error LNK2019: unresolved external symbol "public: void __cdecl ccl::GPUDisplay::copy_pixels_to_texture(struct ccl::half4 const *)" (?copy_pixels_to_texture@GPUDisplay@ccl@@QEAAXPEBUhalf4@2@@Z) referenced in function "public: virtual void __cdecl ccl::PathTraceWorkGPU::copy_to_gpu_display(class ccl::GPUDisplay *,enum ccl::PassMode,int)" (?copy_to_gpu_display@PathTraceWorkGPU@ccl@@UEAAXPEAVGPUDisplay@2@W4PassMode@2@H@Z) [f:\prog\blender_git\branches\cycles-x_branch\source\creator\blender.vcxproj]
F:\prog\blender_git\branches\cycles-x_branch\bin\Release\blender.exe : fatal error LNK1120: 2 unresolved externals [f:\prog\blender_git\branches\cycles-x_branch\source\creator\blender.vcxproj]
1643 Warning(s)
3 Error(s)
Time Elapsed 00:38:22.75