Author: ankit
Date: 2007-08-22 16:16:48 -0400 (Wed, 22 Aug 2007)
New Revision: 84659
Modified:
trunk/monodevelop/Extras/CSharpBinding/CSharpBindingCompilerManager.cs
trunk/monodevelop/Extras/CSharpBinding/ChangeLog
trunk/monodevelop/Extras/VBNetBinding/ChangeLog
trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildProjectServiceExtension.cs
Log:
In Extras/CSharpBinding:
* CSharpBindingCompilerManager.cs (GetResourceId): Set the resource id
correctly even if resgen is not required.
In Extras/VBNetBinding:
* VBBindingCompilerServices.cs (GetResourceId): Generate .resources
with resgen only if required. Set resource id even if resgen is not
required.
In Extras/prj2make-sharp-lib:
* MSBuildProjectServiceExtension.cs (GenerateXamlPartialClass): Generate
partial classes with xamlg only if required.
Modified: trunk/monodevelop/Extras/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/CSharpBindingCompilerManager.cs
2007-08-22 20:16:27 UTC (rev 84658)
+++ trunk/monodevelop/Extras/CSharpBinding/CSharpBindingCompilerManager.cs
2007-08-22 20:16:48 UTC (rev 84659)
@@ -227,8 +227,10 @@
//Check whether resgen required
FileInfo finfo_resx = new FileInfo (fname);
FileInfo finfo_resources = new FileInfo
(Path.ChangeExtension (fname, ".resources"));
- if (finfo_resx.LastWriteTime <
finfo_resources.LastWriteTime)
+ if (finfo_resx.LastWriteTime <
finfo_resources.LastWriteTime) {
+ fname = Path.ChangeExtension (fname,
".resources");
return null;
+ }
using (StringWriter sw = new StringWriter ()) {
Console.WriteLine ("Compiling resources\n{0}$
{1} /compile {2}", Path.GetDirectoryName (fname), resgen, fname);
Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-08-22 20:16:27 UTC
(rev 84658)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-08-22 20:16:48 UTC
(rev 84659)
@@ -1,5 +1,10 @@
2007-08-23 Ankit Jain <[EMAIL PROTECTED]>
+ * CSharpBindingCompilerManager.cs (GetResourceId): Set the resource id
+ correctly even if resgen is not required.
+
+2007-08-23 Ankit Jain <[EMAIL PROTECTED]>
+
Fix bug #82533.
* CSharpBindingCompilerManager.cs (GetResourceId): Generate .resources
with resgen only if required.
Modified: trunk/monodevelop/Extras/VBNetBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2007-08-22 20:16:27 UTC
(rev 84658)
+++ trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2007-08-22 20:16:48 UTC
(rev 84659)
@@ -1,4 +1,9 @@
2007-08-23 Ankit Jain <[EMAIL PROTECTED]>
+
+ * VBBindingCompilerServices.cs (GetResourceId): Generate .resources
+ with resgen only if required. Set resource id even if resgen is not
required.
+
+2007-08-23 Ankit Jain <[EMAIL PROTECTED]>
Andrés G. Aragoneses <[EMAIL PROTECTED]>
* VBBindingCompilerServices.cs (GetResourceId): Use MONO_IOMAP=drive and
Modified: trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2007-08-22 20:16:27 UTC (rev 84658)
+++ trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2007-08-22 20:16:48 UTC (rev 84659)
@@ -211,6 +211,14 @@
if (String.Compare (Path.GetExtension (fname), ".resx",
true) != 0)
return resourceId;
+ //Check whether resgen required
+ FileInfo finfo_resx = new FileInfo (fname);
+ FileInfo finfo_resources = new FileInfo
(Path.ChangeExtension (fname, ".resources"));
+ if (finfo_resx.LastWriteTime <
finfo_resources.LastWriteTime) {
+ fname = Path.ChangeExtension (fname,
".resources");
+ return null;
+ }
+
using (StringWriter sw = new StringWriter ()) {
Console.WriteLine ("Compiling resources\n{0}$
{1} /compile {2}", Path.GetDirectoryName (fname), resgen, fname);
monitor.Log.WriteLine (GettextCatalog.GetString
(
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-08-22
20:16:27 UTC (rev 84658)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-08-22
20:16:48 UTC (rev 84659)
@@ -1,3 +1,8 @@
+2007-08-23 Ankit Jain <[EMAIL PROTECTED]>
+
+ * MSBuildProjectServiceExtension.cs (GenerateXamlPartialClass): Generate
+ partial classes with xamlg only if required.
+
2007-08-22 Ankit Jain <[EMAIL PROTECTED]>
Fix bug #82517.
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildProjectServiceExtension.cs
===================================================================
---
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildProjectServiceExtension.cs
2007-08-22 20:16:27 UTC (rev 84658)
+++
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildProjectServiceExtension.cs
2007-08-22 20:16:48 UTC (rev 84659)
@@ -74,6 +74,13 @@
CompilerError GenerateXamlPartialClass (string fname, out
string generated_file_name, IProgressMonitor monitor)
{
generated_file_name = fname + ".g.cs";
+
+ //Check whether resgen required
+ FileInfo finfo_resx = new FileInfo (fname);
+ FileInfo finfo_resources = new FileInfo
(generated_file_name);
+ if (finfo_resx.LastWriteTime <
finfo_resources.LastWriteTime)
+ return null;
+
using (StringWriter sw = new StringWriter ()) {
Console.WriteLine ("Generating partial classes
for\n{0}$ {1} {2}", Path.GetDirectoryName (fname), "xamlg", fname);
monitor.Log.WriteLine (GettextCatalog.GetString
(
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
