Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
2a891842
Commit
2a891842
authored
Apr 16, 2019
by
Sergey Sharybin
Browse files
Options
Downloads
Patches
Plain Diff
Clang-format: Speed up detection of clang-format
Don't construct the full build environment, following feedback from Ray.
parent
49e4182b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
build_files/windows/format.cmd
+16
-1
16 additions, 1 deletion
build_files/windows/format.cmd
make.bat
+9
-8
9 additions, 8 deletions
make.bat
with
25 additions
and
9 deletions
build_files/windows/format.cmd
+
16
−
1
View file @
2a891842
if
EXIST
%BLENDER_DIR%
\..\lib\win64_vc14\llvm\bin\clang
-format
.exe
(
set
CF_PATH
=
..\lib\win64_vc14\llvm\bin
goto
detect_done
)
if
EXIST
%BLENDER_DIR%
\..\lib\windows_vc14\llvm\bin\clang
-format
.exe
(
set
CF_PATH
=
..\lib\windows_vc14\llvm\bin
goto
detect_done
)
echo
clang
-format
not
found
exit
/b
1
:detect
_done
echo
found
clang
-format
in
%CF_PATH%
REM TODO(sergey): Switch to Python from libraries when available.
REM TODO(sergey): Switch to Python from libraries when available.
set
PYTHON
=
"python.exe"
set
PYTHON
=
"python.exe"
set
FORMAT_PATHS
=
%BLENDER_DIR%
\source\tools\utils_maintenance\clang_format_paths.py
set
FORMAT_PATHS
=
%BLENDER_DIR%
\source\tools\utils_maintenance\clang_format_paths.py
REM The formatting script expects clang-format to be in the current PATH.
REM The formatting script expects clang-format to be in the current PATH.
set
PATH
=
%
BUILD_VS_LIBDIR%
\llvm\bin
;
%PATH%
set
PATH
=
%
CF_PATH%
;
%PATH%
%PYTHON%
%FORMAT_PATHS%
--expand-tabs
%PYTHON%
%FORMAT_PATHS%
--expand-tabs
...
...
This diff is collapsed.
Click to expand it.
make.bat
+
9
−
8
View file @
2a891842
...
@@ -31,6 +31,12 @@ if "%BUILD_UPDATE%" == "1" (
...
@@ -31,6 +31,12 @@ if "%BUILD_UPDATE%" == "1" (
goto
EOF
goto
EOF
)
)
if
"
%FORMAT%
"
==
"1"
(
call
"
%BLENDER_DIR%
\build_files\windows\format.cmd"
goto
EOF
)
call
"
%BLENDER_DIR%
\build_files\windows\detect_architecture.cmd"
call
"
%BLENDER_DIR%
\build_files\windows\detect_architecture.cmd"
if
"
%BUILD_VS_YEAR%
"
==
""
(
if
"
%BUILD_VS_YEAR%
"
==
""
(
...
@@ -47,18 +53,13 @@ if "%BUILD_VS_YEAR%" == "" (
...
@@ -47,18 +53,13 @@ if "%BUILD_VS_YEAR%" == "" (
)
)
)
)
call
"
%BLENDER_DIR%
\build_files\windows\check_libraries.cmd"
if
errorlevel
1
goto
EOF
if
"
%FORMAT%
"
==
"1"
(
call
"
%BLENDER_DIR%
\build_files\windows\format.cmd"
goto
EOF
)
call
"
%BLENDER_DIR%
\build_files\windows\set_build_dir.cmd"
call
"
%BLENDER_DIR%
\build_files\windows\set_build_dir.cmd"
echo
Building
blender
with
VS
%BUILD_VS_YEAR%
for
%BUILD_ARCH%
in
%BUILD_DIR%
echo
Building
blender
with
VS
%BUILD_VS_YEAR%
for
%BUILD_ARCH%
in
%BUILD_DIR%
call
"
%BLENDER_DIR%
\build_files\windows\check_libraries.cmd"
if
errorlevel
1
goto
EOF
call
"
%BLENDER_DIR%
\build_files\windows\check_submodules.cmd"
call
"
%BLENDER_DIR%
\build_files\windows\check_submodules.cmd"
if
errorlevel
1
goto
EOF
if
errorlevel
1
goto
EOF
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment