Skip to content

Commit f238a01

Browse files
committed
Declare NoObjectSpaceTransactions in the Base group of all three packages #85
The 12.3 project had lost the define again: cd2b5c4 restored it for #85 and 6a20ebd, the version-stamping commit made the same day, dropped it, so 26.8.1 shipped dclBold290.bpl with a different TBoldSystem interface than the other two packages. The 11.3 and 13 projects still had it, but in the parent "Config==Base" group where Delphi normally writes only the Base marker. All three now declare it in the "'$(Base)'!=''" group. That is where the IDE keeps such settings, it is equivalent for MSBuild, and it is the only form TMS Smart Setup's dproj reader accepts: it rejects a DCC_Define in a parent-condition group with "The condition string ... is not a string we understand". Verified by building the three packages and by a Smart Setup build of the Delphi 13 package, which passes the define to dcc32.
1 parent 6b60f72 commit f238a01

5 files changed

Lines changed: 5 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
3333
- The two ignored `FetchRefetch` tests are rehabilitated and pin the classic `DbFetchOwningMember` path; the suite has no ignored tests (#83)
3434
- Three `TestBoldOclEvaluation` tests assumed the creation order of unsaved objects in a class extent; they sort first
3535
- The Delphi 11.3 design package was built without a version resource: its Debug/Win32 configuration overrode `VerInfo_IncludeVerInfo` to false
36+
- The 26.8.1 Delphi 12.3 package had lost `NoObjectSpaceTransactions` again (the define restored for #85 was dropped by the version-stamping commit the same day); all three packages now declare it in the same project group (#85)
3637

3738
### Changed
3839
- Design packages are named by compiler through `LIBSUFFIX AUTO` (`dclBold280.bpl`, `dclBold290.bpl`, `dclBold370.bpl`); the Delphi 12.1 CE package project is retired (#87)

docs/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
3333
- The two ignored `FetchRefetch` tests are rehabilitated and pin the classic `DbFetchOwningMember` path; the suite has no ignored tests (#83)
3434
- Three `TestBoldOclEvaluation` tests assumed the creation order of unsaved objects in a class extent; they sort first
3535
- The Delphi 11.3 design package was built without a version resource: its Debug/Win32 configuration overrode `VerInfo_IncludeVerInfo` to false
36+
- The 26.8.1 Delphi 12.3 package had lost `NoObjectSpaceTransactions` again (the define restored for #85 was dropped by the version-stamping commit the same day); all three packages now declare it in the same project group (#85)
3637

3738
### Changed
3839
- Design packages are named by compiler through `LIBSUFFIX AUTO` (`dclBold280.bpl`, `dclBold290.bpl`, `dclBold370.bpl`); the Delphi 12.1 CE package project is retired (#87)

packages/Delphi11.3/dclBold.dproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ProjectName Condition="'$(ProjectName)'==''">dclBold</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15-
<DCC_Define>NoObjectSpaceTransactions;$(DCC_Define)</DCC_Define>
1615
<Base>true</Base>
1716
</PropertyGroup>
1817
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
@@ -48,6 +47,7 @@
4847
<Base>true</Base>
4948
</PropertyGroup>
5049
<PropertyGroup Condition="'$(Base)'!=''">
50+
<DCC_Define>NoObjectSpaceTransactions;$(DCC_Define)</DCC_Define>
5151
<DCC_BplOutput>..\Bin</DCC_BplOutput>
5252
<DCC_F>false</DCC_F>
5353
<DCC_S>false</DCC_S>

packages/Delphi12.3/dclBold.dproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<Base>true</Base>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Base)'!=''">
55+
<DCC_Define>NoObjectSpaceTransactions;$(DCC_Define)</DCC_Define>
5556
<DCC_BplOutput>..\Bin</DCC_BplOutput>
5657
<DCC_F>false</DCC_F>
5758
<DCC_S>false</DCC_S>

packages/Delphi13/dclBold.dproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ProjectName Condition="'$(ProjectName)'==''">dclBold</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15-
<DCC_Define>NoObjectSpaceTransactions;$(DCC_Define)</DCC_Define>
1615
<Base>true</Base>
1716
</PropertyGroup>
1817
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
@@ -53,6 +52,7 @@
5352
<Base>true</Base>
5453
</PropertyGroup>
5554
<PropertyGroup Condition="'$(Base)'!=''">
55+
<DCC_Define>NoObjectSpaceTransactions;$(DCC_Define)</DCC_Define>
5656
<DCC_BplOutput>..\Bin</DCC_BplOutput>
5757
<DCC_F>false</DCC_F>
5858
<DCC_S>false</DCC_S>

0 commit comments

Comments
 (0)