diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-06 19:38:01 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-06 19:38:01 +0000 |
| commit | 6f0ca7a10c8ef8c64522ad98ab03698569c8caa4 (patch) | |
| tree | 83d119a526394948e6538f1d9f50cca9b483f1e8 | |
| parent | 663e65fe74e2429fb61d93f56855b8656a1d6463 (diff) | |
Installer: prevent double writing to the same file, don't leave tmp dir if there is nothing to do
git-svn-id: http://svn.miranda-ng.org/main/trunk@5983 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat | 2 | ||||
| -rw-r--r-- | tools/installer_ng/compile.bat | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat index 09b1439f9d..7659f5a892 100644 --- a/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat +++ b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat @@ -19,6 +19,7 @@ rem end rem Create Inno setup compatible script that compiles without passing parameters to compiler
if %InnoX% == InnoNG_32 (
+ if exist MirandaNG32.iss del /F /Q MirandaNG32.iss
..\Tools\wget.exe -O utf-8_32.vbs http://miranda-ng.org/distr/installer/utf-8_32.vbs
..\Tools\wget.exe -O bom_remove.exe %BomRem%
..\Tools\wget.exe -O bom_add.exe %BomAdd%
@@ -32,6 +33,7 @@ if %InnoX% == InnoNG_32 ( del /f /q bom_remove.exe
del /f /q bom_add.exe
) else if %InnoX% == InnoNG_64 (
+ if exist MirandaNG64.iss del /F /Q MirandaNG64.iss
..\Tools\wget.exe -O utf-8_64.vbs http://miranda-ng.org/distr/installer/utf-8_64.vbs
..\Tools\wget.exe -O bom_remove.exe %BomRem%
..\Tools\wget.exe -O bom_add.exe %BomAdd%
diff --git a/tools/installer_ng/compile.bat b/tools/installer_ng/compile.bat index d5cba179a7..5570d018d8 100644 --- a/tools/installer_ng/compile.bat +++ b/tools/installer_ng/compile.bat @@ -7,6 +7,7 @@ Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build. pushd tmp
%GetVer%
popd
+if exist tmp rd /S /Q tmp
goto esclocal
:localgetver
pushd ..\..\build
|