diff --git a/src/version.h.in b/src/version.h.in index 6b13dd94..af0922d0 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -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 "]" diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index 43d329d9..cc9fd4ba 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -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:
+http://build.zano.org:8081/builds/$package_filename
+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 diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 07b78b3f..9eac0890 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -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:
+http://build.zano.org:8081/builds/$package_filename
+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} diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 96f04148..8b156afa 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -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%

ZIP: http://build.zano.org:8081/builds/%build_zip_filename%
PDBs: http://build.zano.org:8081/builds/%pdbs_zip_filename%" +set mail_msg="New %build_prefix% %TESTNET_LABEL%build for win-x64:
INST: http://build.zano.org:8081/builds/%installer_file%
sha256: %installer_checksum%

ZIP: http://build.zano.org:8081/builds/%build_zip_filename%
sha256: %build_zip_checksum%
PDBs: http://build.zano.org:8081/builds/%pdbs_zip_filename%
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