aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2013-11-01 17:36:46 +0400
committerKarlson2k <k2k@narod.ru>2013-11-01 17:36:46 +0400
commitb163219df12ca8d08b42f38ad952ae2db99848dd (patch)
tree07ec4a02fd3a114f951270a817a326bc4ebd9d57 /project
parent7366a67d592c8d5f13ff21454dbe8a74b9e40e9c (diff)
[win32] properly check status of formed packages
Diffstat (limited to 'project')
-rw-r--r--project/BuildDependencies/DownloadBuildDeps.bat6
-rw-r--r--project/BuildDependencies/scripts/get_formed.cmd6
2 files changed, 11 insertions, 1 deletions
diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat
index fdc51e4203..de1832728f 100644
--- a/project/BuildDependencies/DownloadBuildDeps.bat
+++ b/project/BuildDependencies/DownloadBuildDeps.bat
@@ -33,9 +33,13 @@ FOR /F "tokens=*" %%S IN ('dir /B "*_d.bat"') DO (
CALL %%S
)
+SET FORMED_OK_FLAG=%TMP_PATH%\got-all-formed-packages
REM Trick to preserve console title
start /b /wait cmd.exe /c get_formed.cmd
-IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
+IF NOT EXIST %FORMED_OK_FLAG% (
+ ECHO ERROR: Not all formed packages are ready!
+ EXIT /B 101
+)
cd %CUR_PATH%
diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd
index d5a07073fc..a3f630fac4 100644
--- a/project/BuildDependencies/scripts/get_formed.cmd
+++ b/project/BuildDependencies/scripts/get_formed.cmd
@@ -9,6 +9,11 @@ ECHO Aborting...
EXIT /B 20
)
+REM Clear succeed flag
+IF EXIST %FORMED_OK_FLAG% (
+ del /F /Q "%FORMED_OK_FLAG%" || EXIT /B 4
+)
+
CALL :setStageName Starting downloads of formed packages...
SET SCRIPT_PATH=%CD%
CD %DL_PATH% || EXIT /B 10
@@ -18,6 +23,7 @@ IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
)
CALL :setStageName All formed packages ready.
+ECHO %DATE% %TIME% > "%FORMED_OK_FLAG%"
EXIT /B 0
REM End of main body