Index: scripts/make_existing_release.bat =================================================================== diff -u -N -r03340b954ead8138d669ee4f8df7124dc84c5612 -r718a83fb4e17e7d6160fdbf11b154e2068278586 --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 03340b954ead8138d669ee4f8df7124dc84c5612) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 718a83fb4e17e7d6160fdbf11b154e2068278586) @@ -85,6 +85,24 @@ echo * Preparing the symbols package... +cd %MainProjectDir%\scripts +if "%CHCustomVersion%" == "1" ( + if "%CHReleaseType%" == "internal" ( + echo * WARNING: Skipping embedding source server info in PDB files due to local sources modifications... + ) else ( + echo * ERROR: Tagged sources contains local modifications - cannot embed source server info in PDB files... + goto error + ) +) else ( + echo * Embedding source server info in PDB files... + call internal\embed_srcserver_info.bat "%MainProjectDir%" + + if errorlevel 1 ( + echo ERROR: encountered a problem while embedding source server information in debug symbols. + goto error + ) +) + cd %MainProjectDir% if not exist bin\release ( echo ERROR: The bin\release directory does not exist. @@ -93,16 +111,6 @@ cd %MainProjectDir%\bin\release -if "%CHReleaseType%" == "tag" ( - echo * Embedding svn paths in the debug symbols... - call internal\embed_srcserver_info.bat %MainProjectDir% - - if errorlevel 1 ( - echo ERROR: encountered a problem while embedding source server information in debug symbols. - goto error - ) -) - 7z a "%OutputDir%\ch_symbols-%CHTextVersion%.zip" -tzip "*.pdb" >"%TmpDir%\command.log" if errorlevel 1 ( echo ERROR: Could not create symbols archive. See the log below: @@ -179,10 +187,12 @@ goto cleanup :error +echo * Clearing environment... call internal\clear_env.bat /skip_create exit /b 1 :cleanup +echo * Clearing environment... call internal\clear_env.bat /skip_create :end