forked from lthn/blockchain
Merge remote-tracking branch 'origin/frontend' into develop
This commit is contained in:
wildkif
commit
93081e108e
9 changed files with 93 additions and 44 deletions
|
|
@ -474,6 +474,7 @@ var TooltipDirective = /** @class */ (function () {
|
|||
this.timeout = 0;
|
||||
this.delay = 0;
|
||||
this.showWhenNoOverflow = true;
|
||||
this.onHide = new _angular_core__WEBPACK_IMPORTED_MODULE_0__["EventEmitter"]();
|
||||
}
|
||||
TooltipDirective.prototype.onMouseEnter = function () {
|
||||
if (this.showWhenNoOverflow || (!this.showWhenNoOverflow && this.el.nativeElement.offsetWidth < this.el.nativeElement.scrollWidth)) {
|
||||
|
|
@ -502,7 +503,10 @@ var TooltipDirective = /** @class */ (function () {
|
|||
_this.renderer.setStyle(_this.tooltip, 'opacity', '0');
|
||||
_this.removeTooltipTimeoutInner = setTimeout(function () {
|
||||
_this.renderer.removeChild(document.body, _this.tooltip);
|
||||
_this.tooltip.removeEventListener('mouseenter', _this.enter);
|
||||
_this.tooltip.removeEventListener('mouseleave', _this.leave);
|
||||
_this.tooltip = null;
|
||||
_this.onHide.emit(true);
|
||||
}, _this.delay);
|
||||
}, this.timeout);
|
||||
};
|
||||
|
|
@ -525,14 +529,16 @@ var TooltipDirective = /** @class */ (function () {
|
|||
this.renderer.addClass(innerBlock, 'scrolled-content');
|
||||
this.renderer.appendChild(this.tooltip, innerBlock);
|
||||
this.renderer.appendChild(document.body, this.tooltip);
|
||||
this.tooltip.addEventListener('mouseenter', function () {
|
||||
this.enter = function () {
|
||||
_this.cancelHide();
|
||||
});
|
||||
this.tooltip.addEventListener('mouseleave', function () {
|
||||
};
|
||||
this.tooltip.addEventListener('mouseenter', this.enter);
|
||||
this.leave = function () {
|
||||
if (_this.tooltip) {
|
||||
_this.hide();
|
||||
}
|
||||
});
|
||||
};
|
||||
this.tooltip.addEventListener('mouseleave', this.leave);
|
||||
this.renderer.setStyle(document.body, 'position', 'relative');
|
||||
this.renderer.setStyle(this.tooltip, 'position', 'absolute');
|
||||
if (this.tooltipClass !== null) {
|
||||
|
|
@ -698,6 +704,10 @@ var TooltipDirective = /** @class */ (function () {
|
|||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Input"])(),
|
||||
__metadata("design:type", Object)
|
||||
], TooltipDirective.prototype, "showWhenNoOverflow", void 0);
|
||||
__decorate([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Output"])(),
|
||||
__metadata("design:type", Object)
|
||||
], TooltipDirective.prototype, "onHide", void 0);
|
||||
__decorate([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["HostListener"])('mouseenter'),
|
||||
__metadata("design:type", Function),
|
||||
|
|
@ -7292,7 +7302,7 @@ var WalletDetailsComponent = /** @class */ (function () {
|
|||
/*! no static exports found */
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "<div class=\"header\">\r\n <div>\r\n <h3 tooltip=\"{{ variablesService.currentWallet.name }}\" placement=\"bottom-left\" tooltipClass=\"table-tooltip\" [delay]=\"500\" [showWhenNoOverflow]=\"false\">{{variablesService.currentWallet.name}}</h3>\r\n <button [routerLink]=\"['/assign-alias']\" *ngIf=\"!variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2 && variablesService.currentWallet.alias_available\">\r\n <i class=\"icon account\"></i>\r\n <span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>\r\n </button>\r\n <div class=\"alias\" *ngIf=\"variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2\">\r\n <span>{{variablesService.currentWallet.alias['name']}}</span>\r\n <ng-container *ngIf=\"variablesService.currentWallet.alias_available\">\r\n <i class=\"icon edit\" [routerLink]=\"['/edit-alias']\"></i>\r\n <i class=\"icon transfer\" [routerLink]=\"['/transfer-alias']\"></i>\r\n </ng-container>\r\n </div>\r\n </div>\r\n <div>\r\n <button [routerLink]=\"['/details']\" routerLinkActive=\"active\">\r\n <i class=\"icon details\"></i>\r\n <span>{{ 'WALLET.DETAILS' | translate }}</span>\r\n </button>\r\n </div>\r\n</div>\r\n<div class=\"address\">\r\n <span>{{variablesService.currentWallet.address}}</span>\r\n <i class=\"icon\" [class.copy]=\"!copyAnimation\" [class.copied]=\"copyAnimation\" (click)=\"copyAddress()\"></i>\r\n</div>\r\n<div class=\"balance\">\r\n <span [tooltip]=\"getTooltip()\" [placement]=\"'bottom'\" [tooltipClass]=\"'balance-tooltip'\" [delay]=\"300\" [timeout]=\"0\">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>\r\n <span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n</div>\r\n<div class=\"tabs\">\r\n <div class=\"tabs-header\">\r\n <ng-container *ngFor=\"let tab of tabs; let index = index\">\r\n <div class=\"tab\" [class.active]=\"tab.active\" [class.disabled]=\"(tab.link === '/send' || tab.link === '/contracts' || tab.link === '/staking') && (variablesService.daemon_state !== 2 || !variablesService.currentWallet.loaded)\" (click)=\"changeTab(index)\">\r\n <i class=\"icon\" [ngClass]=\"tab.icon\"></i>\r\n <span>{{ tab.title | translate }}</span>\r\n <span class=\"indicator\" *ngIf=\"tab.indicator\">{{variablesService.currentWallet.new_contracts}}</span>\r\n </div>\r\n </ng-container>\r\n </div>\r\n <div #scrolledContent class=\"tabs-content scrolled-content\">\r\n <router-outlet></router-outlet>\r\n </div>\r\n</div>\r\n\r\n"
|
||||
module.exports = "<div class=\"header\">\r\n <div>\r\n <h3 tooltip=\"{{ variablesService.currentWallet.name }}\" placement=\"bottom-left\" tooltipClass=\"table-tooltip\" [delay]=\"500\" [showWhenNoOverflow]=\"false\">{{variablesService.currentWallet.name}}</h3>\r\n <button [routerLink]=\"['/assign-alias']\" *ngIf=\"!variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2 && variablesService.currentWallet.alias_available\">\r\n <i class=\"icon account\"></i>\r\n <span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>\r\n </button>\r\n <div class=\"alias\" *ngIf=\"variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2\">\r\n <span>{{variablesService.currentWallet.alias['name']}}</span>\r\n <ng-container *ngIf=\"variablesService.currentWallet.alias_available\">\r\n <i class=\"icon edit\" [routerLink]=\"['/edit-alias']\"></i>\r\n <i class=\"icon transfer\" [routerLink]=\"['/transfer-alias']\"></i>\r\n </ng-container>\r\n </div>\r\n </div>\r\n <div>\r\n <button [routerLink]=\"['/details']\" routerLinkActive=\"active\">\r\n <i class=\"icon details\"></i>\r\n <span>{{ 'WALLET.DETAILS' | translate }}</span>\r\n </button>\r\n </div>\r\n</div>\r\n<div class=\"address\">\r\n <span>{{variablesService.currentWallet.address}}</span>\r\n <i class=\"icon\" [class.copy]=\"!copyAnimation\" [class.copied]=\"copyAnimation\" (click)=\"copyAddress()\"></i>\r\n</div>\r\n<div class=\"balance\">\r\n <span [tooltip]=\"getTooltip()\" [placement]=\"'bottom'\" [tooltipClass]=\"'balance-tooltip'\" [delay]=\"150\" [timeout]=\"0\" (onHide)=\"onHideTooltip()\">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>\r\n <span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n</div>\r\n<div class=\"tabs\">\r\n <div class=\"tabs-header\">\r\n <ng-container *ngFor=\"let tab of tabs; let index = index\">\r\n <div class=\"tab\" [class.active]=\"tab.active\" [class.disabled]=\"(tab.link === '/send' || tab.link === '/contracts' || tab.link === '/staking') && (variablesService.daemon_state !== 2 || !variablesService.currentWallet.loaded)\" (click)=\"changeTab(index)\">\r\n <i class=\"icon\" [ngClass]=\"tab.icon\"></i>\r\n <span>{{ tab.title | translate }}</span>\r\n <span class=\"indicator\" *ngIf=\"tab.indicator\">{{variablesService.currentWallet.new_contracts}}</span>\r\n </div>\r\n </ng-container>\r\n </div>\r\n <div #scrolledContent class=\"tabs-content scrolled-content\">\r\n <router-outlet></router-outlet>\r\n </div>\r\n</div>\r\n\r\n"
|
||||
|
||||
/***/ }),
|
||||
|
||||
|
|
@ -7444,23 +7454,26 @@ var WalletComponent = /** @class */ (function () {
|
|||
};
|
||||
WalletComponent.prototype.getTooltip = function () {
|
||||
var _this = this;
|
||||
var tooltip = document.createElement('div');
|
||||
this.balanceTooltip = document.createElement('div');
|
||||
var available = document.createElement('span');
|
||||
available.setAttribute('class', 'available');
|
||||
available.innerHTML = this.translate.instant('WALLET.AVAILABLE_BALANCE', { available: this.intToMoneyPipe.transform(this.variablesService.currentWallet.unlocked_balance), currency: this.variablesService.defaultCurrency });
|
||||
tooltip.appendChild(available);
|
||||
this.balanceTooltip.appendChild(available);
|
||||
var locked = document.createElement('span');
|
||||
locked.setAttribute('class', 'locked');
|
||||
locked.innerHTML = this.translate.instant('WALLET.LOCKED_BALANCE', { locked: this.intToMoneyPipe.transform(this.variablesService.currentWallet.balance.minus(this.variablesService.currentWallet.unlocked_balance)), currency: this.variablesService.defaultCurrency });
|
||||
tooltip.appendChild(locked);
|
||||
this.balanceTooltip.appendChild(locked);
|
||||
var link = document.createElement('span');
|
||||
link.setAttribute('class', 'link');
|
||||
link.innerHTML = this.translate.instant('WALLET.LOCKED_BALANCE_LINK');
|
||||
link.addEventListener('click', function () {
|
||||
_this.openInBrowser('docs.zano.org/docs/locked-balance');
|
||||
});
|
||||
tooltip.appendChild(link);
|
||||
return tooltip;
|
||||
this.balanceTooltip.appendChild(link);
|
||||
return this.balanceTooltip;
|
||||
};
|
||||
WalletComponent.prototype.onHideTooltip = function () {
|
||||
this.balanceTooltip = null;
|
||||
};
|
||||
WalletComponent.prototype.openInBrowser = function (link) {
|
||||
this.backend.openUrlInBrowser(link);
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
import {Directive, Input, ElementRef, HostListener, Renderer2, HostBinding, OnDestroy} from '@angular/core';
|
||||
import {Directive, Input, Output, ElementRef, HostListener, Renderer2, HostBinding, OnDestroy, EventEmitter} from '@angular/core';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
|
||||
@Directive({
|
||||
|
|
@ -15,7 +15,10 @@ export class TooltipDirective implements OnDestroy {
|
|||
@Input() timeout = 0;
|
||||
@Input() delay = 0;
|
||||
@Input() showWhenNoOverflow = true;
|
||||
@Output() onHide = new EventEmitter<boolean>();
|
||||
tooltip: HTMLElement;
|
||||
private enter: (event: MouseEvent) => void;
|
||||
private leave: (event: MouseEvent) => void;
|
||||
|
||||
removeTooltipTimeout;
|
||||
removeTooltipTimeoutInner;
|
||||
|
|
@ -51,7 +54,10 @@ export class TooltipDirective implements OnDestroy {
|
|||
this.renderer.setStyle(this.tooltip, 'opacity', '0');
|
||||
this.removeTooltipTimeoutInner = setTimeout(() => {
|
||||
this.renderer.removeChild(document.body, this.tooltip);
|
||||
this.tooltip.removeEventListener('mouseenter', this.enter);
|
||||
this.tooltip.removeEventListener('mouseleave', this.leave);
|
||||
this.tooltip = null;
|
||||
this.onHide.emit(true);
|
||||
}, this.delay);
|
||||
}, this.timeout);
|
||||
}
|
||||
|
|
@ -75,14 +81,16 @@ export class TooltipDirective implements OnDestroy {
|
|||
this.renderer.appendChild(this.tooltip, innerBlock);
|
||||
this.renderer.appendChild(document.body, this.tooltip);
|
||||
|
||||
this.tooltip.addEventListener('mouseenter', () => {
|
||||
this.enter = () => {
|
||||
this.cancelHide();
|
||||
});
|
||||
this.tooltip.addEventListener('mouseleave', () => {
|
||||
};
|
||||
this.tooltip.addEventListener('mouseenter', this.enter);
|
||||
this.leave = () => {
|
||||
if (this.tooltip) {
|
||||
this.hide();
|
||||
}
|
||||
});
|
||||
};
|
||||
this.tooltip.addEventListener('mouseleave', this.leave);
|
||||
|
||||
this.renderer.setStyle(document.body, 'position', 'relative');
|
||||
this.renderer.setStyle(this.tooltip, 'position', 'absolute');
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<i class="icon" [class.copy]="!copyAnimation" [class.copied]="copyAnimation" (click)="copyAddress()"></i>
|
||||
</div>
|
||||
<div class="balance">
|
||||
<span [tooltip]="getTooltip()" [placement]="'bottom'" [tooltipClass]="'balance-tooltip'" [delay]="300" [timeout]="0">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>
|
||||
<span [tooltip]="getTooltip()" [placement]="'bottom'" [tooltipClass]="'balance-tooltip'" [delay]="150" [timeout]="0" (onHide)="onHideTooltip()">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>
|
||||
<span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>
|
||||
</div>
|
||||
<div class="tabs">
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ export class WalletComponent implements OnInit, OnDestroy {
|
|||
walletID;
|
||||
copyAnimation = false;
|
||||
copyAnimationTimeout;
|
||||
balanceTooltip;
|
||||
|
||||
@ViewChild('scrolledContent') private scrolledContent: ElementRef;
|
||||
|
||||
|
|
@ -126,23 +127,27 @@ export class WalletComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
getTooltip() {
|
||||
const tooltip = document.createElement('div');
|
||||
this.balanceTooltip = document.createElement('div');
|
||||
const available = document.createElement('span');
|
||||
available.setAttribute('class', 'available');
|
||||
available.innerHTML = this.translate.instant('WALLET.AVAILABLE_BALANCE', {available: this.intToMoneyPipe.transform(this.variablesService.currentWallet.unlocked_balance), currency: this.variablesService.defaultCurrency});
|
||||
tooltip.appendChild(available);
|
||||
this.balanceTooltip.appendChild(available);
|
||||
const locked = document.createElement('span');
|
||||
locked.setAttribute('class', 'locked');
|
||||
locked.innerHTML = this.translate.instant('WALLET.LOCKED_BALANCE', {locked: this.intToMoneyPipe.transform(this.variablesService.currentWallet.balance.minus(this.variablesService.currentWallet.unlocked_balance)), currency: this.variablesService.defaultCurrency});
|
||||
tooltip.appendChild(locked);
|
||||
this.balanceTooltip.appendChild(locked);
|
||||
const link = document.createElement('span');
|
||||
link.setAttribute('class', 'link');
|
||||
link.innerHTML = this.translate.instant('WALLET.LOCKED_BALANCE_LINK');
|
||||
link.addEventListener('click', () => {
|
||||
this.openInBrowser('docs.zano.org/docs/locked-balance');
|
||||
});
|
||||
tooltip.appendChild(link);
|
||||
return tooltip;
|
||||
this.balanceTooltip.appendChild(link);
|
||||
return this.balanceTooltip;
|
||||
}
|
||||
|
||||
onHideTooltip() {
|
||||
this.balanceTooltip = null;
|
||||
}
|
||||
|
||||
openInBrowser(link) {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
#define BUILD_COMMIT_ID "@VERSION@"
|
||||
#define PROJECT_VERSION "1.0"
|
||||
#define PROJECT_VERSION_BUILD_NO 33
|
||||
#define PROJECT_VERSION_BUILD_NO 34
|
||||
#define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
|
||||
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"
|
||||
|
|
|
|||
|
|
@ -16,22 +16,18 @@ ARCHIVE_NAME_PREFIX=zano-linux-x64-
|
|||
|
||||
if [ -n "$build_prefix" ]; then
|
||||
ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}${build_prefix}-
|
||||
build_prefix_label="$build_prefix "
|
||||
fi
|
||||
|
||||
if [ -n "$testnet" ]; then
|
||||
testnet_def="-D TESTNET=TRUE"
|
||||
testnet_label="testnet "
|
||||
ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet-
|
||||
fi
|
||||
|
||||
|
||||
prj_root=$(pwd)
|
||||
|
||||
git pull --ff-only
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to pull"
|
||||
exit $?
|
||||
fi
|
||||
|
||||
echo "---------------- BUILDING PROJECT ----------------"
|
||||
echo "--------------------------------------------------"
|
||||
|
||||
|
|
@ -130,11 +126,14 @@ if [ $? -ne 0 ]; then
|
|||
exit $?
|
||||
fi
|
||||
|
||||
read checksum <<< $(sha256sum $package_filename | awk '/^/ { print $1 }' )
|
||||
|
||||
mail_msg="New build for linux-x64 available at http://build.zano.org:8081/builds/$package_filename"
|
||||
mail_msg="New ${build_prefix_label}${testnet_label}build for linux-x64:<br>
|
||||
http://build.zano.org:8081/builds/$package_filename<br>
|
||||
sha256: $checksum"
|
||||
|
||||
echo $mail_msg
|
||||
echo "$mail_msg"
|
||||
|
||||
echo $mail_msg | mail -s "Zano linux-x64 build $version_str" ${emails}
|
||||
echo "$mail_msg" | mail -s "Zano linux-x64 ${build_prefix_label}${testnet_label}build $version_str" ${emails}
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -131,16 +131,21 @@ echo "Build success"
|
|||
|
||||
echo "############### Uploading... ################"
|
||||
|
||||
scp $ZANO_BUILD_DIR/release/src/$package_filename zano_build_server:/var/www/html/builds/
|
||||
package_filepath=$ZANO_BUILD_DIR/release/src/$package_filename
|
||||
|
||||
scp $package_filepath zano_build_server:/var/www/html/builds/
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to upload to remote server"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
mail_msg="New build for macOS-x64 available at http://build.zano.org:8081/builds/$package_filename"
|
||||
read checksum <<< $( shasum -a 256 $package_filepath | awk '/^/ { print $1 }' )
|
||||
|
||||
echo $mail_msg
|
||||
mail_msg="New ${build_prefix_label}${testnet_label}build for macOS-x64:<br>
|
||||
http://build.zano.org:8081/builds/$package_filename<br>
|
||||
sha256: $checksum"
|
||||
|
||||
echo $mail_msg | mail -s "Zano macOS-x64 build $version_str" ${emails}
|
||||
echo "$mail_msg"
|
||||
|
||||
echo "$mail_msg" | mail -s "Zano macOS-x64 ${build_prefix_label}${testnet_label}build $version_str" ${emails}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ IF NOT [%build_prefix%] == [] (
|
|||
|
||||
IF NOT [%testnet%] == [] (
|
||||
SET TESTNET_DEF=-D TESTNET=TRUE
|
||||
SET TESTNET_LABEL=testnet
|
||||
SET ACHIVE_NAME_PREFIX=%ACHIVE_NAME_PREFIX%testnet-
|
||||
)
|
||||
|
||||
|
|
@ -33,11 +34,6 @@ set BOOST_LIBRARYDIR=%LOCAL_BOOST_LIB_PATH%
|
|||
|
||||
|
||||
cd %SOURCES_PATH%
|
||||
git pull
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
goto error
|
||||
)
|
||||
|
||||
|
||||
@echo "---------------- BUILDING APPLICATIONS ------------------------"
|
||||
@echo "---------------------------------------------------------------"
|
||||
|
|
@ -54,6 +50,8 @@ IF %ERRORLEVEL% NEQ 0 (
|
|||
)
|
||||
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64
|
||||
echo on
|
||||
cd %SOURCES_PATH%\build
|
||||
|
||||
msbuild version.vcxproj /p:SubSystem="CONSOLE,5.02" /p:Configuration=Release /t:Build
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
|
|
@ -174,30 +172,34 @@ IF %ERRORLEVEL% NEQ 0 (
|
|||
@echo " UPLOADING TO SERVER ...."
|
||||
|
||||
set installer_file=%ACHIVE_NAME_PREFIX%%version%-installer.exe
|
||||
set installer_path=%BUILDS_PATH%\builds\%installer_file%
|
||||
|
||||
pscp -load zano_build_server %BUILDS_PATH%\builds\%installer_file% build.zano.org:/var/www/html/builds
|
||||
pscp -load zano_build_server %installer_path% build.zano.org:/var/www/html/builds
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
@echo "FAILED TO UPLOAD EXE TO SERVER"
|
||||
goto error
|
||||
)
|
||||
call :sha256 %installer_path% installer_checksum
|
||||
|
||||
pscp -load zano_build_server %build_zip_path% build.zano.org:/var/www/html/builds
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
@echo "FAILED TO UPLOAD ZIP TO SERVER"
|
||||
goto error
|
||||
)
|
||||
call :sha256 %build_zip_path% build_zip_checksum
|
||||
|
||||
pscp -load zano_build_server %pdbs_zip_path% build.zano.org:/var/www/html/builds
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
@echo "FAILED TO UPLOAD PDBS TO SERVER"
|
||||
goto error
|
||||
)
|
||||
call :sha256 %pdbs_zip_path% pdbs_zip_path_checksum
|
||||
|
||||
set mail_msg="New build for win-x64 available at http://build.zano.org:8081/builds/%installer_file% <br><br>ZIP: http://build.zano.org:8081/builds/%build_zip_filename% <br>PDBs: http://build.zano.org:8081/builds/%pdbs_zip_filename%"
|
||||
set mail_msg="New %build_prefix% %TESTNET_LABEL%build for win-x64:<br>INST: http://build.zano.org:8081/builds/%installer_file% <br>sha256: %installer_checksum%<br><br>ZIP: http://build.zano.org:8081/builds/%build_zip_filename% <br>sha256: %build_zip_checksum%<br>PDBs: http://build.zano.org:8081/builds/%pdbs_zip_filename% <br>sha256: %pdbs_zip_path_checksum%"
|
||||
|
||||
echo %mail_msg%
|
||||
|
||||
senditquiet.exe -t %emails% -subject "Zano win-x64 build %version%" -body %mail_msg%
|
||||
senditquiet.exe -t %emails% -subject "Zano win-x64 %build_prefix% %TESTNET_LABEL%build %version%" -body %mail_msg%
|
||||
|
||||
|
||||
goto success
|
||||
|
|
@ -211,3 +213,20 @@ echo "BUILD SUCCESS"
|
|||
|
||||
cd ..
|
||||
|
||||
EXIT /B %ERRORLEVEL%
|
||||
|
||||
|
||||
:: functions
|
||||
|
||||
:sha256
|
||||
@setlocal enabledelayedexpansion
|
||||
@set /a count=1
|
||||
@for /f "skip=1 delims=:" %%a in ('CertUtil -hashfile %1 SHA256') do @(
|
||||
@if !count! equ 1 set "hash=%%a"
|
||||
@set /a count+=1
|
||||
)
|
||||
@(
|
||||
@endlocal
|
||||
@set "%2=%hash: =%
|
||||
)
|
||||
@exit /B 0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue