[ros-diffs] [cwittich] 41194: -don't build an installer for debug builds -redesign auto versioning: increase "Revision" on every build, increase "Build Number" on every release build to make sure the MSI installer upgrade will work

Author: cwittich
Date: Fri May 29 13:15:56 2009
New Revision: 41194

URL: http://svn.reactos.org/svn/reactos?rev=41194&view=rev
Log:
-don't build an installer for debug builds
-redesign auto versioning: increase "Revision" on every build, increase
"Build Number" on every release build to make sure the MSI installer upgrade
will work

Modified:
    trunk/tools/reactosdbg/ReactosDBG.sln
    trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs
    trunk/tools/reactosdbg/buildhelper/Program.cs
    trunk/tools/reactosdbg/buildhelper/buildhelper.csproj

Modified: trunk/tools/reactosdbg/ReactosDBG.sln
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/ReactosDBG.sln?re…
==============================================================================
--- trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] Fri May 29 13:15:56 2009
@@ -35,7 +35,8 @@
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.ActiveCfg = Debug|x86
+		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.Build.0 = Debug|x86
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
@@ -46,7 +47,8 @@
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.ActiveCfg = Debug|x86
+		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.Build.0 = Debug|x86
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
@@ -57,7 +59,8 @@
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.ActiveCfg = Debug|x86
+		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.Build.0 = Debug|x86
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
@@ -68,7 +71,8 @@
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.ActiveCfg = Debug|x86
+		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.Build.0 = Debug|x86
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
@@ -79,7 +83,6 @@
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.ActiveCfg = Debug|x86
-		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.Build.0 = Debug|x86
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Any CPU.ActiveCfg = Release|x86
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -89,7 +92,8 @@
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|x86
+		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.Build.0 = Debug|x86
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
@@ -100,12 +104,14 @@
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|x86.ActiveCfg = Debug|x86
+		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|x86.Build.0 = Debug|x86
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Mixed Platforms.ActiveCfg = Release|Any
CPU
 		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Mixed Platforms.Build.0 = Release|Any
CPU
-		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.ActiveCfg = Release|Any CPU
+		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.ActiveCfg = Release|x86
+		{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties…
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Fri May 29
13:15:56 2009
@@ -32,5 +32,12 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.1204")]
-[assembly: AssemblyFileVersion("1.0.5.1204")]
+
+
+// WARNING: Build numbers are increased automatically!
+// On debug build only Revision will be increased, on release build the Build Number
+// will be increased as well. MSI installers must not be generated with the same Build
Number
+// otherwise they won't upgrade the old installation!
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Modified: trunk/tools/reactosdbg/buildhelper/Program.cs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/Progr…
==============================================================================
--- trunk/tools/reactosdbg/buildhelper/Program.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/buildhelper/Program.cs [iso-8859-1] Fri May 29 13:15:56 2009
@@ -32,10 +32,20 @@
                     StreamReader reader = File.OpenText(infoPath);
                     string contents = reader.ReadToEnd();
                     reader.Close();
-                    Regex version = new Regex((a)"(\d+\.\d+\.)(\d+)(\.\d+)")d+)");
+                    Regex version = new Regex((a)"(\d+\.\d+\.)(\d+)(\.)(\d+)")d+)");
                     Match versionMatch = version.Match(contents);
                     string oldVersion = versionMatch.Value;
-                    string newVersion = versionMatch.Groups[1].Value +
(Convert.ToUInt32(versionMatch.Groups[2].Value) + 1).ToString() + "." +
DateTime.Now.ToString("mss");
+#if DEBUG
+                    string newVersion = versionMatch.Groups[1].Value +
+                        versionMatch.Groups[2].Value +
+                        versionMatch.Groups[3].Value +
+                        (Convert.ToUInt32(versionMatch.Groups[4].Value) + 1).ToString();
+#else
+                    string newVersion = versionMatch.Groups[1].Value + 
+                        (Convert.ToUInt32(versionMatch.Groups[2].Value) + 1).ToString()
+
+                        versionMatch.Groups[3].Value +
+                        (Convert.ToUInt32(versionMatch.Groups[4].Value) + 1).ToString();
+#endif
                     contents = contents.Replace(oldVersion, newVersion);
                     StreamWriter writer = File.CreateText(infoPath);
                     writer.Write(contents);

Modified: trunk/tools/reactosdbg/buildhelper/buildhelper.csproj
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/build…
==============================================================================
--- trunk/tools/reactosdbg/buildhelper/buildhelper.csproj [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/buildhelper/buildhelper.csproj [iso-8859-1] Fri May 29 13:15:56
2009
@@ -31,6 +31,22 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">