- pascal build scripts adaptation for bin11

git-svn-id: http://svn.miranda-ng.org/main/trunk@2689 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

12 files changed, 110 insertions, 52 deletions

diff --git a/bin10/pascal32.bat b/bin10/pascal32.bat
index 09d2423230..3edb4664e1 100644
--- a/bin10/pascal32.bat
+++ b/bin10/pascal32.bat
@@ -3,37 +3,33 @@ rem @echo off
 pushd ..\plugins

 

 pushd Actman

-call make.bat fpc

+call make.bat fpc 10

 popd

 

 pushd ImportTXT

-call make.bat fpc

+call make.bat fpc 10

+popd

+

+pushd mRadio

+call make.bat fpc 10

 popd

 

 pushd QuickSearch

-call make.bat fpc

+call make.bat fpc 10

 popd

 

 pushd ShlExt

-call make.bat fpc

+call make.bat fpc 10

 popd

 

 pushd Watrack

-call make.bat fpc

+call make.bat fpc 10

 cd icons

-call makeicons.bat fpc

+call makeicons.bat fpc 10

 popd

 

 pushd Dbx_mmap_SA\Cryptors\Athena

-call make.bat fpc

-popd

-

-popd

-

-pushd ..\protocols

-

-pushd mRadio

-call make.bat fpc

+call make.bat fpc 10

 popd

 

 popd
\ No newline at end of file
diff --git a/bin10/pascal64.bat b/bin10/pascal64.bat
index 865a345b69..2ef0d764de 100644
--- a/bin10/pascal64.bat
+++ b/bin10/pascal64.bat
@@ -3,33 +3,29 @@ rem @echo off
 pushd ..\plugins

 

 pushd Actman

-call make.bat fpc64

+call make.bat fpc64 10

+popd

+

+pushd mRadio

+call make.bat fpc64 10

 popd

 

 pushd QuickSearch

-call make.bat fpc64

+call make.bat fpc64 10

 popd

 

 pushd ShlExt

-call make.bat fpc64

+call make.bat fpc64 10

 popd

 

 pushd Watrack

-call make.bat fpc64

+call make.bat fpc64 10

 cd icons

-call makeicons.bat fpc64

+call makeicons.bat fpc64 10

 popd

 

 pushd Dbx_mmap_SA\Cryptors\Athena

-call make.bat fpc64

-popd

-

-popd

-

-pushd ..\protocols

-

-pushd mRadio

-call make.bat fpc64

+call make.bat fpc64 10

 popd

 

 popd
\ No newline at end of file
diff --git a/bin11/pascal32.bat b/bin11/pascal32.bat
new file mode 100644
index 0000000000..f765872b32
--- /dev/null
+++ b/bin11/pascal32.bat
@@ -0,0 +1,35 @@
+rem @echo off

+

+pushd ..\plugins

+

+pushd Actman

+call make.bat fpc 11

+popd

+

+pushd ImportTXT

+call make.bat fpc 11

+popd

+

+pushd mRadio

+call make.bat fpc 11

+popd

+

+pushd QuickSearch

+call make.bat fpc 11

+popd

+

+pushd ShlExt

+call make.bat fpc 11

+popd

+

+pushd Watrack

+call make.bat fpc 11

+cd icons

+call makeicons.bat fpc 11

+popd

+

+pushd Dbx_mmap_SA\Cryptors\Athena

+call make.bat fpc 11

+popd

+

+popd
\ No newline at end of file
diff --git a/bin11/pascal64.bat b/bin11/pascal64.bat
new file mode 100644
index 0000000000..75446fdbd9
--- /dev/null
+++ b/bin11/pascal64.bat
@@ -0,0 +1,31 @@
+rem @echo off

+

+pushd ..\plugins

+

+pushd Actman

+call make.bat fpc64 11

+popd

+

+pushd mRadio

+call make.bat fpc64 11

+popd

+

+pushd QuickSearch

+call make.bat fpc64 11

+popd

+

+pushd ShlExt

+call make.bat fpc64 11

+popd

+

+pushd Watrack

+call make.bat fpc64 11

+cd icons

+call makeicons.bat fpc64 11

+popd

+

+pushd Dbx_mmap_SA\Cryptors\Athena

+call make.bat fpc64 11

+popd

+

+popd
\ No newline at end of file
diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat
index eba7c585c9..adf58c5765 100644
--- a/plugins/Actman/make.bat
+++ b/plugins/Actman/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=Actman

@@ -16,7 +16,7 @@ rem brcc32.exe %myopts% hooks\hooks.rc -fohooks\hooks.res
 rem brcc32.exe %myopts% tasks\tasks.rc -fotasks\tasks.res

 rem brcc32.exe %myopts% ua\ua.rc       -foua\ua.res

 

-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*

diff --git a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
index 44d2af2c3f..7fbb417d1d 100644
--- a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
+++ b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
@@ -1,9 +1,9 @@
 rem @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\..\..\bin10\Release\Plugins\Cryptors"

+  set OUTDIR="..\..\..\..\bin%2\Release\Plugins\Cryptors"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\..\..\bin10\Release64\Plugins\Cryptors"

+  set OUTDIR="..\..\..\..\bin%2\Release64\Plugins\Cryptors"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=Athena

@@ -13,7 +13,7 @@ md tmp
 

 rem brcc32.exe %myopts% athena.rc     -fooathena.res

 

-%FPCBIN% @..\..\..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\..\..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*

diff --git a/plugins/ImportTXT/make.bat b/plugins/ImportTXT/make.bat
index 83df36685c..1ed8067177 100644
--- a/plugins/ImportTXT/make.bat
+++ b/plugins/ImportTXT/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=ImportTXT

@@ -15,7 +15,7 @@ rem brcc32 -foImpTxt_Ver.res ImpTxt_Ver.rc
 rem brcc32 -foImpTxtDlg.res ImpTxtDlg.rc

 rem brcc32 -foImpTxtWiz.res ImpTxtWiz.rc

 

-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*

diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat
index ed975f6975..6002b54cf6 100644
--- a/plugins/QuickSearch/make.bat
+++ b/plugins/QuickSearch/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=QuickSearch

@@ -13,7 +13,7 @@ md tmp
 

 rem brcc32.exe qs.rc -foqs.res

 

-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*

diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat
index a90728e3c7..b13d30d48c 100644
--- a/plugins/ShlExt/make.bat
+++ b/plugins/ShlExt/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=ShlExt

@@ -11,7 +11,7 @@ set PROJECT=ShlExt
 if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

 

-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*

diff --git a/plugins/Watrack/icons/makeicons.bat b/plugins/Watrack/icons/makeicons.bat
index fe3604b963..a2be4f8ccf 100644
--- a/plugins/Watrack/icons/makeicons.bat
+++ b/plugins/Watrack/icons/makeicons.bat
@@ -1,9 +1,9 @@
 rem @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\..\bin10\Release\Icons"

+  set OUTDIR="..\..\..\bin%2\Release\Icons"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\..\bin10\Release64\Icons"

+  set OUTDIR="..\..\..\bin%2\Release64\Icons"

   set FPCBIN=ppcrossx64.exe

 )

 if not exist %OUTDIR% mkdir %OUTDIR%

diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat
index 0c4a6650de..76c66995e4 100644
--- a/plugins/Watrack/make.bat
+++ b/plugins/Watrack/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=Watrack

@@ -22,7 +22,7 @@ rem brcc32.exe stat\stat.rc           -fostat\stat.res
 rem brcc32.exe status\status.rc       -fostatus\status.res

 rem brcc32.exe templates\templates.rc -fotemplates\templates.res

 

-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q .\tmp\*

diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat
index 2917577c4a..1bc4a56588 100644
--- a/plugins/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
@@ -1,9 +1,9 @@
 @echo off

 if /i '%1' == 'fpc' (

-  set OUTDIR="..\..\bin10\Release\Plugins"

+  set OUTDIR="..\..\bin%2\Release\Plugins"

   set FPCBIN=fpc.exe

 ) else if /i '%1' == 'fpc64' (

-  set OUTDIR="..\..\bin10\Release64\Plugins"

+  set OUTDIR="..\..\bin%2\Release64\Plugins"

   set FPCBIN=ppcrossx64.exe

 )

 set PROJECT=mRadio

@@ -13,7 +13,7 @@ md tmp
 

 rem brcc32.exe mradio.rc -fomradio.res

 

-%FPCBIN% @..\..\plugins\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9

+%FPCBIN% @..\..\plugins\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 del /Q tmp\*