Page MenuHome

Windows: Add icons and icons_geom to make.bat
ClosedPublic

Authored by Ray Molenkamp (LazyDodo) on Aug 4 2021, 6:00 PM.

Details

Summary

Windows: Add icons and icons_geom to make.bat

This adds support for building the icons from make.bat
unlike bash there is no passing environment variables
on the command line.

The scripts go out of their way to locate both blender
and inkscape however if they are not found, the user is
given a helpful error message telling them how to set
the variables.

Although some extra help can be given there, if your
normal build is a 2019 full build running

make 2019 full icons

will help it find the blender executable as well.

finally if you know the name of your build folder
running

make builddir build_windows_Lite_x64_vc16_Release icons

will also work, if all fails you can point directly to
the blender executable by running

set BLENDER_BIN=c:\where\blender\lives\blender.exe

before running make icons or make icons_geom

The python scripts needed some small modifications since
without the PATHEXT, SystemRoot and SystemDrive
environment variables python will not initialize properly
on windows. (Not blender related, even mainline python
won't start without those)

Diff Detail

Repository
rB Blender
Branch
tmp_make_icon_support (branched from master)
Build Status
Buildable 16223
Build 16223: arc lint + arc unit

Event Timeline

Ray Molenkamp (LazyDodo) requested review of this revision.Aug 4 2021, 6:00 PM
Ray Molenkamp (LazyDodo) created this revision.

@Campbell Barton (campbellbarton) only added you to review the python specific changes (but feel free to pick at the rest if you want) since i was unsure if you'd prefer a different solution for those.

  • fix variable reset

Reviewing changes to Python scripts, other changes seem fine although I'm not experienced in that area.

Accepting, as the requested changes are small and don't require an extra review iteration.

build_files/windows/icons.cmd
11

This could echo the path that wasn't found (to help users troubleshooting failure).

release/datafiles/blender_icons_geom_update.py
99–102
  • Prefer these vars are only set when needed.
  • Typo initalize.

Applies to the block below as well.

This revision is now accepted and ready to land.Aug 5 2021, 3:00 AM
  • Updates with feedback
Ray Molenkamp (LazyDodo) marked 2 inline comments as done.Aug 5 2021, 3:18 AM
Ray Molenkamp (LazyDodo) edited the summary of this revision. (Show Details)Aug 5 2021, 3:31 AM

committed in rB1def985d78db113ea4426311692941e44f0467eb but forgot the magic phab words in the commit.