Skip to content

Commit fbda20c

Browse files
jkowalskijkowalski
committed
changed build labeling scheme
1 parent 41191bb commit fbda20c

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

‎build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ if (%1)==(sourcearchive) (
195195
)
196196

197197
if (%1)==(label) (
198-
set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /p:BuildLabel=%2
198+
set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /p:BuildLabelOverride=%2
199199
shift
200200
shift
201201
goto next

‎src/Docs/NLog.shfbproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<Framework>.NET Framework 3.5</Framework>
1111
<NLogPath>$(MSBuildProjectDirectory)\..\..\</NLogPath>
1212
<WorkingPath>Working\</WorkingPath>
13-
<BuildLabel Condition="'$(BuildLabel)'==''">CustomBuild</BuildLabel>
13+
<BuildLabel Condition="'$(BuildLabel)'==''"> (PrivateBuild)</BuildLabel>
14+
<BuildLabel Condition="'$(BuildLabel)'=='(none)'"></BuildLabel>
15+
<BuildVersion Condition="'$(BuildVersion)'==''">2.0.0.0</BuildVersion>
1416
<SHFBSchemaVersion>1.8.0.3</SHFBSchemaVersion>
1517
<SHFBROOT>$(MSBuildProjectDirectory)\..\..\Tools\SHFB</SHFBROOT>
1618
<SandcastlePath>$(MSBuildProjectDirectory)\..\..\Tools\Sandcastle</SandcastlePath>
@@ -33,7 +35,7 @@
3335
<DocumentationSource sourceFile="$(NLogBuildPath)\NLog.Extended.dll" xmlns="" />
3436
<DocumentationSource sourceFile="$(NLogBuildPath)\NLog.Extended.xml" xmlns="" />
3537
</DocumentationSources>
36-
<HelpTitle>NLog - Advanced .NET Logging ($(Framework)) $(BuildLabel)</HelpTitle>
38+
<HelpTitle>NLog v$(BuildVersion)$(BuildLabel)</HelpTitle>
3739
<CopyrightText>Copyright %28c%29 2004-2010 by Jaroslaw Kowalski</CopyrightText>
3840
<FeedbackEMailAddress>feedback%40nlog-project.org</FeedbackEMailAddress>
3941
<CopyrightHref>http://nlog-project.org/</CopyrightHref>

‎src/NLog.proj

+11-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33

44
<PropertyGroup>
55
<MajorMinorVersion>2.0</MajorMinorVersion>
6-
<BuildLabel Condition=" '$(BuildLabel)'=='' ">PrivateBuild</BuildLabel>
7-
<BuildLabel Condition=" '$(CCNetLabel)'!='' ">$(CCNetLabel)</BuildLabel>
8-
<BuildVersion>2.0.0.0</BuildVersion>
9-
<BuildProductName>NLog v$(MajorMinorVersion) ($(BuildLabel))</BuildProductName>
6+
<BuildLabel Condition=" '$(BuildLabelOverride)' == '' "> (PrivateBuild)</BuildLabel>
7+
<BuildLabel Condition=" '$(BuildLabelOverride)' == 'NONE' "></BuildLabel>
8+
<BuildLabel Condition=" '$(BuildLabelOverride)' != '' and '$(BuildLabelOverride)' != 'NONE' "> ($(BuildLabelOverride))</BuildLabel>
9+
<BuildLabelDash Condition=" '$(BuildLabelOverride)' == '' ">-PrivateBuild</BuildLabelDash>
10+
<BuildLabelDash Condition=" '$(BuildLabelOverride)' == 'NONE' "></BuildLabelDash>
11+
<BuildLabelDash Condition=" '$(BuildLabelOverride)' != '' and '$(BuildLabelOverride)' != 'NONE' ">-$(BuildLabelOverride)</BuildLabelDash>
12+
<BuildVersion Condition=" '$(BuildVersion)' == '' " >2.0.0.0</BuildVersion>
13+
<BuildVersion Condition=" '$(CCNetLabel)'!='' ">$(CCNetLabel)</BuildVersion>
14+
<BuildProductName>NLog v$(BuildVersion)$(BuildLabel)</BuildProductName>
1015
</PropertyGroup>
1116

1217
<PropertyGroup>
@@ -519,7 +524,7 @@
519524

520525
<Target Name="Installer">
521526
<PropertyGroup>
522-
<CommonInstallerProperties>Configuration=$(Configuration);BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonInstallerProperties>
527+
<CommonInstallerProperties>Configuration=$(Configuration);BuildLabelDash=$(BuildLabelDash);BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonInstallerProperties>
523528
</PropertyGroup>
524529
<MSBuild Projects="..\tools\Installer\Installer.wixproj" Properties="Flavor=NetFx;$(CommonInstallerProperties)" />
525530
<MSBuild Projects="..\tools\Installer\Installer.wixproj" Properties="Flavor=SL;$(CommonInstallerProperties)" />
@@ -611,7 +616,7 @@
611616
<Target Name="BeforeArchive">
612617
<PropertyGroup>
613618
<ArchiveSuffix></ArchiveSuffix>
614-
<ArchiveSuffix Condition=" '$(BuildLabel)' != '' ">-$(BuildLabel)</ArchiveSuffix>
619+
<ArchiveSuffix Condition=" '$(BuildLabelDash)' != '' ">$(BuildLabelDash)</ArchiveSuffix>
615620
</PropertyGroup>
616621
<MakeDir Directories="$(ArchiveOutputPath)" />
617622
</Target>

‎tools/Installer/Installer.wixproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<ProjectGuid>{4667dc1d-0462-4ccc-a210-0490331e09b4}</ProjectGuid>
77
<SchemaVersion>2.0</SchemaVersion>
88
<OutputType>Package</OutputType>
9-
<BuildVersion Condition="'$(BuildVersion)'==''">0.0.0.0</BuildVersion>
10-
<BuildLabel Condition="'$(BuildLabel)'==''">PrivateBuild</BuildLabel>
9+
<BuildVersion Condition="'$(BuildVersion)'==''">2.0.0.0</BuildVersion>
10+
<BuildLabel Condition="'$(BuildLabel)'==''"> (PrivateBuild)</BuildLabel>
1111
<NLogBuildPath Condition="'$(NLogBuildPath)'==''">$(MSBuildProjectDirectory)\..\..\build\bin\$(Configuration)</NLogBuildPath>
12-
<BaseOutputName>NLog2</BaseOutputName>
12+
<BaseOutputName>NLog</BaseOutputName>
1313
<WixBasePath>..\Wix</WixBasePath>
1414
<WixToolPath>$(WixBasePath)</WixToolPath>
1515
<WixTargetsPath>$(WixBasePath)\Wix.targets</WixTargetsPath>
@@ -72,7 +72,7 @@
7272
<OutputName>$(BaseOutputName)-All</OutputName>
7373
</PropertyGroup>
7474
<PropertyGroup>
75-
<OutputName Condition=" '$(BuildLabel)' != '' ">$(OutputName)-$(BuildLabel)</OutputName>
75+
<OutputName>$(OutputName)-v$(BuildVersion)$(BuildLabelDash)</OutputName>
7676
<OutputName Condition=" '$(Configuration)' == 'Debug' ">$(OutputName)-Debug</OutputName>
7777
</PropertyGroup>
7878
<ItemGroup>

‎tools/Installer/NLog.tt

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ var supportedFrameworks = new []
141141

142142
#><Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
143143
<Product Id="$(var.ProductId)"
144-
Name="$(var.ProductName) $(var.BuildLabel)"
144+
Name="$(var.ProductName) v$(var.BuildVersion)$(var.BuildLabel)"
145145
Language="1033"
146146
Version="$(var.BuildVersion)"
147147
Manufacturer="NLog Project"
@@ -223,7 +223,7 @@ foreach (var vs in visualStudioVersions) {
223223
<Directory Id="TARGETDIR" Name="SourceDir">
224224

225225
<Directory Id="ProgramMenuFolder">
226-
<Directory Id="ApplicationProgramsFolder" Name="NLog $(var.BuildLabel)" />
226+
<Directory Id="ApplicationProgramsFolder" Name="NLog v$(var.BuildVersion)$(var.BuildLabel)" />
227227
</Directory>
228228

229229
<Directory Id="ProgramFilesFolder">
@@ -315,7 +315,7 @@ foreach (var vs in visualStudioVersions) {
315315
<Shortcut Id="Help_Shortcut"
316316
Directory="ApplicationProgramsFolder"
317317
Name="NLog Documentation"
318-
Description="Documentation for NLog $(var.BuildLabel)"
318+
Description="Documentation for NLog v$(var.BuildVersion)$(var.BuildLabel)"
319319
Icon="Help.ico"
320320
Advertise="yes">
321321
</Shortcut>

‎tools/Installer/NLog.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
22
<Product Id="$(var.ProductId)"
3-
Name="$(var.ProductName) $(var.BuildLabel)"
3+
Name="$(var.ProductName) v$(var.BuildVersion)$(var.BuildLabel)"
44
Language="1033"
55
Version="$(var.BuildVersion)"
66
Manufacturer="NLog Project"
@@ -96,7 +96,7 @@
9696
<Directory Id="TARGETDIR" Name="SourceDir">
9797

9898
<Directory Id="ProgramMenuFolder">
99-
<Directory Id="ApplicationProgramsFolder" Name="NLog $(var.BuildLabel)" />
99+
<Directory Id="ApplicationProgramsFolder" Name="NLog v$(var.BuildVersion)$(var.BuildLabel)" />
100100
</Directory>
101101

102102
<Directory Id="ProgramFilesFolder">
@@ -298,7 +298,7 @@
298298
<Shortcut Id="Help_Shortcut"
299299
Directory="ApplicationProgramsFolder"
300300
Name="NLog Documentation"
301-
Description="Documentation for NLog $(var.BuildLabel)"
301+
Description="Documentation for NLog v$(var.BuildVersion)$(var.BuildLabel)"
302302
Icon="Help.ico"
303303
Advertise="yes">
304304
</Shortcut>

0 commit comments

Comments
 (0)