Skip to content

Commit

Permalink
Pump daemon version up to 1.2.2, add installer 'downlaod chain' option
Browse files Browse the repository at this point in the history
  • Loading branch information
RyuMaster committed Jul 22, 2019
1 parent a225457 commit dfbc7c8
Show file tree
Hide file tree
Showing 7 changed files with 3,553 additions and 8 deletions.
46 changes: 39 additions & 7 deletions build/installer.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Xaya"
!macroend

/*
COMMENT FOR NOW, KEEP FOR LATER USE
WHEN WILL BE ADDING EXTERNAL SYNCH
DATA
!macro customInstall
MessageBox MB_YESNO "Would you like to predownload the blockchain data? This could save you several hours of syncing the blockchain" IDYES true IDNO false
true:
ExecWait '"$INSTDIR\resources\installer\downloadchain.cmd" "$INSTDIR\resources\installer\"'
false:
!macroend

/*
!include nsDialogs.nsh
!include LogicLib.nsh
Expand All @@ -26,11 +29,11 @@ Var /global SOURCEXAYAFULL
Var /global BROWSESOURCE
Var /global BROWSEDEST
Var /global SOURCETEXT
Var /global SOURCETEXTFF
Var /global DESTTEXT
Var /global pathVar
Var Dialog
Page custom nsDialogsPage nsDialogsPageLeave
Function nsDialogsPage
Expand Down Expand Up @@ -72,6 +75,9 @@ Function nsDialogsPageLeave
Abort
${EndIf}
GetDlgItem $0 $HWNDPARENT 1
EnableWindow $0 0
StrCpy $SOURCEXAYAORV "\appdata.orv"
StrCpy $SOURCEXAYAFULL "$SOURCEXAYAPARTIAL$SOURCEXAYAORV"
Expand All @@ -80,8 +86,34 @@ Function nsDialogsPageLeave
FileWrite $9 $pathVar
FileClose $9
${EndIf}
StrCpy $SOURCETEXTFF "$pathVar\xaya_20190715.zip"
MessageBox MB_YESNO "Pre-download wallet blockchain data?" IDYES true IDNO false
true:
StrCpy $2 "$SOURCETEXT\xaya_20190715.zip"
inetc::get /POPUP "" /CAPTION "xaya_20190715.zip" "http://xaya.io/downloads/xaya_20190716.zip" $SOURCETEXTFF /END
Pop $0 # return value = exit code, "OK" if OK
${If} $0 == "OK"
nsisunz::Unzip $SOURCETEXTFF $pathVar
${EndIf}
MessageBox MB_OK "Download Status: $0"
false:
GetDlgItem $0 $HWNDPARENT 1
EnableWindow $0 1
StrCpy $R9 2
Call RelGotoPage
FunctionEnd
Section
SectionEnd*/
SectionEnd
Page License
Page Directory
Page InstFiles
Page custom nsDialogsPage nsDialogsPageLeave
Page Finish*/
2 changes: 2 additions & 0 deletions electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@
"perMachine": true,
"license" : "LICENSE.md",
"warningsAsErrors": false,
"runAfterFinish" : false,
"deleteAppDataOnUninstall": true
},
"extraResources": [
"daemon/*",
"installer/*",
"COPYING.txt",
"node_modules/zeromq/build/Release/*.node"
]
Expand Down
3,507 changes: 3,507 additions & 0 deletions installer/curl-ca-bundle.crt

Large diffs are not rendered by default.

Binary file added installer/curl.exe
Binary file not shown.
4 changes: 4 additions & 0 deletions installer/downloadchain.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cd %1
curl.exe --progress-bar https://xaya.io/downloads/xaya_chain_xid_20190717.exe -O xaya_chain_xid_20190717.exe
xaya_chain_xid_20190717.exe -o"%appdata%\" -y
del xaya_chain_xid_20190717.exe
Binary file added installer/libcurl-x64.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "XAYA-Electron",
"version": "1.2.0",
"version": "1.2.2",
"description": "XAYA",
"homepage": "https://github.com/xaya/xaya_electron",
"author": {
Expand Down

0 comments on commit dfbc7c8

Please sign in to comment.