From 903afd11514c14313ea7c7d8f25051d06eee0bac Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Thu, 24 Jul 2014 00:07:44 +0400 Subject: [PATCH] Update wine build script --- contrib/build-wine/build-electrum-git.sh | 16 ++++++++-------- contrib/build-wine/deterministic.spec | 14 +++++++------- contrib/build-wine/electrum.nsi | 12 ++++++------ contrib/build-wine/prepare-wine.sh | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 279b364..1850035 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -1,7 +1,7 @@ #!/bin/bash # You probably need to update only this link -ELECTRUM_GIT_URL=git://github.com/spesmilo/electrum.git +ELECTRUM_GIT_URL=git://github.com/CryptoManiac/electrum-nvc.git BRANCH=master NAME_ROOT=electrum @@ -37,12 +37,12 @@ echo "Last commit: $COMMIT_HASH" cd .. -rm -rf $WINEPREFIX/drive_c/electrum -cp -r electrum-git $WINEPREFIX/drive_c/electrum +rm -rf $WINEPREFIX/drive_c/electrum-nvc +cp -r electrum-git $WINEPREFIX/drive_c/electrum-nvc cp electrum-git/LICENCE . # Build Qt resources -wine $WINEPREFIX/drive_c/Python26/Lib/site-packages/PyQt4/pyrcc4.exe C:/electrum/icons.qrc -o C:/electrum/lib/icons_rc.py +wine $WINEPREFIX/drive_c/Python26/Lib/site-packages/PyQt4/pyrcc4.exe C:/electrum-nvc/icons.qrc -o C:/electrum-nvc/lib/icons_rc.py # Copy ZBar libraries to electrum #cp "$WINEPREFIX/drive_c/Program Files (x86)/ZBar/bin/"*.dll "$WINEPREFIX/drive_c/electrum/" @@ -52,7 +52,7 @@ cd .. rm -rf dist/ # For building standalone compressed EXE, run: -$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w --onefile "C:/electrum/electrum" +$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w --onefile "C:/electrum-nvc/electrum-nvc" # For building uncompressed directory of dependencies, run: $PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w deterministic.spec @@ -63,7 +63,7 @@ wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" electrum.nsi DATE=`date +"%Y%m%d"` cd dist -mv electrum.exe $NAME_ROOT-$DATE-$COMMIT_HASH.exe -mv electrum $NAME_ROOT-$DATE-$COMMIT_HASH -mv electrum-setup.exe $NAME_ROOT-$DATE-$COMMIT_HASH-setup.exe +mv electrum-nvc.exe $NAME_ROOT-$DATE-$COMMIT_HASH.exe +mv electrum-nvc $NAME_ROOT-$DATE-$COMMIT_HASH +mv electrum-nvc-setup.exe $NAME_ROOT-$DATE-$COMMIT_HASH-setup.exe zip -r $NAME_ROOT-$DATE-$COMMIT_HASH.zip $NAME_ROOT-$DATE-$COMMIT_HASH diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 330b723..9369fe6 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -1,9 +1,9 @@ # -*- mode: python -*- # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports -a = Analysis(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui/text.py', - 'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py', - 'lib/bitcoin.py' +a = Analysis(['C:/electrum-nvc/electrum-nvc', 'C:/electrum-nvc/gui/qt/main_window.py', 'C:/electrum-nvc/gui/qt/lite_window.py', 'C:/electrum-nvc/gui/text.py', + 'C:/electrum-nvc/lib/util.py', 'C:/electrum-nvc/lib/wallet.py', 'C:/electrum-nvc/lib/simple_config.py', + 'C:/electrum-nvc/lib/bitcoin.py' ], hiddenimports=["lib","gui"], pathex=['lib:gui:plugins'], @@ -45,11 +45,11 @@ exe = EXE(pyz, a.scripts, a.binaries, a.datas, - name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'), + name=os.path.join('build\\pyi.win32\\electrum-nvc', 'electrum-nvc.exe'), debug=False, strip=None, upx=False, - icon='icons/electrum.ico', + icon='C:/electrum-nvc/icons/electrum.ico', console=False) # The 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 @@ -60,6 +60,6 @@ coll = COLLECT(exe, strip=None, upx=True, debug=False, - icon='icons/electrum.ico', + icon='C:/electrum-nvc/icons/electrum.ico', console=False, - name=os.path.join('dist', 'electrum')) + name=os.path.join('dist', 'electrum-nvc')) diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi index 59761b8..089dfd5 100644 --- a/contrib/build-wine/electrum.nsi +++ b/contrib/build-wine/electrum.nsi @@ -8,7 +8,7 @@ ;Name and file Name "Electrum-NVC" - OutFile "dist/electrum-setup.exe" + OutFile "dist/electrum-nvc-setup.exe" ;Default installation folder InstallDir "$PROGRAMFILES\Electrum-NVC" @@ -59,7 +59,7 @@ Section SetOutPath "$INSTDIR" ;ADD YOUR OWN FILES HERE... - file /r dist\electrum\*.* + file /r dist\electrum-nvc\*.* ;Store installation folder WriteRegStr HKCU "Software\Electrum-NVC" "" $INSTDIR @@ -68,12 +68,12 @@ Section WriteUninstaller "$INSTDIR\Uninstall.exe" - CreateShortCut "$DESKTOP\Electrum.lnk" "$INSTDIR\electrum.exe" "" + CreateShortCut "$DESKTOP\Electrum-NVC.lnk" "$INSTDIR\electrum-nvc.exe" "" ;create start-menu items CreateDirectory "$SMPROGRAMS\Electrum-NVC" CreateShortCut "$SMPROGRAMS\Electrum\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\Electrum\Electrum.lnk" "$INSTDIR\electrum.exe" "" "$INSTDIR\electrum.exe" 0 + CreateShortCut "$SMPROGRAMS\Electrum\Electrum-NVC.lnk" "$INSTDIR\electrum-nvc.exe" "" "$INSTDIR\electrum-nvc.exe" 0 SectionEnd @@ -95,8 +95,8 @@ Section "Uninstall" RMDir "$INSTDIR" - Delete "$DESKTOP\Electrum.lnk" - Delete "$SMPROGRAMS\Electrum\*.*" + Delete "$DESKTOP\Electrum-NVC.lnk" + Delete "$SMPROGRAMS\Electrum-NVC\*.*" RmDir "$SMPROGRAMS\Electrum-NVC" DeleteRegKey /ifempty HKCU "Software\Electrum-NVC" diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 6764ae7..bd90a8a 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -63,6 +63,6 @@ wget -q -O nsis.exe "http://prdownloads.sourceforge.net/nsis/nsis-2.46-setup.exe wine nsis.exe # Install UPX -#wget -O upx.zip "http://upx.sourceforge.net/download/upx308w.zip" -#unzip -o upx.zip -#cp upx*/upx.exe . +wget -O upx.zip "http://upx.sourceforge.net/download/upx308w.zip" +unzip -o upx.zip +cp upx*/upx.exe . -- 1.7.1