AaronFiore/electrum
1
0
Fork 0
Code Activity

icons: instead of symlinks, just mv "icons" dir

Browse Source 
symlinks are really inconvenient on Windows
(when running from cloned source)

follow-up #5055
This commit is contained in:
SomberNight
2019-02-07 18:57:25 +01:00
parent 9beabc0311
commit 2c71b9da0c
89 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build-linux/appimage/build.sh
View File

@@ -122,7 +122,7 @@ cp "/usr/lib/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
info "desktop integration."
cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop"
cp "$PROJECT_ROOT/icons/electrum.png" "$APPDIR/electrum.png"
cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png"
# add launcher

11
contrib/build-wine/deterministic.spec
View File

@@ -42,8 +42,7 @@ datas = [
(home+'electrum/locale', 'electrum/locale'),
(home+'electrum/plugins', 'electrum/plugins'),
('C:\\Program Files (x86)\\ZBar\\bin\\', '.'),
(home+'icons/*.png', 'electrum/gui/icons'),
(home+'icons/*.svg', 'electrum/gui/icons'),
(home+'electrum/gui/icons', 'electrum/gui/icons'),
]
datas += collect_data_files('trezorlib')
datas += collect_data_files('safetlib')
@@ -120,7 +119,7 @@ exe_standalone = EXE(
debug=False,
strip=None,
upx=False,
icon=home+'icons/electrum.ico',
icon=home+'electrum/gui/icons/electrum.ico',
console=False)
# console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
@@ -133,7 +132,7 @@ exe_portable = EXE(
debug=False,
strip=None,
upx=False,
icon=home+'icons/electrum.ico',
icon=home+'electrum/gui/icons/electrum.ico',
console=False)
#####
@@ -147,7 +146,7 @@ exe_dependent = EXE(
debug=False,
strip=None,
upx=False,
icon=home+'icons/electrum.ico',
icon=home+'electrum/gui/icons/electrum.ico',
console=False)
coll = COLLECT(
@@ -158,6 +157,6 @@ coll = COLLECT(
strip=None,
upx=True,
debug=False,
icon=home+'icons/electrum.ico',
icon=home+'electrum/gui/icons/electrum.ico',
console=False,
name=os.path.join('dist', 'electrum'))

4
contrib/build-wine/electrum.nsi
View File

@@ -72,7 +72,7 @@
!define MUI_ABORTWARNING
!define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
!define MUI_ICON "c:\electrum\icons\electrum.ico"
!define MUI_ICON "c:\electrum\electrum\gui\icons\electrum.ico"
;--------------------------------
;Pages
@@ -111,7 +111,7 @@ Section
;Files to pack into the installer
File /r "dist\electrum\*.*"
File "c:\electrum\icons\electrum.ico"
File "c:\electrum\electrum\gui\icons\electrum.ico"
;Store installation folder
WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR

5
contrib/osx/osx.spec
View File

@@ -7,7 +7,7 @@ import sys, os
PACKAGE='Electrum'
PYPKG='electrum'
MAIN_SCRIPT='run_electrum'
ICONS_FILE='electrum.icns'
ICONS_FILE=PYPKG + '/gui/icons/electrum.icns'
APP_SIGN = os.environ.get('APP_SIGN', '')
def fail(*msg):
@@ -76,8 +76,7 @@ datas = [
(electrum + PYPKG + '/wordlist/english.txt', PYPKG + '/wordlist'),
(electrum + PYPKG + '/locale', PYPKG + '/locale'),
(electrum + PYPKG + '/plugins', PYPKG + '/plugins'),
(electrum + 'icons/*.png', 'electrum/gui/icons'),
(electrum + 'icons/*.svg', 'electrum/gui/icons'),
(electrum + PYPKG + '/gui/icons', PYPKG + '/gui/icons'),
]
datas += collect_data_files('trezorlib')
datas += collect_data_files('safetlib')