fixes for building stable version

5 files changed, 24 insertions, 13 deletions

diff --git a/tools/build_scripts/build/make_ver_stable.bat b/tools/build_scripts/build/make_ver_stable.bat
index 0bc3f576e0..f94f659717 100644
--- a/tools/build_scripts/build/make_ver_stable.bat
+++ b/tools/build_scripts/build/make_ver_stable.bat
@@ -4,14 +4,20 @@ cd /d %~dp0
 for /F "tokens=2,3" %%i in (..\include\m_version.h) do if "%%i"=="MIRANDA_VERSION_FILEVERSION" (set OldVer=%%j)
 for /F %%i in ('git rev-list --count HEAD') do set Revision=%%i
 for /F %%i in ('git rev-parse --short HEAD') do set Hash=%%i
-REM for /F %%i in ('svnversion m_version.h.in') do set Revision=%%i
-REM for /F "tokens=3 delims= " %%l in (build.no) do (set /a "ver3=%%l+1")
-for /F "tokens=1,2,3 delims= " %%i in (build.no) do call :WriteVer %%i %%j %%k %Revision% %Hash%
+
+REM Fix building not-svn repository (e.g., Git mirror)
+if "%Revision:~0,11%" == "Unversioned" (set Revision=0)
+REM Fix building when svnversion tool is not installed
+if "%Revision%" == "" (set Revision=0)
+REM Fix trailing 'M', when the working copy contains modifications
+if "%Revision:~-1%" == "M" (set Revision=%Revision:~0,-1%)
+
+for /F "tokens=1,2,3 delims= " %%i in (build.no.stable) do call :WriteVer %%i %%j %%k %Revision% %Hash%
 goto :eof
 
 :WriteVer
 echo %1.%2.%3.%4.%5
-REM if "%OldVer%" == "%1,%2,%3,%4" (goto :eof)
+if "%OldVer%" == "%1,%2,%3,%4" (goto :eof)
 
 for /f "delims=/ tokens=1-3" %%a in ("%DATE:~4%") do (
 	for /f "delims=:. tokens=1-4" %%m in ("%TIME: =0%") do (
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index b52c173747..06f325d4a4 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -33,9 +33,9 @@ call compile%tp%.bat
 popd
 
 if /i '%tp%' == '32' (
-  %GetIt% -P Release/Libs -r -np -nd -nH -R html -e robots=off https://www.miranda-ng.org/distr/build/x86/
+  %GetIt% -P Release/Libs -r -np -nd -nH -R html -e robots=off https://miranda-ng.org/distr/build/x86/
 ) else if /i '%tp%' == '64' (
-  %GetIt% -P Release64/Libs -r -np -nd -nH -R html -e robots=off https://www.miranda-ng.org/distr/build/x64/
+  %GetIt% -P Release64/Libs -r -np -nd -nH -R html -e robots=off https://miranda-ng.org/distr/build/x64/
 )
 
 if exist Release ren Release Release32
diff --git a/tools/build_scripts/z3_PackArchives.bat b/tools/build_scripts/z3_PackArchives.bat
index 8ff4df1109..eff4dc58f7 100644
--- a/tools/build_scripts/z3_PackArchives.bat
+++ b/tools/build_scripts/z3_PackArchives.bat
@@ -33,10 +33,10 @@ move /Y miranda-ng-plugins*.7z %ArchDistr%
 
 cd ..
 
-if /i '%tp%' == '32' (
-if exist "Release" rd /Q /S "Release" >nul
-)
-if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
-if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
+rem if /i '%tp%' == '32' (
+rem if exist "Release" rd /Q /S "Release" >nul
+rem )
+rem if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
+rem if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
 
 popd
\ No newline at end of file
diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat
index 0095e0c116..45696d3609 100644
--- a/tools/build_scripts/z3_PackArchivesStable.bat
+++ b/tools/build_scripts/z3_PackArchivesStable.bat
@@ -67,7 +67,7 @@ REM move /Y miranda-ng-plugins*.7z %ArchDistr%
 
 cd ..
 
-if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
-if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
+rem if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
+rem if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
 
 popd
\ No newline at end of file
diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat
index 461ac83a24..200216cd7f 100644
--- a/tools/build_scripts/zz_zRebuildUploadStable.bat
+++ b/tools/build_scripts/zz_zRebuildUploadStable.bat
@@ -2,6 +2,11 @@
 echo WARNING!!! You are about to compile and upload STABLE versions of Miranda NG! Are you absolutely sure?!
 pause
 
+call git_update.bat
+set GIT_STATUS=%ERRORLEVEL%
+if %GIT_STATUS%==0 echo Git update success
+if not %GIT_STATUS%==0 goto :Error
+
 call z1_ReBuild_Full_Stable.bat 32
 
 call z1_ReBuild_Full_Stable.bat 64