Skip to content

Commit

Permalink
Use pynsist build script rather than build_prepare to copy icon
Browse files Browse the repository at this point in the history
  • Loading branch information
joepal1976 committed Mar 5, 2018
1 parent fa75190 commit 467ebab
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion buildscripts/build_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
EXCLUDES_RELEASE = ['testsuite']

# Include filter for additional asset files (not on hg) to copy (glob syntax)
ASSET_INCLUDES = ['*.npz', '*.mhpxy', '*.list', '*.thumb', '*.png', '*.json', '*.csv', '*.meta', '*.mhskel', '*.mhw', '*.mhmat', '*.mhclo', '*.proxy', 'glsl/*.txt', 'languages/*.ini', "*.bvh", "*.mhm", "*.qss", "*.mht", "*.svg", "*.mhpose", "icons/makehuman_bg.svg", "icons/makehuman.png", "icons/makehuman-large*", "logging.ini"]
ASSET_INCLUDES = ['*.npz', '*.mhpxy', '*.list', '*.thumb', '*.png', '*.json', '*.csv', '*.meta', '*.mhskel', '*.mhw', '*.mhmat', '*.mhclo', '*.proxy', 'glsl/*.txt', 'languages/*.ini', "*.bvh", "*.mhm", "*.qss", "*.mht", "*.svg", "*.mhpose", "icons/makehuman_bg.svg", "icons/makehuman.png", "logging.ini"]

# Even if empty, create these folders (relative to export path)
CREATE_FOLDERS = ['makehuman/data/backgrounds', 'makehuman/data/clothes', 'makehuman/data/teeth', 'makehuman/data/eyelashes', 'makehuman/data/tongue']
Expand Down
6 changes: 6 additions & 0 deletions buildscripts/win32/makePynsistBuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,11 @@
wrapperSrc = os.path.join(build_scripts,'win32','mhstartwrapper.py')
wrapperDst = os.path.join(exportDir,'mhstartwrapper.py')

rootdir = os.path.abspath(os.path.join(build_scripts,".."))
icons = os.path.join(rootdir,"makehuman","icons")

iconSrc = os.path.join(icons,"makehuman-large.ico")
iconDst os.path.join(exportDir,"makehuman.ico")

shutil.copy(wrapperSrc,wrapperDst)

2 changes: 1 addition & 1 deletion buildscripts/win32/pynsist.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name=TITLE
version=VERSION
publisher=Makehuman Community
script=mhstartwrapper.py
icon=makehuman/icons/makehuman-large.ico
icon=makehuman.ico

[Python]
version=3.6.4
Expand Down

0 comments on commit 467ebab

Please sign in to comment.