Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects:[810] trunk/Source
|
From: <na...@us...> - 2009-07-12 15:54:35
|
Revision: 810
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=810&view=rev
Author: nandod
Date: 2009-07-12 15:54:33 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
* reverted to rev. 806 due to wrong svn configuration.
Modified Paths:
--------------
trunk/Source/Core/D2007/IOCore.dpk
trunk/Source/Core/D2007/IOCore.dproj
trunk/Source/Core/InstantClasses.pas
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantCommand.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantTextFiler.pas
trunk/Source/Core/InstantUtils.pas
trunk/Source/Design/D2007/DclIOCore.dpk
trunk/Source/Design/D2007/DclIOCore.dproj
trunk/Source/Design/InstantCommandEditor.pas
Modified: trunk/Source/Core/D2007/IOCore.dpk
===================================================================
--- trunk/Source/Core/D2007/IOCore.dpk 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/D2007/IOCore.dpk 2009-07-12 15:54:33 UTC (rev 810)
@@ -22,8 +22,8 @@
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
-{$DESCRIPTION 'InstantObjects Run-Time Package (Delphi 2009)'}
-{$LIBSUFFIX '_D12'}
+{$DESCRIPTION 'InstantObjects Run-Time Package (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
{$RUNONLY}
{$IMPLICITBUILD OFF}
Modified: trunk/Source/Core/D2007/IOCore.dproj
===================================================================
--- trunk/Source/Core/D2007/IOCore.dproj 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/D2007/IOCore.dproj 2009-07-12 15:54:33 UTC (rev 810)
@@ -1,150 +1,71 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{82e2f82a-6598-4acf-bbca-e2315e5938f6}</ProjectGuid>
- <MainSource>IOCore.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\IOCore_D11.bpl</DCC_DependencyCheckOutputName>
- <ProjectVersion>12.0</ProjectVersion>
- <Config Condition="'$(Config)'==''">Debug</Config>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
- <Cfg_1>true</Cfg_1>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
- <Cfg_2>true</Cfg_2>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Base)'!=''">
- <DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\6.0\Bpl\IOCore_D12.bpl</DCC_DependencyCheckOutputName>
- <DCC_ImageBase>00400000</DCC_ImageBase>
- <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
- <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
- <DCC_Description>InstantObjects Run-Time Package (Delphi 2009)</DCC_Description>
- <DesignOnlyPackage>false</DesignOnlyPackage>
- <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
- <GenDll>true</GenDll>
- <GenPackage>true</GenPackage>
- <DllSuffix>_D12</DllSuffix>
- <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1)'!=''">
- <Version>7.0</Version>
- <DCC_DebugInformation>False</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
- <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
- <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
- <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2)'!=''">
- <Version>7.0</Version>
- <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
- </PropertyGroup>
- <ProjectExtensions>
- <Borland.Personality>Delphi.Personality.12</Borland.Personality>
- <Borland.ProjectType>Package</Borland.ProjectType>
- <BorlandProject>
- <Delphi.Personality>
- <Compiler>
- <Compiler Name="UsePackages">False</Compiler>
- <Compiler Name="Packages"/>
- </Compiler>
- <Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">2</VersionInfo>
- <VersionInfo Name="MinorVer">1</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1040</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"/>
- <VersionInfoKeys Name="LegalCopyright"/>
- <VersionInfoKeys Name="LegalTrademarks"/>
- <VersionInfoKeys Name="OriginalFilename"/>
- <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"/>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">IOCore.dpk</Source>
- </Source>
- </Delphi.Personality>
- </BorlandProject>
- <ProjectFileVersion>12</ProjectFileVersion>
- </ProjectExtensions>
- <ItemGroup>
- <DelphiCompile Include="IOCore.dpk">
- <MainSource>MainSource</MainSource>
- </DelphiCompile>
- <DCCReference Include="vcl.dcp"/>
- <DCCReference Include="vcldb.dcp"/>
- <DCCReference Include="rtl.dcp"/>
- <DCCReference Include="..\InstantUtils.pas"/>
- <DCCReference Include="..\InstantClasses.pas"/>
- <DCCReference Include="..\InstantConsts.pas"/>
- <DCCReference Include="..\InstantRtti.pas"/>
- <DCCReference Include="..\InstantCommand.pas"/>
- <DCCReference Include="..\InstantPersistence.pas"/>
- <DCCReference Include="..\InstantExplorer.pas"/>
- <DCCReference Include="..\InstantDesignHook.pas"/>
- <DCCReference Include="..\InstantCode.pas"/>
- <DCCReference Include="..\InstantTextFiler.pas"/>
- <DCCReference Include="..\InstantPresentation.pas"/>
- <DCCReference Include="..\InstantAccessors.pas"/>
- <DCCReference Include="..\InstantConnectionManagerFormUnit.pas">
- <Form>InstantConnectionManagerForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantConnectionManager.pas"/>
- <DCCReference Include="..\InstantImageUtils.pas"/>
- <DCCReference Include="..\InstantPump.pas"/>
- <DCCReference Include="..\InstantDBBuild.pas"/>
- <DCCReference Include="..\InstantDBEvolution.pas"/>
- <DCCReference Include="..\InstantCustomDBEvolverFormUnit.pas">
- <Form>InstantCustomDBEvolverForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantDBEvolverFormUnit.pas">
- <Form>InstantDBEvolverForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantDBBuilderFormUnit.pas">
- <Form>InstantDBBuilderForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantTypes.pas"/>
- <DCCReference Include="..\InstantBrokers.pas"/>
- <DCCReference Include="..\InstantMetadata.pas"/>
- <BuildConfiguration Include="Base">
- <Key>Base</Key>
- </BuildConfiguration>
- <BuildConfiguration Include="Debug">
- <Key>Cfg_2</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- <BuildConfiguration Include="Release">
- <Key>Cfg_1</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- </ItemGroup>
- <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
- </Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{82e2f82a-6598-4acf-bbca-e2315e5938f6}</ProjectGuid>
+ <MainSource>IOCore.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\IOCore_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects Run-Time Package (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">IOCore.dpk</Source></Source>
+ </Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="IOCore.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\..\PackageGroups\D2007\rtl.dcp" />
+ <DCCReference Include="..\..\PackageGroups\D2007\vcl.dcp" />
+ <DCCReference Include="..\..\PackageGroups\D2007\vcldb.dcp" />
+ <DCCReference Include="..\InstantAccessors.pas" />
+ <DCCReference Include="..\InstantBrokers.pas" />
+ <DCCReference Include="..\InstantClasses.pas" />
+ <DCCReference Include="..\InstantCode.pas" />
+ <DCCReference Include="..\InstantCommand.pas" />
+ <DCCReference Include="..\InstantConnectionManager.pas" />
+ <DCCReference Include="..\InstantConnectionManagerFormUnit.pas">
+ <Form>InstantConnectionManagerForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantConsts.pas" />
+ <DCCReference Include="..\InstantCustomDBEvolverFormUnit.pas">
+ <Form>InstantCustomDBEvolverForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantDBBuild.pas" />
+ <DCCReference Include="..\InstantDBBuilderFormUnit.pas">
+ <Form>InstantDBBuilderForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantDBEvolution.pas" />
+ <DCCReference Include="..\InstantDBEvolverFormUnit.pas">
+ <Form>InstantDBEvolverForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantDesignHook.pas" />
+ <DCCReference Include="..\InstantExplorer.pas" />
+ <DCCReference Include="..\InstantImageUtils.pas" />
+ <DCCReference Include="..\InstantMetadata.pas" />
+ <DCCReference Include="..\InstantPersistence.pas" />
+ <DCCReference Include="..\InstantPresentation.pas" />
+ <DCCReference Include="..\InstantPump.pas" />
+ <DCCReference Include="..\InstantRtti.pas" />
+ <DCCReference Include="..\InstantTextFiler.pas" />
+ <DCCReference Include="..\InstantTypes.pas" />
+ <DCCReference Include="..\InstantUtils.pas" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Source/Core/InstantClasses.pas
===================================================================
--- trunk/Source/Core/InstantClasses.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantClasses.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -50,12 +50,7 @@
InstantBufferSize = 4096;
type
-{$IFDEF D12+}
- TChars = set of AnsiChar;
-{$ELSE}
TChars = set of Char;
-{$ENDIF}
-
{$IFDEF LINUX}
TDate = type TDateTime;
TTime = type TDateTime;
@@ -1391,11 +1386,7 @@
for I := 1 to Length(Data) do
begin
C := Data[I];
-{$IFDEF D12+}
- if CharInSet(C, [#34, #38, #39, #60, #62]) then
-{$ELSE}
if C in [#34, #38, #39, #60, #62] then
-{$ENDIF}
begin
case C of
#34:
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantCode.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -2689,12 +2689,7 @@
begin
Name := Reader.ReadToken;
Reader.SkipSpace;
-
-{$IFDEF D12+}
- Result := CharInSet(Reader.ReadChar, [':', ',']);
-{$ELSE}
Result := Reader.ReadChar in [':', ','];
-{$ENDIF}
end;
procedure TInstantCodeSymbol.InternalRead(Reader: TInstantCodeReader);
@@ -3938,28 +3933,14 @@
if Copy(Result, i, 1) = 's' then
begin
If (i > 3) and (Copy(Result, i - 2, 3) = 'ies') and
-{$IFDEF D12+}
- not (CharInSet(Result[i - 3], Vowels)) then
-{$ELSE}
not (Result[i - 3] in Vowels) then
-{$ENDIF}
begin
Result := Copy(Result, 1, i - 3) + 'y';
end
else If (i > 3) and (Copy(Result, i - 1, 2) = 'es') and
-{$IFDEF D12+}
- (CharInSet(Result[i - 2], SpChars)) then
-{$ELSE}
(Result[i - 2] in SpChars) then
-{$ENDIF}
begin
- if (Result[i - 2] = 'h') and
-{$IFDEF D12+}
- not (CharInSet(Result[i - 3], ['c', 's'])) then
-{$ELSE}
- not (Result[i - 3] in ['c', 's']) then
-{$ENDIF}
-
+ if (Result[i - 2] = 'h') and not (Result[i - 3] in ['c', 's']) then
begin
//not ch or sh
Result := Copy(Result, 1, i - 1);
@@ -5780,11 +5761,7 @@
Reader.SkipSpace;
Reader.ReadToken;
Reader.SkipSpace;
-{$IFDEF D12+}
- Result := CharInSet(Reader.NextChar, [':', '=']);
-{$ELSE}
Result := Reader.NextChar in [':', '='];
-{$ENDIF}
finally
Reader.Position := SavePos;
end;
@@ -8711,11 +8688,7 @@
if FCode^[I] = #10 then
begin
Inc(I);
-{$IFDEF D12+}
- while CharInSet(FCode^[I], [' ', #9]) do
-{$ELSE}
while FCode^[I] in [' ', #9] do
-{$ENDIF}
begin
Result := Result + FCode^[I];
Inc(I);
Modified: trunk/Source/Core/InstantCommand.pas
===================================================================
--- trunk/Source/Core/InstantCommand.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantCommand.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -1121,12 +1121,7 @@
begin
Token := Reader.ReadToken;
Result := IsConstantToken(Token) or InstantIsNumeric(Token) or
- ((Length(Token) > 0) and
-{$IFDEF D12+}
- (CharInSet(Token[1], ['"', '''', '['])));
-{$ELSE}
- (Token[1] in ['"', '''', '[']));
-{$ENDIF}
+ ((Length(Token) > 0) and (Token[1] in ['"', '''', '[']));
end;
procedure TInstantIQLConstant.InternalClear;
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantMetadata.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -67,7 +67,7 @@
protected
function InternalEquals(const Other: TInstantMetadata): Boolean; virtual;
public
- function Equals(const Other: TInstantMetadata): Boolean; {$IFDEF D12+} reintroduce; {$ENDIF}
+ function Equals(const Other: TInstantMetadata): Boolean;
property Collection: TInstantMetadatas read GetCollection
write SetCollection;
end;
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantPersistence.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -129,8 +129,8 @@
function Dereference(Connector: TInstantConnector = nil;
AOwnsInstance: Boolean = True; Retry: Boolean = False): TInstantObject;
procedure DestroyInstance;
- function Equals(const AObjectClassName, AObjectId: string): Boolean; {$IFDEF D12+}reintroduce;{$ENDIF} overload;
- function Equals(AObject: TInstantObject): Boolean; {$IFDEF D12+}reintroduce;{$ENDIF} overload;
+ function Equals(const AObjectClassName, AObjectId: string): Boolean; overload;
+ function Equals(AObject: TInstantObject): Boolean; overload;
function HasInstance: Boolean;
function HasReference: Boolean;
function IsBroken: Boolean;
@@ -1622,12 +1622,7 @@
begin
Result := True;
for I := 0 to Pred(BufferLength div SizeOf(Char)) do
- if (ValidChars <> []) and not
-{$IFDEF D12+}
- (CharInSet(Buffer[I], ValidChars + [#8, #10, #13]))
-{$ELSE}
- (Buffer[I] in ValidChars + [#8, #10, #13])
-{$ENDIF} then
+ if (ValidChars <> []) and not (Buffer[I] in ValidChars + [#8, #10, #13]) then
begin
Result := False;
InvalidChar := Buffer[I];
Modified: trunk/Source/Core/InstantTextFiler.pas
===================================================================
--- trunk/Source/Core/InstantTextFiler.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantTextFiler.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -236,11 +236,7 @@
function TInstantTextFiler.IsSpace(Ch: Char): Boolean;
begin
-{$IFDEF D12+}
- Result := CharInSet(Ch, [' ', #9, #10, #13]);
-{$ELSE}
Result := Ch in [' ', #9, #10, #13];
-{$ENDIF}
end;
function TInstantTextFiler.IsText(Ch: Char): Boolean;
@@ -248,11 +244,7 @@
Result := ((Ch >= 'a') and (Ch <= 'z'))
or ((Ch >= 'A') and (Ch <= 'Z'))
or ((Ch >= '0') and (Ch <= '9'))
-{$IFDEF D12+}
- or (CharInSet(Ch, ['#', '_']));
-{$ELSE}
or (Ch in ['#', '_']);
-{$ENDIF}
end;
procedure TInstantTextFiler.Reset;
@@ -333,12 +325,7 @@
function TInstantTextReader.IsStringDelimiter(Ch: Char): Boolean;
begin
- Result := ConstAware and
-{$IFDEF D12+}
- (CharInSet(Ch, ['''', '"']));
-{$ELSE}
- (Ch in ['''', '"']);
-{$ENDIF}
+ Result := ConstAware and (Ch in ['''', '"']);
end;
function TInstantTextReader.NextChar: Char;
Modified: trunk/Source/Core/InstantUtils.pas
===================================================================
--- trunk/Source/Core/InstantUtils.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Core/InstantUtils.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -112,11 +112,7 @@
begin
Result := '';
for I := 0 to 255 do
-{$IFDEF D12+}
- if CharInSet(Chr(I), C) then
-{$ELSE}
if Chr(I) in C then
-{$ENDIF}
S := S + Chr(I);
I := 1;
L := Length(S);
@@ -570,7 +566,7 @@
I: Integer;
begin
I := Pos;
- while (I <= Length(Str)) and not {$IFDEF D12+}CharInSet(Str[I], Delimiters){$ELSE}(Str[I] in Delimiters){$ENDIF} do
+ while (I <= Length(Str)) and not (Str[I] in Delimiters) do
Inc(I);
Result := Copy(Str, Pos, I - Pos);
if I <= Length(Str) then
Modified: trunk/Source/Design/D2007/DclIOCore.dpk
===================================================================
--- trunk/Source/Design/D2007/DclIOCore.dpk 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Design/D2007/DclIOCore.dpk 2009-07-12 15:54:33 UTC (rev 810)
@@ -23,8 +23,8 @@
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
-{$DESCRIPTION 'InstantObjects Design-Time Package (Delphi 2009)'}
-{$LIBSUFFIX '_D12'}
+{$DESCRIPTION 'InstantObjects Design-Time Package (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}
{$DEFINE DEBUG}
@@ -53,8 +53,7 @@
InstantReg in '..\InstantReg.pas',
InstantUnitSelect in '..\InstantUnitSelect.pas' {InstantUnitSelectForm},
InstantAttributeEditor in '..\InstantAttributeEditor.pas' {InstantAttributeEditorForm},
- InstantAbout in '..\InstantAbout.pas' {InstantAboutForm},
- InstantModelImport in '..\InstantModelImport.pas' {InstantModelImportForm};
+ InstantAbout in '..\InstantAbout.pas' {InstantAboutForm};
end.
Modified: trunk/Source/Design/D2007/DclIOCore.dproj
===================================================================
--- trunk/Source/Design/D2007/DclIOCore.dproj 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Design/D2007/DclIOCore.dproj 2009-07-12 15:54:33 UTC (rev 810)
@@ -1,166 +1,82 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{9b758a49-d140-45db-8681-01e49660a560}</ProjectGuid>
- <MainSource>DclIOCore.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOCore_D11.bpl</DCC_DependencyCheckOutputName>
- <ProjectVersion>12.0</ProjectVersion>
- <Config Condition="'$(Config)'==''">Debug</Config>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
- <Cfg_1>true</Cfg_1>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
- <Cfg_2>true</Cfg_2>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Base)'!=''">
- <DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\6.0\Bpl\DclIOCore_D12.bpl</DCC_DependencyCheckOutputName>
- <DCC_ImageBase>00400000</DCC_ImageBase>
- <DCC_Description>InstantObjects Design-Time Package (Delphi 2009)</DCC_Description>
- <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
- <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
- <DesignOnlyPackage>true</DesignOnlyPackage>
- <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
- <GenDll>true</GenDll>
- <GenPackage>true</GenPackage>
- <DllSuffix>_D12</DllSuffix>
- <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1)'!=''">
- <Version>7.0</Version>
- <DCC_DebugInformation>False</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
- <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
- <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
- <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2)'!=''">
- <Version>7.0</Version>
- <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
- <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
- </PropertyGroup>
- <ProjectExtensions>
- <Borland.Personality>Delphi.Personality.12</Borland.Personality>
- <Borland.ProjectType>Package</Borland.ProjectType>
- <BorlandProject>
- <Delphi.Personality>
- <Compiler>
- <Compiler Name="UsePackages">False</Compiler>
- <Compiler Name="Packages"/>
- </Compiler>
- <Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">2</VersionInfo>
- <VersionInfo Name="MinorVer">1</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1040</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"/>
- <VersionInfoKeys Name="LegalCopyright"/>
- <VersionInfoKeys Name="LegalTrademarks"/>
- <VersionInfoKeys Name="OriginalFilename"/>
- <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"/>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">DclIOCore.dpk</Source>
- </Source>
- </Delphi.Personality>
- <ModelSupport>False</ModelSupport>
- </BorlandProject>
- <ProjectFileVersion>12</ProjectFileVersion>
- </ProjectExtensions>
- <ItemGroup>
- <DelphiCompile Include="DclIOCore.dpk">
- <MainSource>MainSource</MainSource>
- </DelphiCompile>
- <DCCReference Include="..\..\Core\InstantPresentation.dcr"/>
- <DCCReference Include="designide.dcp"/>
- <DCCReference Include="vcldb.dcp"/>
- <DCCReference Include="rtl.dcp"/>
- <DCCReference Include="vcl.dcp"/>
- <DCCReference Include="dbrtl.dcp"/>
- <DCCReference Include="IOCore.dcp"/>
- <DCCReference Include="..\InstantWizard.pas"/>
- <DCCReference Include="..\InstantClassEditor.pas">
- <Form>InstantClassEditorForm</Form>
- <DesignClass>TIOBaseForm</DesignClass>
- </DCCReference>
- <DCCReference Include="..\InstantCommandEditor.pas">
- <Form>InstantCommandEditorForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantDesignResources.pas">
- <Form>InstantDesignResourceModule</Form>
- <DesignClass>TDataModule</DesignClass>
- </DCCReference>
- <DCCReference Include="..\InstantDesignTools.pas"/>
- <DCCReference Include="..\InstantDesignUtils.pas"/>
- <DCCReference Include="..\InstantDialog.pas">
- <Form>InstantDialogForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantDualList.pas">
- <Form>InstantDualListForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantEdit.pas">
- <Form>InstantEditForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantModelExpert.pas"/>
- <DCCReference Include="..\InstantModelExplorer.pas">
- <Form>InstantModelExplorerForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantOTA.pas"/>
- <DCCReference Include="..\InstantReg.pas"/>
- <DCCReference Include="..\InstantUnitSelect.pas">
- <Form>InstantUnitSelectForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantAttributeEditor.pas">
- <Form>InstantAttributeEditorForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantAbout.pas">
- <Form>InstantAboutForm</Form>
- </DCCReference>
- <DCCReference Include="..\InstantModelImport.pas">
- <Form>InstantModelImportForm</Form>
- </DCCReference>
- <DCCReference Include="..\..\Core\InstantPresentation.dcr"/>
- <BuildConfiguration Include="Base">
- <Key>Base</Key>
- </BuildConfiguration>
- <BuildConfiguration Include="Debug">
- <Key>Cfg_2</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- <BuildConfiguration Include="Release">
- <Key>Cfg_1</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- </ItemGroup>
- <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
- </Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{9b758a49-d140-45db-8681-01e49660a560}</ProjectGuid>
+ <MainSource>DclIOCore.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOCore_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_Define>DEBUG</DCC_Define>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects Design-Time Package (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">True</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">DclIOCore.dpk</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="DclIOCore.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="$(SystemRoot)\system32\dbrtl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\designide.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\IOCore.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\rtl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\vcl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\vcldb.dcp" />
+ <DCCReference Include="..\..\Core\InstantPresentation.dcr" />
+ <DCCReference Include="..\..\Core\InstantPresentation.dcr" />
+ <DCCReference Include="..\InstantAbout.pas">
+ <Form>InstantAboutForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantAttributeEditor.pas">
+ <Form>InstantAttributeEditorForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantClassEditor.pas">
+ <Form>InstantClassEditorForm</Form>
+ <DesignClass>TIOBaseForm</DesignClass>
+ </DCCReference>
+ <DCCReference Include="..\InstantCommandEditor.pas">
+ <Form>InstantCommandEditorForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantDesignResources.pas">
+ <Form>InstantDesignResourceModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="..\InstantDesignTools.pas" />
+ <DCCReference Include="..\InstantDesignUtils.pas" />
+ <DCCReference Include="..\InstantDialog.pas">
+ <Form>InstantDialogForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantDualList.pas">
+ <Form>InstantDualListForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantEdit.pas">
+ <Form>InstantEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantModelExpert.pas" />
+ <DCCReference Include="..\InstantModelExplorer.pas">
+ <Form>InstantModelExplorerForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantOTA.pas" />
+ <DCCReference Include="..\InstantReg.pas" />
+ <DCCReference Include="..\InstantUnitSelect.pas">
+ <Form>InstantUnitSelectForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantWizard.pas" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Source/Design/InstantCommandEditor.pas
===================================================================
--- trunk/Source/Design/InstantCommandEditor.pas 2009-07-09 21:40:48 UTC (rev 809)
+++ trunk/Source/Design/InstantCommandEditor.pas 2009-07-12 15:54:33 UTC (rev 810)
@@ -177,11 +177,7 @@
function IsSpace(Ch: Char): Boolean;
begin
-{$IFDEF D12+}
- Result := CharInSet(Ch, [' ', #9, #10, #13]);
-{$ELSE}
Result := Ch in [' ', #9, #10, #13];
-{$ENDIF}
end;
var
|
