Menu
▾
▴
[Nant-commits] CVS: nant/src/NAnt/Tasks CompilerBase.cs,1.13,1.14 CscTask.cs,1.5,1.6 JscTask.cs,1.5,1.6 VbcTask.cs,1.6,1.7
|
From: Gerry S. <ger...@us...> - 2002-01-31 05:02:13
|
Update of /cvsroot/nant/nant/src/NAnt/Tasks
In directory usw-pr-cvs1:/tmp/cvs-serv11010/src/NAnt/Tasks
Modified Files:
CompilerBase.cs CscTask.cs JscTask.cs VbcTask.cs
Log Message:
* fixed bug with vb compiler and debug switch
* added csc, vbc, jsc compiler task tests
* added logo
Index: CompilerBase.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/CompilerBase.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CompilerBase.cs 2002/01/28 02:25:01 1.13
--- CompilerBase.cs 2002/01/31 05:02:10 1.14
***************
*** 15,19 ****
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
--- 15,19 ----
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
***************
*** 155,167 ****
writer.WriteLine("/nologo");
writer.WriteLine("/target:{0}", OutputTarget);
-
- writer.WriteLine("\"/out:{0}\"", GetOutputPath());
- if (Debug) {
- writer.WriteLine("/debug");
- writer.WriteLine("/define:DEBUG;TRACE");
- }
if (Define != null) {
writer.WriteLine("/define:{0}", Define);
}
if (Win32Icon != null) {
writer.WriteLine("\"/win32icon:{0}\"", Win32Icon);
--- 155,165 ----
writer.WriteLine("/nologo");
writer.WriteLine("/target:{0}", OutputTarget);
if (Define != null) {
writer.WriteLine("/define:{0}", Define);
}
+
+ // Any option that specifies a file name must be wrapped in quotes
+ // to handle cases with spaces in the path.
+ writer.WriteLine("\"/out:{0}\"", GetOutputPath());
if (Win32Icon != null) {
writer.WriteLine("\"/win32icon:{0}\"", Win32Icon);
***************
*** 179,182 ****
--- 177,181 ----
writer.WriteLine("\"" + fileName + "\"");
}
+
// Make sure to close the response file otherwise contents
// will not be written to disc and EXecuteTask() will fail.
***************
*** 186,203 ****
// display response file contents
Log.WriteLine(LogPrefix + "Contents of " + _responseFileName);
- /*
- StreamReader reader = File.OpenText(_responseFileName);
- string line = reader.ReadLine();
- while (line != null) {
- Log.WriteLine(LogPrefix + " " + line);
- line = reader.ReadLine();
- }
- reader.Close();
- */
-
StreamReader reader = File.OpenText(_responseFileName);
Log.WriteLine(reader.ReadToEnd());
reader.Close();
-
}
--- 185,191 ----
Index: CscTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/CscTask.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CscTask.cs 2001/09/19 19:13:29 1.5
--- CscTask.cs 2002/01/31 05:02:10 1.6
***************
*** 1,4 ****
// NAnt - A .NET build tool
! // Copyright (C) 2001 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
--- 1,4 ----
// NAnt - A .NET build tool
! // Copyright (C) 2001-2002 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
***************
*** 15,19 ****
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
--- 15,19 ----
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
***************
*** 37,45 ****
writer.WriteLine("/doc:{0}", _doc);
}
- }
! protected override bool NeedsCompiling() {
! // TODO: add checks for any referenced files OR return false to always compile
! return base.NeedsCompiling();
}
}
--- 37,44 ----
writer.WriteLine("/doc:{0}", _doc);
}
! if (Debug) {
! writer.WriteLine("/debug /define:DEBUG;TRACE");
! }
}
}
Index: JscTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/JscTask.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JscTask.cs 2001/09/19 19:13:29 1.5
--- JscTask.cs 2002/01/31 05:02:10 1.6
***************
*** 1,4 ****
// NAnt - A .NET build tool
! // Copyright (C) 2001 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
--- 1,4 ----
// NAnt - A .NET build tool
! // Copyright (C) 2001-2002 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
***************
*** 15,19 ****
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
--- 15,19 ----
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
***************
*** 28,40 ****
public class JscTask : CompilerBase {
! // TODO: add JScript.NET specific compiler options here (see CscTask)
!
protected override void WriteOptions(TextWriter writer) {
! // TODO: add support for compiler specific options
! }
!
! protected override bool NeedsCompiling() {
! // TODO: add checks for any referenced files OR return false to always compile
! return base.NeedsCompiling();
}
}
--- 28,37 ----
public class JscTask : CompilerBase {
! // add JScript.NET specific compiler options here (see CscTask)
protected override void WriteOptions(TextWriter writer) {
! if (Debug) {
! // TODO: determine what defines need to be in here
! writer.WriteLine("/debug");
! }
}
}
Index: VbcTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/VbcTask.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VbcTask.cs 2001/12/18 18:51:33 1.6
--- VbcTask.cs 2002/01/31 05:02:10 1.7
***************
*** 1,4 ****
// NAnt - A .NET build tool
! // Copyright (C) 2001 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
--- 1,4 ----
// NAnt - A .NET build tool
! // Copyright (C) 2001-2002 Gerry Shaw
//
// This program is free software; you can redistribute it and/or modify
***************
*** 15,19 ****
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
--- 15,19 ----
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
// Gerry Shaw (ger...@ya...)
// Mike Krueger (mi...@ic...)
***************
*** 28,40 ****
public class VbcTask : CompilerBase {
! // TODO: add VisualBasic.NET specific compiler options here (see CscTask)
!
protected override void WriteOptions(TextWriter writer) {
! // TODO: add support for compiler specific options
! }
!
! protected override bool NeedsCompiling() {
! // TODO: add checks for any referenced files OR return false to always compile
! return base.NeedsCompiling();
}
}
--- 28,36 ----
public class VbcTask : CompilerBase {
! // add VisualBasic.NET specific compiler options here (see CscTask)
protected override void WriteOptions(TextWriter writer) {
! if (Debug) {
! writer.WriteLine("/debug /define:DEBUG=True,TRACE=True");
! }
}
}
|