changed build labeling scheme

anaisbetts · Jul 6, 2011 · fbda20c · fbda20c
1 parent 41191bb
commit fbda20c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/build.cmd b/build.cmd
@@ -195,7 +195,7 @@ if (%1)==(sourcearchive) (
 )
 
 if (%1)==(label) (
-	set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /p:BuildLabel=%2
+	set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /p:BuildLabelOverride=%2
 	shift
 	shift
 	goto next

diff --git a/src/Docs/NLog.shfbproj b/src/Docs/NLog.shfbproj
@@ -10,7 +10,9 @@
     <Framework>.NET Framework 3.5</Framework>
     <NLogPath>$(MSBuildProjectDirectory)\..\..\</NLogPath>
     <WorkingPath>Working\</WorkingPath>
-    <BuildLabel Condition="'$(BuildLabel)'==''">CustomBuild</BuildLabel>
+    <BuildLabel Condition="'$(BuildLabel)'==''"> (PrivateBuild)</BuildLabel>
+    <BuildLabel Condition="'$(BuildLabel)'=='(none)'"></BuildLabel>
+    <BuildVersion Condition="'$(BuildVersion)'==''">2.0.0.0</BuildVersion>
     <SHFBSchemaVersion>1.8.0.3</SHFBSchemaVersion>
     <SHFBROOT>$(MSBuildProjectDirectory)\..\..\Tools\SHFB</SHFBROOT>
     <SandcastlePath>$(MSBuildProjectDirectory)\..\..\Tools\Sandcastle</SandcastlePath>
@@ -33,7 +35,7 @@
       <DocumentationSource sourceFile="$(NLogBuildPath)\NLog.Extended.dll" xmlns="" />
       <DocumentationSource sourceFile="$(NLogBuildPath)\NLog.Extended.xml" xmlns="" />
     </DocumentationSources>
-    <HelpTitle>NLog - Advanced .NET Logging ($(Framework)) $(BuildLabel)</HelpTitle>
+    <HelpTitle>NLog v$(BuildVersion)$(BuildLabel)</HelpTitle>
     <CopyrightText>Copyright %28c%29 2004-2010 by Jaroslaw Kowalski</CopyrightText>
     <FeedbackEMailAddress>feedback%40nlog-project.org</FeedbackEMailAddress>
     <CopyrightHref>http://nlog-project.org/</CopyrightHref>

diff --git a/src/NLog.proj b/src/NLog.proj
@@ -3,10 +3,15 @@
 
   <PropertyGroup>
     <MajorMinorVersion>2.0</MajorMinorVersion>
-    <BuildLabel Condition=" '$(BuildLabel)'=='' ">PrivateBuild</BuildLabel>
-    <BuildLabel Condition=" '$(CCNetLabel)'!='' ">$(CCNetLabel)</BuildLabel>
-    <BuildVersion>2.0.0.0</BuildVersion>
-    <BuildProductName>NLog v$(MajorMinorVersion) ($(BuildLabel))</BuildProductName>
+    <BuildLabel Condition=" '$(BuildLabelOverride)' == '' "> (PrivateBuild)</BuildLabel>
+    <BuildLabel Condition=" '$(BuildLabelOverride)' == 'NONE' "></BuildLabel>
+    <BuildLabel Condition=" '$(BuildLabelOverride)' != '' and '$(BuildLabelOverride)' != 'NONE' "> ($(BuildLabelOverride))</BuildLabel>
+    <BuildLabelDash Condition=" '$(BuildLabelOverride)' == '' ">-PrivateBuild</BuildLabelDash>
+    <BuildLabelDash Condition=" '$(BuildLabelOverride)' == 'NONE' "></BuildLabelDash>
+    <BuildLabelDash Condition=" '$(BuildLabelOverride)' != '' and '$(BuildLabelOverride)' != 'NONE' ">-$(BuildLabelOverride)</BuildLabelDash>
+    <BuildVersion Condition=" '$(BuildVersion)' == '' " >2.0.0.0</BuildVersion>
+    <BuildVersion Condition=" '$(CCNetLabel)'!='' ">$(CCNetLabel)</BuildVersion>
+    <BuildProductName>NLog v$(BuildVersion)$(BuildLabel)</BuildProductName>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -519,7 +524,7 @@
 
   <Target Name="Installer">
      <PropertyGroup>
-       <CommonInstallerProperties>Configuration=$(Configuration);BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonInstallerProperties>
+       <CommonInstallerProperties>Configuration=$(Configuration);BuildLabelDash=$(BuildLabelDash);BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonInstallerProperties>
      </PropertyGroup>
      <MSBuild Projects="..\tools\Installer\Installer.wixproj" Properties="Flavor=NetFx;$(CommonInstallerProperties)" />
      <MSBuild Projects="..\tools\Installer\Installer.wixproj" Properties="Flavor=SL;$(CommonInstallerProperties)" />
@@ -611,7 +616,7 @@
   <Target Name="BeforeArchive">
     <PropertyGroup>
       <ArchiveSuffix></ArchiveSuffix>
-      <ArchiveSuffix Condition=" '$(BuildLabel)' != '' ">-$(BuildLabel)</ArchiveSuffix>
+      <ArchiveSuffix Condition=" '$(BuildLabelDash)' != '' ">$(BuildLabelDash)</ArchiveSuffix>
     </PropertyGroup>
     <MakeDir Directories="$(ArchiveOutputPath)" />
   </Target>

diff --git a/tools/Installer/Installer.wixproj b/tools/Installer/Installer.wixproj
@@ -6,10 +6,10 @@
     <ProjectGuid>{4667dc1d-0462-4ccc-a210-0490331e09b4}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Package</OutputType>
-    <BuildVersion Condition="'$(BuildVersion)'==''">0.0.0.0</BuildVersion>
-    <BuildLabel Condition="'$(BuildLabel)'==''">PrivateBuild</BuildLabel>
+    <BuildVersion Condition="'$(BuildVersion)'==''">2.0.0.0</BuildVersion>
+    <BuildLabel Condition="'$(BuildLabel)'==''"> (PrivateBuild)</BuildLabel>
     <NLogBuildPath Condition="'$(NLogBuildPath)'==''">$(MSBuildProjectDirectory)\..\..\build\bin\$(Configuration)</NLogBuildPath>
-    <BaseOutputName>NLog2</BaseOutputName>
+    <BaseOutputName>NLog</BaseOutputName>
     <WixBasePath>..\Wix</WixBasePath>
     <WixToolPath>$(WixBasePath)</WixToolPath>
     <WixTargetsPath>$(WixBasePath)\Wix.targets</WixTargetsPath>
@@ -72,7 +72,7 @@
     <OutputName>$(BaseOutputName)-All</OutputName>
   </PropertyGroup>
   <PropertyGroup>
-     <OutputName Condition=" '$(BuildLabel)' != '' ">$(OutputName)-$(BuildLabel)</OutputName>
+     <OutputName>$(OutputName)-v$(BuildVersion)$(BuildLabelDash)</OutputName>
      <OutputName Condition=" '$(Configuration)' == 'Debug' ">$(OutputName)-Debug</OutputName>
   </PropertyGroup>
   <ItemGroup>

diff --git a/tools/Installer/NLog.tt b/tools/Installer/NLog.tt
@@ -141,7 +141,7 @@ var supportedFrameworks = new []
 
 #><Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product Id="$(var.ProductId)"
-           Name="$(var.ProductName) $(var.BuildLabel)"
+           Name="$(var.ProductName) v$(var.BuildVersion)$(var.BuildLabel)"
            Language="1033"
            Version="$(var.BuildVersion)"
            Manufacturer="NLog Project"
@@ -223,7 +223,7 @@ foreach (var vs in visualStudioVersions) {
     <Directory Id="TARGETDIR" Name="SourceDir">
 
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="NLog $(var.BuildLabel)" />
+        <Directory Id="ApplicationProgramsFolder" Name="NLog v$(var.BuildVersion)$(var.BuildLabel)" />
       </Directory>
 
       <Directory Id="ProgramFilesFolder">
@@ -315,7 +315,7 @@ foreach (var vs in visualStudioVersions) {
         <Shortcut Id="Help_Shortcut"
                   Directory="ApplicationProgramsFolder"
                   Name="NLog Documentation"
-                  Description="Documentation for NLog $(var.BuildLabel)"
+                  Description="Documentation for NLog v$(var.BuildVersion)$(var.BuildLabel)"
                   Icon="Help.ico"
                   Advertise="yes">
         </Shortcut>

diff --git a/tools/Installer/NLog.wxs b/tools/Installer/NLog.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product Id="$(var.ProductId)"
-           Name="$(var.ProductName) $(var.BuildLabel)"
+           Name="$(var.ProductName) v$(var.BuildVersion)$(var.BuildLabel)"
            Language="1033"
            Version="$(var.BuildVersion)"
            Manufacturer="NLog Project"
@@ -96,7 +96,7 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
 
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="NLog $(var.BuildLabel)" />
+        <Directory Id="ApplicationProgramsFolder" Name="NLog v$(var.BuildVersion)$(var.BuildLabel)" />
       </Directory>
 
       <Directory Id="ProgramFilesFolder">
@@ -298,7 +298,7 @@
         <Shortcut Id="Help_Shortcut"
                   Directory="ApplicationProgramsFolder"
                   Name="NLog Documentation"
-                  Description="Documentation for NLog $(var.BuildLabel)"
+                  Description="Documentation for NLog v$(var.BuildVersion)$(var.BuildLabel)"
                   Icon="Help.ico"
                   Advertise="yes">
         </Shortcut>