[GExperts-Checkins] SF.net SVN: gexperts:[858] branches/formatter/trunk

[<tw...@us...>]

Revision: 858
          http://sourceforge.net/p/gexperts/code/858
Author:   twm
Date:     2014-04-16 20:07:26 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
Updated buildscripts again, they now all use the delphipath.cmd script which gets the path of the Delphi installations from the registry

Modified Paths:
--------------
    branches/formatter/trunk/buildtools/delphipath.cmd
    branches/formatter/trunk/projects/editorexpert/Delphi2005/__Build_Project.cmd
    branches/formatter/trunk/projects/editorexpert/Delphi2006/__Build_Project.cmd
    branches/formatter/trunk/projects/editorexpert/Delphi6/__Build_Project.cmd
    branches/formatter/trunk/projects/editorexpert/Delphi7/__Build_Project.cmd
    branches/formatter/trunk/projects/regularexpert/Delphi2005/__Build_Project.cmd
    branches/formatter/trunk/projects/regularexpert/Delphi2006/__Build_Project.cmd
    branches/formatter/trunk/projects/regularexpert/Delphi6/__Build_Project.cmd
    branches/formatter/trunk/projects/regularexpert/Delphi7/__Build_Project.cmd

Added Paths:
-----------
    branches/formatter/trunk/buildtools/InitForDelphi2005.cmd
    branches/formatter/trunk/buildtools/InitForDelphi2006.cmd
    branches/formatter/trunk/buildtools/InitForDelphi6.cmd
    branches/formatter/trunk/buildtools/InitForDelphi7.cmd

Removed Paths:
-------------
    branches/formatter/trunk/buildtools/delphiversions.cmd

Copied: branches/formatter/trunk/buildtools/InitForDelphi2005.cmd (from rev 857, branches/formatter/trunk/buildtools/InitForDelphi2009.cmd)
===================================================================
--- branches/formatter/trunk/buildtools/InitForDelphi2005.cmd	                        (rev 0)
+++ branches/formatter/trunk/buildtools/InitForDelphi2005.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -0,0 +1,5 @@
+@rem this sets the environment variables DelphiVersion, DelphiPath and DelphiExe
+setlocal
+call %~dp0\doInitForDelphi.cmd %0
+endlocal set DelphiVersion=%DelphiVersion% & set DelphiPath=%DelphiPath%
+set DelphiExe=%DelphiPath%\bin\bds.exe

Copied: branches/formatter/trunk/buildtools/InitForDelphi2006.cmd (from rev 857, branches/formatter/trunk/buildtools/InitForDelphi2009.cmd)
===================================================================
--- branches/formatter/trunk/buildtools/InitForDelphi2006.cmd	                        (rev 0)
+++ branches/formatter/trunk/buildtools/InitForDelphi2006.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -0,0 +1,5 @@
+@rem this sets the environment variables DelphiVersion, DelphiPath and DelphiExe
+setlocal
+call %~dp0\doInitForDelphi.cmd %0
+endlocal set DelphiVersion=%DelphiVersion% & set DelphiPath=%DelphiPath%
+set DelphiExe=%DelphiPath%\bin\bds.exe

Copied: branches/formatter/trunk/buildtools/InitForDelphi6.cmd (from rev 857, branches/formatter/trunk/buildtools/InitForDelphi2009.cmd)
===================================================================
--- branches/formatter/trunk/buildtools/InitForDelphi6.cmd	                        (rev 0)
+++ branches/formatter/trunk/buildtools/InitForDelphi6.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -0,0 +1,5 @@
+@rem this sets the environment variables DelphiVersion, DelphiPath and DelphiExe
+setlocal
+call %~dp0\doInitForDelphi.cmd %0
+endlocal set DelphiVersion=%DelphiVersion% & set DelphiPath=%DelphiPath%
+set DelphiExe=%DelphiPath%\bin\Delphi32.exe

Copied: branches/formatter/trunk/buildtools/InitForDelphi7.cmd (from rev 857, branches/formatter/trunk/buildtools/InitForDelphi2009.cmd)
===================================================================
--- branches/formatter/trunk/buildtools/InitForDelphi7.cmd	                        (rev 0)
+++ branches/formatter/trunk/buildtools/InitForDelphi7.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -0,0 +1,5 @@
+@rem this sets the environment variables DelphiVersion, DelphiPath and DelphiExe
+setlocal
+call %~dp0\doInitForDelphi.cmd %0
+endlocal set DelphiVersion=%DelphiVersion% & set DelphiPath=%DelphiPath%
+set DelphiExe=%DelphiPath%\bin\Delphi32.exe

Modified: branches/formatter/trunk/buildtools/delphipath.cmd
===================================================================
--- branches/formatter/trunk/buildtools/delphipath.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/buildtools/delphipath.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -65,7 +65,7 @@
 
 :allok
 endlocal & set DelphiPath=%DelphiPath%
-echo DelphiPath: "%DelphiPath%"
+rem echo DelphiPath: "%DelphiPath%"
 goto :eof
 
 :ReadReg
@@ -75,5 +75,12 @@
   set DelphiPath=%%A %%B
 )
 rem remove one trailing space which might have been added because %%B was empty
-set DelphiPath=%DelphiPath:\ =\%
+rem remove any quotes
+set DelphiPath=%DelphiPath:"=%
+rem add quotes
+set DelphiPath="%DelphiPath%"
+rem remove space before the closing quote
+set DelphiPath=%DelphiPath: "="%
+rem remove any quotes
+set DelphiPath=%DelphiPath:"=%
 goto :eof

Deleted: branches/formatter/trunk/buildtools/delphiversions.cmd
===================================================================
--- branches/formatter/trunk/buildtools/delphiversions.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/buildtools/delphiversions.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,40 +0,0 @@
-@rem set environment variables for various Delphi versions
-@echo off
-
-rem Support fuer Windows 7/8, 64 Bit
-set ProgFiles=%ProgramFiles(x86)%
-if not "%ProgFiles%"=="" goto Win64Bit
-set ProgFiles=%ProgramFiles%
-:Win64Bit
-
-if not "%DelphiProgDir%"=="" goto custom
-
-set Delphi6Dir=%ProgFiles%\Borland\Delphi6
-set Delphi7Dir=%ProgFiles%\Borland\Delphi7
-set Delphi2005Dir="%ProgFiles%\Borland\BDS\3.0
-set Delphi2006Dir="%ProgFiles%\Borland\BDS\4.0
-set Delphi2007Dir=%ProgFiles%\CodeGear\RAD Studio\5.0
-set Delphi2009Dir=%ProgFiles%\CodeGear\RAD Studio\6.0
-set Delphi2010Dir=%ProgFiles%\Embarcadero\RAD Studio\7.0
-set DelphiXEDir=%ProgFiles%\Embarcadero\RAD Studio\8.0
-set DelphiXE2Dir=%ProgFiles%\Embarcadero\RAD Studio\9.0
-set DelphiXE3Dir=%ProgFiles%\Embarcadero\RAD Studio\10.0
-set DelphiXE4Dir=%ProgFiles%\Embarcadero\RAD Studio\11.0
-set DelphiXE5Dir=%ProgFiles%\Embarcadero\RAD Studio\12.0
-goto :eof
-
-:custom
-set Delphi6Dir=%DelphiProgDir%\Delphi6
-set Delphi7Dir=%DelphiProgDir%\Delphi7
-set Delphi2005Dir=%DelphiProgDir%\Delphi2005
-set Delphi2006Dir=%DelphiProgDir%\Delphi2006
-set Delphi2007Dir=%DelphiProgDir%\Delphi2007
-set Delphi2009Dir=%DelphiProgDir%\Delphi2009
-set Delphi2010Dir=%DelphiProgDir%\Delphi2010
-set DelphiXEDir=%DelphiProgDir%\DelphiXE
-set DelphiXE2Dir=%DelphiProgDir%\DelphiXE2
-set DelphiXE3Dir=%DelphiProgDir%\DelphiXE3
-rem Stupid me forgot to install XE4 to c:\delphi - sorry if anybody relied on this being consistent
-set DelphiXE4Dir=%ProgFiles%\Embarcadero\RAD Studio\11.0
-set DelphiXE5Dir=%DelphiProgDir%\DelphiXE5
-goto :eof

Modified: branches/formatter/trunk/projects/editorexpert/Delphi2005/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/editorexpert/Delphi2005/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/editorexpert/Delphi2005/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi2005Dir%\bin\dcc32.exe" GExpertsDelphi2005.dpr
+call ..\..\..\buildtools\InitForDelphi2005.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsDelphi2005.dpr
 echo done building GExpertsDelphi2005
 endlocal
 pause

Modified: branches/formatter/trunk/projects/editorexpert/Delphi2006/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/editorexpert/Delphi2006/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/editorexpert/Delphi2006/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi2006Dir%\bin\dcc32.exe" GExpertsBDS2006.dpr
+call ..\..\..\buildtools\InitForDelphi2006.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsBDS2006.dpr
 echo done building GExpertsBDS2006
 endlocal
 pause

Modified: branches/formatter/trunk/projects/editorexpert/Delphi6/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/editorexpert/Delphi6/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/editorexpert/Delphi6/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi6Dir%\bin\dcc32.exe" GExpertsD6.dpr
+call ..\..\..\buildtools\InitForDelphi6.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsD6.dpr
 echo done building GExpertsD6
 endlocal
 pause

Modified: branches/formatter/trunk/projects/editorexpert/Delphi7/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/editorexpert/Delphi7/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/editorexpert/Delphi7/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi7Dir%\bin\dcc32.exe" GExpertsD7.dpr
+call ..\..\..\buildtools\InitForDelphi7.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsD7.dpr
 echo done building GExpertsD7
 endlocal
 pause

Modified: branches/formatter/trunk/projects/regularexpert/Delphi2005/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/regularexpert/Delphi2005/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/regularexpert/Delphi2005/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi2005Dir%\bin\dcc32.exe" GExpertsDelphi2005.dpr
+call ..\..\..\buildtools\InitForDelphi2005.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsDelphi2005.dpr
 echo done building GExpertsDelphi2005
 endlocal
 pause

Modified: branches/formatter/trunk/projects/regularexpert/Delphi2006/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/regularexpert/Delphi2006/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/regularexpert/Delphi2006/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi2006Dir%\bin\dcc32.exe" GExpertsBDS2006.dpr
+call ..\..\..\buildtools\InitForDelphi2006.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsBDS2006.dpr
 echo done building GExpertsBDS2006
 endlocal
 pause

Modified: branches/formatter/trunk/projects/regularexpert/Delphi6/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/regularexpert/Delphi6/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/regularexpert/Delphi6/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi6Dir%\bin\dcc32.exe" GExpertsD6.dpr
+call ..\..\..\buildtools\InitForDelphi6.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsD6.dpr
 echo done building GExpertsD6
 endlocal
 pause

Modified: branches/formatter/trunk/projects/regularexpert/Delphi7/__Build_Project.cmd
===================================================================
--- branches/formatter/trunk/projects/regularexpert/Delphi7/__Build_Project.cmd	2014-04-16 02:17:07 UTC (rev 857)
+++ branches/formatter/trunk/projects/regularexpert/Delphi7/__Build_Project.cmd	2014-04-16 20:07:26 UTC (rev 858)
@@ -1,8 +1,8 @@
 @rem builds a project using dcc32
 setlocal
 call _prebuild.cmd
-call ..\..\..\buildtools\delphiversions.cmd
-"%Delphi7Dir%\bin\dcc32.exe" GExpertsD7.dpr
+call ..\..\..\buildtools\InitForDelphi7.cmd
+"%DelphiPath%\bin\dcc32.exe" GExpertsD7.dpr
 echo done building GExpertsD7
 endlocal
 pause

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.