Merge branch 'gitUpdateAssemblyInfo4'

icsharpcode · Aug 27, 2010 · 6eceaaa · 6eceaaa
2 parents ac4922f + b27c4aa
commit 6eceaaa
Show file tree

Hide file tree

Showing 26 changed files with 1,211 additions and 811 deletions.
diff --git a/doc/ChangeLog.template.html b/doc/ChangeLog.template.html
diff --git a/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml b/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml
@@ -74,9 +74,7 @@
 				Grid.Row="2"
 				Padding="4,0,4,0"
 				TextWrapping="WrapWithOverflow">
-				Copyright ©<Run Name="copyrightYearRange"/>
-				<Hyperlink
-					NavigateUri="mailto:webmaster@icsharpcode.net">IC#SharpCode</Hyperlink>
+				Copyright ©<Run Name="copyrightText"/>
 				<Run Text="  "/>
 				<Run
 					Text="{x:Static gui:AboutSharpDevelopTabPage.LicenseSentence}" />

diff --git a/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml.cs b/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml.cs
@@ -11,6 +11,7 @@
 using System.Windows.Controls;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.StartPage
 {
@@ -27,8 +28,8 @@ public StartPageControl()
 			List<BoxEntry> entries = items.ConvertAll(control => new BoxEntry { Control = control } );
 			startPageItems.ItemsSource = entries;
 
-			var aca = (AssemblyCopyrightAttribute)typeof(StartPageControl).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
-			copyrightYearRange.Text = aca.Copyright.Substring(0, 9);
+			var aca = (AssemblyCopyrightAttribute)typeof(CommonAboutDialog).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
+			copyrightText.Text = aca.Copyright;
 		}
 
 		sealed class BoxEntry

diff --git a/src/Automated.proj b/src/Automated.proj
@@ -11,7 +11,7 @@
 		<SharpDevelopSrc>$(ProjectDir)\src</SharpDevelopSrc>
 		<SharpDevelopBin>$(ProjectDir)\bin</SharpDevelopBin>
 		<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\Tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
-		<ArtefactPrefix>SharpDevelop_4.0.0.</ArtefactPrefix>
+		<ArtefactPrefix>SharpDevelop_</ArtefactPrefix>
 		<NUnitToolPath>$(MSBuildProjectDirectory)\Tools\NUnit</NUnitToolPath>
 		<NUnitTempToolPath>$(SharpDevelopBin)\Tools\x86NUnit</NUnitTempToolPath>
 		<ProfilerSrc>$(SharpDevelopSrc)\AddIns\Misc\Profiler</ProfilerSrc>
@@ -57,13 +57,11 @@
 		         Targets="PrepareRelease"
 		         Properties="Configuration=Release"/>
 
-		<!-- read content of REVISION into $(BuildNumer) -->
-		<ReadLinesFromFile File="$(ProjectDir)\REVISION">
-			<Output TaskParameter="Lines" ItemName="REVISIONLines"/>
-		</ReadLinesFromFile>
-		<CreateProperty Value="@(REVISIONLines)">
-			<Output TaskParameter="Value" PropertyName="BuildNumber"/>
-		</CreateProperty>
+		<!-- read content of REVISION into $(BuildNumber) -->
+		<XmlRead XPath="/versionInfo/version"
+		         XmlFileName="$(ProjectDir)\REVISION">
+			<Output TaskParameter="Value" PropertyName="BuildNumber" />
+		</XmlRead>
 		<Message Importance="high" Text="BuildNumber=$(BuildNumber)"/>
 
 		<Copy SourceFiles="$(ProjectDir)\REVISION"
@@ -122,9 +120,6 @@
 	</Target>
 
 	<Target Name="createsetup">
-		<Exec WorkingDirectory="$(SharpDevelopSrc)\Tools\UpdateSetupInfo\bin\"
-		      Command="UpdateSetupInfo.exe"/>
-
 		<Exec WorkingDirectory="$(SharpDevelopSrc)\Setup"
 		      Command="$(MSBuildExecutable) SharpDevelop.Setup.sln $(BuildProperties)"/>
 

diff --git a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
@@ -26,7 +26,7 @@
 
 		<!-- The copyright label -->
 		<System.Windows.Forms.Label>
-			<Text    value = "(c) 2000-2010 by icsharpcode.net"/>
+			<Name     value = "copyrightLabel"/>
 			<Width   value = "400"/>
 			<Height  value = "20"/>
 			<Location value = "{X=8, Y=234}"/>

diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs
@@ -7,8 +7,9 @@
 
 using System;
 using System.Drawing;
+using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
-
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop.Gui.XmlForms;
 
@@ -132,6 +133,8 @@ public class CommonAboutDialog : XmlForm
 		public CommonAboutDialog()
 		{
 			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.CommonAboutDialog.xfrm"));
+			var aca = (AssemblyCopyrightAttribute)typeof(CommonAboutDialog).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
+			ControlDictionary["copyrightLabel"].Text = "Copyright " + aca.Copyright;
 		}
 
 		protected override void SetupXmlLoader()

diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj
@@ -140,4 +140,8 @@
   <PropertyGroup>
     <PreBuildEvent>..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe</PreBuildEvent>
   </PropertyGroup>
+  <Target Name="BeforeBuild">
+	<MSBuild Projects="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug"/>
+	<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\bin\Debug" Command="UpdateAssemblyInfo.exe" />
+  </Target>
 </Project>
diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template
@@ -20,7 +20,7 @@ using System.Reflection;
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: AssemblyCompany("ic#code")]
 [assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
+[assembly: AssemblyCopyright("2000-$INSERTYEAR$ AlphaSierraPapa for the SharpDevelop Team")]
 [assembly: AssemblyVersion(RevisionClass.FullVersion)]
 [assembly: NeutralResourcesLanguage("en-US")]
 
@@ -29,7 +29,7 @@ internal static class RevisionClass
 	public const string Major = "4";
 	public const string Minor = "0";
 	public const string Build = "0";
-	public const string Revision = "-INSERTREVISION-";
+	public const string Revision = "$INSERTREVISION$";
 
 	public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
@@ -442,6 +442,7 @@
 						<Directory Id="DocFolder" Name="doc">
 							<Component Guid="9DCED5AC-B771-4A4F-B4FE-69867BF2EBDE" Id="SharpDevelopDocFiles" DiskId="1">
 								<File Source="..\..\doc\BuiltWithSharpDevelop.png" Id="BuiltWithSharpDevelop.png" Name="BuiltWithSharpDevelop.png" />
+								<File Source="..\..\doc\ChangeLog.html" Id="ChangeLog.html" Name="ChangeLog.html" />
 								<File Source="..\..\doc\copyright.txt" Id="copyright.txt" Name="copyright.txt" />
 								<File Source="..\..\doc\license.txt" Name="license.txt" Id="DocFolderLicense.txt" />
 								<File Source="..\..\doc\readme.rtf" Name="readme.rtf" Id="readme.rtf" />

diff --git a/src/Setup/SharpDevelop.Setup.wixproj.user b/src/Setup/SharpDevelop.Setup.wixproj.user
diff --git a/src/Setup/SharpDevelop.Setup.wixproj.user.template b/src/Setup/SharpDevelop.Setup.wixproj.user.template
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <SetupProductBuildVersion>$INSERTPRODUCTBUILDVERSION$</SetupProductBuildVersion>
+    <SetupProductBuildVersion>$INSERTREVISION$</SetupProductBuildVersion>
     <DefineConstants>PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/src/Setup/buildSetup.bat b/src/Setup/buildSetup.bat
@@ -1,4 +1,4 @@
 del "bin\SharpDevelop.msi"
-"..\Tools\UpdateSetupInfo\bin\UpdateSetupInfo.exe"
+"..\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe"
 %windir%\microsoft.net\framework\v4.0.30319\msbuild SharpDevelop.Setup.sln "/p:SharpDevelopBinPath=%CD%\..\..\bin"
 @IF %ERRORLEVEL% NEQ 0 PAUSE
diff --git a/src/Tools/SVNChangeLogToXml/Main.cs b/src/Tools/SVNChangeLogToXml/Main.cs
diff --git a/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj b/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj
diff --git a/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj.user b/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj.user
diff --git a/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.sln b/src/Tools/SVNChangeLogToXml/SVNChangelogToXml.sln