Skip to content

Commit

Permalink
SVN properties cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
outchy committed Feb 26, 2011
1 parent ffbd42f commit 4d7227f
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 71 deletions.
128 changes: 64 additions & 64 deletions thirdparty/InnoSetup/BuildSetup.bat
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
@echo off
SETLOCAL
SET SETUPDIR=%CD%

:: ==========================================================
:: rsvars.bat check
:: ==========================================================
if not "-%BDS%" == "-" goto RsVarsCalled
call rsvars.bat
if "-%BDS%" == "-" goto Leave

:RsVarsCalled
SET JCLROOT=%SETUPDIR%\..\jcl
SET JCLBUILTDIR=%SETUPDIR%\setupbuild
SET InnoSetupDir=%SETUPDIR%\InnoSetup

:: == Sanity checks ==
if not exist "%JCLROOT%\source\common\JclBase.pas" goto NoRootDirFound
if not exist "%SETUPDIR%\Install.iss" goto NoInstallDir


:: ==========================================================
:: Compile JCL
:: ==========================================================

:: == Create output directories ==
md "%SETUPDIR%\setupbuild" 2>NUL >NUL
md "%JCLBUILTDIR%" 2>NUL >NUL
md "%JCLBUILTDIR%\hpp" 2>NUL >NUL
md "%JCLBUILTDIR%\lib" 2>NUL >NUL
md "%JCLBUILTDIR%\bpl" 2>NUL >NUL

:: == Delete all files in the output directories, we always want to rebuild them ==
del /Q /S "%JCLBUILTDIR%\*.*" 2>NUL >NUL

:: == Compile the files
cd %JCLROOT%
msbuild make.proj "/p:HppOutDir=%JCLBUILTDIR%\hpp" "/p:DcuOutDir=%JCLBUILTDIR%\lib" "/p:BplOutDir=%JCLBUILTDIR%\bpl"
if ERRORLEVEL 1 goto Failed
cd %SETUPDIR%

:: ==========================================================
:: Compile Setup
:: ==========================================================
:Setup
"%InnoSetupDir%\ISCC.exe" Install.iss /dCmdLineBuild "/dJclRoot=%JCLROOT%" "/dJclLib=%JCLBUILTDIR%\lib" "/dJclBpl=%JCLBUILTDIR%\bpl" "/dJclHpp="%JCLBUILTDIR%\hpp"
if ERRORLEVEL 1 goto Failed


goto Leave

:NoInstalLDirFound
echo You must start BuildSetup.bat from the JclInnoSetup directory.
goto Failed

:NoRootDirFound
echo "%JCLROOT%" is not the JCL root directory.

:Failed
echo.
pause

:Leave
cd %SETUPDIR%
@echo off
SETLOCAL
SET SETUPDIR=%CD%

:: ==========================================================
:: rsvars.bat check
:: ==========================================================
if not "-%BDS%" == "-" goto RsVarsCalled
call rsvars.bat
if "-%BDS%" == "-" goto Leave

:RsVarsCalled
SET JCLROOT=%SETUPDIR%\..\jcl
SET JCLBUILTDIR=%SETUPDIR%\setupbuild
SET InnoSetupDir=%SETUPDIR%\InnoSetup

:: == Sanity checks ==
if not exist "%JCLROOT%\source\common\JclBase.pas" goto NoRootDirFound
if not exist "%SETUPDIR%\Install.iss" goto NoInstallDir


:: ==========================================================
:: Compile JCL
:: ==========================================================

:: == Create output directories ==
md "%SETUPDIR%\setupbuild" 2>NUL >NUL
md "%JCLBUILTDIR%" 2>NUL >NUL
md "%JCLBUILTDIR%\hpp" 2>NUL >NUL
md "%JCLBUILTDIR%\lib" 2>NUL >NUL
md "%JCLBUILTDIR%\bpl" 2>NUL >NUL

:: == Delete all files in the output directories, we always want to rebuild them ==
del /Q /S "%JCLBUILTDIR%\*.*" 2>NUL >NUL

:: == Compile the files
cd %JCLROOT%
msbuild make.proj "/p:HppOutDir=%JCLBUILTDIR%\hpp" "/p:DcuOutDir=%JCLBUILTDIR%\lib" "/p:BplOutDir=%JCLBUILTDIR%\bpl"
if ERRORLEVEL 1 goto Failed
cd %SETUPDIR%

:: ==========================================================
:: Compile Setup
:: ==========================================================
:Setup
"%InnoSetupDir%\ISCC.exe" Install.iss /dCmdLineBuild "/dJclRoot=%JCLROOT%" "/dJclLib=%JCLBUILTDIR%\lib" "/dJclBpl=%JCLBUILTDIR%\bpl" "/dJclHpp="%JCLBUILTDIR%\hpp"
if ERRORLEVEL 1 goto Failed


goto Leave

:NoInstalLDirFound
echo You must start BuildSetup.bat from the JclInnoSetup directory.
goto Failed

:NoRootDirFound
echo "%JCLROOT%" is not the JCL root directory.

:Failed
echo.
pause

:Leave
cd %SETUPDIR%
ENDLOCAL
12 changes: 6 additions & 6 deletions thirdparty/InnoSetup/CompInstall/build.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off

SET PATH=E:\Borland\Delphi7\Bin

dcc32 -U..\..\JCL\source\Common;..\..\JCL\source\Windows -I..\..\JCL\source\Include -Q -$D- -E.. CompInstall.dpr

@echo off

SET PATH=E:\Borland\Delphi7\Bin

dcc32 -U..\..\JCL\source\Common;..\..\JCL\source\Windows -I..\..\JCL\source\Include -Q -$D- -E.. CompInstall.dpr

pause
7 changes: 6 additions & 1 deletion thirdparty/svn_cleaner/SvnCleaner.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,14 @@ begin
AStringStream.Seek(0, soBeginning);
Xml.LoadFromStringStream(AStringStream);
FSvnProperties.LoadFromXml(Xml.Root);
finally
AStringStream.Free;
end;

AStringStream.Size := 0;
StorageStream.Size := 0;

AStringStream := TJclAutoStream.Create(StorageStream, False);
try
// retrieve the list of SVN items
WriteLn('getting SVN items...');
SvnResult := ExecuteSvn('status -v --xml ' + FSettings.Root);
Expand Down
7 changes: 7 additions & 0 deletions thirdparty/svn_cleaner/SvnCleaner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,13 @@
</property>
</setting>

<setting path="thirdparty/InnoSetup" mask="" recurse="no" dironly="yes">
<property name="svn:ignore">
<value>Output</value>
<value>setupbuild</value>
</property>
</setting>

<setting path="website/sourceforge/daily" mask="" recurse="no" dironly="yes">
<property name="svn:ignore">
<value>*.7z</value>
Expand Down

0 comments on commit 4d7227f

Please sign in to comment.