diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2006-02-22 12:30:01 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2006-02-22 12:30:01 +0300 |
| commit | 1509ce9c4b06b28f473107fa95fb8067ce1837cf (patch) | |
| tree | 5331feb91763293c5c7a4eb2e777fe912666c3ce /mcs/class/System.XML/Mono.Xml.Xsl | |
| parent | 64477a46507bf0a9e031434722cd81d97f5a4e0f (diff) | |
2006-02-22 Atsushi Enomoto <atsushi@ximian.com>
* ScriptCompilerInfo.cs : mbas unlike vbc references System.dll
etc. by default, so don't add them as references.
Set only local file name for #ExternalSource. Fixed bug
#75789.
svn path=/trunk/mcs/; revision=57147
Diffstat (limited to 'mcs/class/System.XML/Mono.Xml.Xsl')
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog index 43a70da5559..8d692eb8ffd 100644 --- a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog @@ -1,3 +1,9 @@ +2006-02-22 Atsushi Enomoto <atsushi@ximian.com> + + * ScriptCompilerInfo.cs : mbas unlike vbc references System.dll + etc. by default, so don't add them as references. + Set only local file name for #ExternalSource. Fixed bug #75789. + 2006-01-13 Atsushi Enomoto <atsushi@ximian.com> * GenericOutputter.cs : When writing string, use WriteWhitespace() diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs b/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs index 025550ea22c..9458290a5a0 100644 --- a/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs +++ b/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs @@ -190,10 +190,11 @@ public class Script{1} public VBCompilerInfo () { this.CompilerCommand = "mbas"; + this.DefaultCompilerOptions = "/t:library"; #if MS_NET this.CompilerCommand = "vbc.exe"; + this.DefaultCompilerOptions = "/t:library /r:System.dll /r:System.Xml.dll /r:Microsoft.VisualBasic.dll"; #endif - this.DefaultCompilerOptions = "/t:library /r:System.dll /r:System.XML.dll /r:Microsoft.VisualBasic.dll"; } public override CodeDomProvider CodeDomProvider { @@ -232,7 +233,7 @@ end namespace return source; return String.Format (CultureInfo.InvariantCulture, "#ExternalSource (\"{1}\", {0})\n{2}\n#end ExternalSource", - li.LineNumber, file.Replace ("\\", "\\\\").Replace ("\"", "\\\""), source); + li.LineNumber, new FileInfo (file).Name, source); } } |