From e9912284b272b631ee92352333f57e8fc4b4f7b0 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sun, 27 Oct 2013 22:45:21 +0000
Subject: small changes to the scripts

git-svn-id: http://svn.miranda-ng.org/main/trunk@6655 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 tools/installer_ng_stable/compile       | 30 +++++++++++++++++++++++++++++
 tools/installer_ng_stable/make.bat      | 30 -----------------------------
 tools/installer_ng_stable/make_all      | 12 ++++++++++++
 tools/installer_ng_stable/makeclean.bat | 34 ---------------------------------
 4 files changed, 42 insertions(+), 64 deletions(-)
 create mode 100644 tools/installer_ng_stable/compile
 delete mode 100644 tools/installer_ng_stable/make.bat
 create mode 100644 tools/installer_ng_stable/make_all
 delete mode 100644 tools/installer_ng_stable/makeclean.bat

(limited to 'tools')

diff --git a/tools/installer_ng_stable/compile b/tools/installer_ng_stable/compile
new file mode 100644
index 0000000000..ff30bef414
--- /dev/null
+++ b/tools/installer_ng_stable/compile
@@ -0,0 +1,30 @@
+@echo off
+rem Get version
+if not exist tmp mkdir tmp
+Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
+pushd tmp
+for /F "tokens=1,2 delims= " %%i in (build.no) do set ver1=%%i.%%j
+for /F "tokens=3 delims= " %%k in (build.no) do (set /a "ver2=%%k-1")
+set Mirver=%ver1%.%ver2%
+popd
+rem end
+
+rem Download and extract compiler
+Tools\wget.exe -O tmp\InnoSetup5.7z http://miranda-ng.org/distr/installer/InnoSetup5.7z
+..\7-zip\7z.exe x tmp\InnoSetup5.7z -y -oTools
+rem end
+
+rem Set compiler variables
+set Compile32=Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "InnoNG_32\MirandaNG.iss"
+set Compile64=Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "InnoNG_64\MirandaNG.iss"
+rem end
+
+rem Get archives if needed
+if not exist InnoNG_32 call createstructure.bat
+if not exist InnoNG_64 call createstructure.bat
+rem end
+
+rem Make
+%Compile32%
+%Compile64%
+rem end
\ No newline at end of file
diff --git a/tools/installer_ng_stable/make.bat b/tools/installer_ng_stable/make.bat
deleted file mode 100644
index ff30bef414..0000000000
--- a/tools/installer_ng_stable/make.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-rem Get version
-if not exist tmp mkdir tmp
-Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
-pushd tmp
-for /F "tokens=1,2 delims= " %%i in (build.no) do set ver1=%%i.%%j
-for /F "tokens=3 delims= " %%k in (build.no) do (set /a "ver2=%%k-1")
-set Mirver=%ver1%.%ver2%
-popd
-rem end
-
-rem Download and extract compiler
-Tools\wget.exe -O tmp\InnoSetup5.7z http://miranda-ng.org/distr/installer/InnoSetup5.7z
-..\7-zip\7z.exe x tmp\InnoSetup5.7z -y -oTools
-rem end
-
-rem Set compiler variables
-set Compile32=Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "InnoNG_32\MirandaNG.iss"
-set Compile64=Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "InnoNG_64\MirandaNG.iss"
-rem end
-
-rem Get archives if needed
-if not exist InnoNG_32 call createstructure.bat
-if not exist InnoNG_64 call createstructure.bat
-rem end
-
-rem Make
-%Compile32%
-%Compile64%
-rem end
\ No newline at end of file
diff --git a/tools/installer_ng_stable/make_all b/tools/installer_ng_stable/make_all
new file mode 100644
index 0000000000..b0008c5091
--- /dev/null
+++ b/tools/installer_ng_stable/make_all
@@ -0,0 +1,12 @@
+@echo off
+rem Get archives
+call createstructure.bat
+rem end
+
+rem Make
+call compile.bat
+rem end
+
+rem Cleqnup
+call cleanup.bat
+rem end
\ No newline at end of file
diff --git a/tools/installer_ng_stable/makeclean.bat b/tools/installer_ng_stable/makeclean.bat
deleted file mode 100644
index 3415ecd02b..0000000000
--- a/tools/installer_ng_stable/makeclean.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-@echo off
-rem Get version
-if not exist tmp mkdir tmp
-Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
-pushd tmp
-for /F "tokens=1,2 delims= " %%i in (build.no) do set ver1=%%i.%%j
-for /F "tokens=3 delims= " %%k in (build.no) do (set /a "ver2=%%k-1")
-set Mirver=%ver1%.%ver2%
-popd
-rem end
-
-rem Download and extract compiler
-Tools\wget.exe -O tmp\InnoSetup5.7z http://miranda-ng.org/distr/installer/InnoSetup5.7z
-..\7-zip\7z.exe x tmp\InnoSetup5.7z -y -oTools
-rem end
-
-rem Set compiler variables
-set Compile32=Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "InnoNG_32\MirandaNG.iss"
-set Compile64=Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "InnoNG_64\MirandaNG.iss"
-rem end
-
-rem Get archives if needed
-if not exist InnoNG_32 call createstructure.bat
-if not exist InnoNG_64 call createstructure.bat
-rem end
-
-rem Make
-"%ProgramFiles%\%Compile32%
-"%ProgramFiles%\%Compile64%
-rem end
-
-rem Clean
-call cleanup.bat
-rem end
\ No newline at end of file
-- 
cgit v1.2.3