diff --git a/WHATSNEW b/WHATSNEW index 1c651ca3b..8826f188f 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -106,6 +106,11 @@ Changes that could break older environments: scanned and always seem empty. Bugzilla Report 45741. + * the .NET tasks that have been deprecated since Ant 1.7.0 have been + removed, please use the stand-alone Antlib you can find at + http://ant.apache.org/antlibs/dotnet/index.html + instead. + Fixed bugs: ----------- diff --git a/build.xml b/build.xml index 822a1c455..0d2ad0ad7 100644 --- a/build.xml +++ b/build.xml @@ -314,8 +314,6 @@ - - @@ -510,31 +508,6 @@ - - - - - - - - wsdl.found=${wsdl.found} - - - - - - - - - csc.found=${csc.found} - - - - - - - dotnetapps.found=${dotnetapps.found} - @@ -1844,12 +1817,6 @@ see ${build.junit.reports} / ${antunit.reports} - - - - diff --git a/docs/manual/OptionalTasks/csc.html b/docs/manual/OptionalTasks/csc.html deleted file mode 100644 index 855ed91e7..000000000 --- a/docs/manual/OptionalTasks/csc.html +++ /dev/null @@ -1,494 +0,0 @@ - - - - - - Csc - Task - - - - - - - - - - - - - - - - - -
- - - -
- Csc - Task -
Compiles C# source into executables or modules. - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Compiles C# source into executables or modules. csc.exe on Windows or mcs on any other platform must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter

All parameters are optional: <csc/> should suffice to produce a debug build of all *.cs files. However, naming an destFilestops the csc compiler from choosing an output name from random, and allows the dependency checker to determine if the file is out of date.

The task is a directory based task, so attributes like includes="*.cs" and excludes="broken.cs" can be used to control the files pulled in. By default, all *.cs files from the project folder down are included in the command. When this happens the output file -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destFile seems prudent.

For more complex source trees, nested src elements can be supplied. When such an element is present, the implicit fileset is ignored. This makes sense, when you think about it :)

For historical reasons the pattern **/*.cs is preset as includes list and you can not override it with an explicit includes attribute. Use nested <src> elements instead of the basedir attribute if you need more control.

References to external files can be made through the references attribute, or (since Ant1.6), via nested <reference> filesets. With the latter, the timestamps of the references are also used in the dependency checking algorithm.

Example 

<csc optimize="true" debug="false" docFile="documentation.xml" warnLevel="4" unsafe="false" targetType="exe" incremental="false" mainClass = "MainApp" destFile="NetApp.exe" > <src dir="src" includes="*.cs"/> <reference file="${testCSC.dll}"/> <define name="RELEASE"/> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def3.property"/> </csc>
-
- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- additionalmodules - - Semicolon separated list of modules to refer to. - - String - - Optional -
- debug - - set the debug flag on or off. - - boolean -
- definitions - - Semicolon separated list of defined constants. - - String -
- destdir - - Set the destination directory of files to be compiled. - - File -
- destfile - - Set the name of exe/library to create. - - File -
- docfile - - file for generated XML documentation - - File -
- executable - - set the name of the program, overriding the defaults. Can be used to set the full path to a program, or to switch to an alternate implementation of the command, such as the Mono or Rotor versions -provided they use the same command line arguments as the .NET framework edition - - String -
- extraoptions - - Any extra options which are not explicitly supported by this task. - - String -
- failonerror - - If true, fail on compilation errors. - - boolean -
- filealign - - Set the file alignment. Valid values are 0,512, 1024, 2048, 4096, 8192, and 16384, 0 means 'leave to the compiler' - - int -
- fullpaths - - If true, print the full path of files on errors. - - boolean -
- includedefaultreferences - - If true, automatically includes the common assemblies in dotnet, and tells the compiler to link in mscore.dll. set the automatic reference inclusion flag on or off this flag controls the /nostdlib option in CSC - - boolean -
- incremental - - set the incremental compilation flag on or off. - - boolean -
- mainclass - - Sets the name of main class for executables. - - String -
- noconfig - - A flag that tells the compiler not to read in the compiler settings files 'csc.rsp' in its bin directory and then the local directory - - boolean -
- optimize - - If true, enables optimization flag. - - boolean -
- outputfile - - The output file. This is identical to the destFile attribute. - - File -
- referencefiles - - Path of references to include. Wildcards should work. - - Path -
- references - - Semicolon separated list of DLLs to refer to. - - String -
- srcdir - - Set the source directory of the files to be compiled. - - File -
- targettype - - set the target type to one of exe|library|module|winexe - - "exe", "library", "module", "winexe" -
- unsafe - - If true, enables the unsafe keyword. - - boolean -
- utf8output - - If true, require all compiler output to be in UTF8 format. - - boolean -
- warnlevel - - Level of warning currently between 1 and 4 with 4 being the strictest. - - int -
- win32icon - - Set the filename of icon to include. - - File -
- win32res - - Sets the filename of a win32 resource (.RES) file to include. This is not a .NET resource, but what Windows is used to. - - File -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- - - - - -
 
- - define (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetDefine) -
- add a define to the list of definitions -
- - - - - - -
 
- - reference (org.apache.tools.ant.types.FileSet) -
- add a new reference fileset to the compilation -
- - - - - - -
 
- - resource (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetResource) -
- link or embed a resource -
- - - - - - -
 
- - src (org.apache.tools.ant.types.FileSet) -
- add a new source directory to the compile -
- - -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html deleted file mode 100644 index 7ad6ff6d9..000000000 --- a/docs/manual/OptionalTasks/dotnet.html +++ /dev/null @@ -1,326 +0,0 @@ - - - - -.NET Tasks - - -

.NET tasks

-

Introduction

- - -

These tasks are deprecated and will be removed in a future -release of Ant. They are now part of the .NET -Antlib.

- -Ant support for .NET goes back to before .NET was released, and -continues to be expanded based on user demand. Users writing nothing but -a .NET application, may want to look at the .NET-based -NAnt project, that supports -both the Microsoft and the Ximian managed Mono project's implementation of the -.NET framework. -

- -Over time, the .NET tasks in Ant have tended to evolve to meet a few -limited needs. Firstly, developers working with complex deployment problems may -want to use ant to use the fairly advanced deployment tasks Ant ships -with. Secondly, anyone who has a cross-platform project can use these -tasks to cover the .NET side of the problem. Here, cross-platform can -mean more than just Java and .NET: the C++ tasks in the ant-contrib -project on sourceforge can be used with Ant to do native C++ and .NET -cross development if that is your need. Finally, Ant support for .NET -lets one automate .NET development under an automated build process, -such as AntHill or Cruise Control. - -

- -What this means is that the Ant tasks for .NET support do not get as -much rigorous use as the Java tools, and are evolving more slowly -that -includes the time for support calls to change. But as a consequence, -developers working on .NET support have more freedom to play around with -the code. It also means that the fairly unusual set of tasks supported -by ant enable a few interesting operations that can not be performed any -other way: -

    - -
  1. Integrating with a Java based SOAP Service -generating C# code from -the server's WSDL and running it against the server. -
    2. -
  2. Building and deploying a C#-based Web Service, then using the Apache -Axis tasks to create JUnit tests to call the endpoints. - -
  3. Patching .NET type libraries to work with more complex IDL than the -basic <importtypelib> wrapper around tlbimport supports. Hence the -disassembler and the reassembler. -
    4. - -
-Needless to say, possible does not mean easy. -Chapter 15 of -Java Development with Ant covers the first of these, using the Ant1.5 -version of the tasks. Going the other way -generating Java client -code and JUnit testcases is covered in -The Wondrous curse -of Interop. The final trick, IDL and Typelib abuse, is not -documented as we do not want to encourage such an ugly practise. It, -can, however, be done if absolutely necessary. - -

Task List

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TaskDescription
cscCompiles C# code
vbcCompiles VB.NET code
jsharpcCompiles J# files
ildasmDisassembles .NET executables and libraries
ilasmAssembles .il files
wsdltodotnetGenerates .NET code (C# or VB) from a WSDL file
importtypelibImports a COM type library into .NET
- -
-

Common .NET Datatypes

- -There are some datatypes that are common to the core compiler classes: -csc, vbc and jsharpc - -

Resource

- -This is a resource that is included in the build. Ant uses this for -dependency checking -if resources included this way have changed, the -executable or library will be rebuilt. -

- - - - - - - - - - - - - - - - - - - - - - - - - - -
AttributeDescriptionRequired
Filethe resource to includeYes
namethe name of the resource. - Optional unless the resource is - marked as public or privateNo
embedflag to control whether the resource - is embedded in the assembly, or just linked to itNo -default is true
publicVB only: flag to control if a resource should be - public or private. Set to true for public, false for private - and leave undefined for for neither. No
- -

Examples
- -
-<resource file="app.ico" name="icon"/>
-<resource file="splash.jpg"/>
-<resource name="splash" file="splash.jpg" public="false"/>
-
- -

Define

- -This is a definition; in .NET these can either be defined or undefined, -unlike C++ #defines, which can be either undefined or arbitrary text. -The Ant compilation tasks can unconditionally add definitions, or -conditionally set a compile-time definition if an ant property is -defined or not. -

- -Dependency Logic: the tasks are not (yet) clever enough to remember what -the last definitions were and trigger a rebuild when they change. Clean -build the code when the defines are likely to be different. -

- - - - - - - - - - - - - - - - - - - - - -
AttributeDescriptionRequired
namethe name of the definitionYes
ifname of a ant property to test for; - the definition is only set if this property is defined.No
unlessname of a ant property to test for; - the definition is only set if this property is undefined.No
- -

Examples
- -
-<define name="unsafe"/>
-<define name="debug" if="build.debug"/>
-<define name="dotnet" unless="build.mono"/>
-
- -
-

Change Log

- -

Ant1.6

-This revision goes along with NET 1.1, though there is no reason why -it should not work on other versions. -

- -

    -
  1. vbc task
    2. -
  2. jsharpc task
    3. -
  3. mono support
    4. -
  4. ilasm
    5. -
  5. tlbimport
    6. -
  6. Reference filesets in the compiler tasks
    7. -
  7. definitions in the compiler tasks
    8. -
  8. multiple source filesets in the compiler tasks. If these are used, the -implicit fileset is disabled
    9. -
- -The compile tasks: vbc, jsharpc, and csc, all contain lots of common code -in a shared base class: if you can use one you should be able to use -another. - -

Ant 1.5

-This revision goes along with NET 1.0 (SP1) -
    -
  1. CSC: added filealign
    2. -
  2. CSC: added reference to office.dll
    3. -
  3. CSC: dependency checking! only if destFile is set! -
  4. WsdlToDotnet written -
- -

Version 0.5

-This revision goes along with NET 1.0 (SP1) -
    -
  1. CSC: added filealign
    2. -
  2. CSC: added reference to office.dll
    3. -
  3. CSC: dependency checking! only if destFile is set! -
  4. WsdlToDotnet written -
- -

Version 0.4

-This is the beta-2 revision of the tasks. -
    -
  1. ILASM: pulled the owner attribute, added keyfile for giving binaries a strong name -(MD5 hash of the checksum)
    2. -
  2. CSC: added win32res , noConfig, utf8output, fullpaths
    3. -
  3. CSC:
    4. -
- -

Version 0.3

- -The changes here reflect Beta-1 of the dotnet SDK and experience of use in -more complex projects. This build does not work with the older SDK, -primarily because the automatic reference feature references libraries -only found in the new SDK version. -

-External changes

-
    -
  • Recursive inclusion of .cs and .il files
    • - -
  • Documentation enhanced, includes examples and details of all parameters
    • - -
  • The csc task automatically includes the common dotnet assemblies, so -there is no need to remember to refer to 'System.dll', 'System.Web.Services', - etc. This feature can be disabled by setting the 'includeDefaultReferences' - flag to false.
    • - -
  • References can also be referred to using the ReferenceFiles parameter, which -is an ant path specification. The old 'references' string is still retained.
    • -
  • An 'extraoptions' attribute enables the build file to include any CSC options -which are not explicitly supported in the CSC task.
    • -
- -Internal changes -
    -
  • Some minor refactoring (move common code a method)
    • -
  • Application of Jedits JavaStyle task resulted in a major reshaping of -the codebase and the insertion of a blank line every second line. Significant -effort was required to revert some (but not all) changes.
    • -
  • Removed throws clause from methods which can't throw exception -
- -The test harness has been expanded to include unicode source file -(the build works but the rest of the system has 'issues' with high unicode -package and method names) - -

Version 0.2

-First public edition, added to the ant cvs tree. Tested on the PDC build of -the dotnet SDK only, and still immature. The command execution code was -refactored out into a 'NetCommand' class for re-use. The Ilasm task was added -at this time. - -

Version 0.1

-Initial proof of concept; very rudimentary support for CSC only. - - - diff --git a/docs/manual/OptionalTasks/ilasm.html b/docs/manual/OptionalTasks/ilasm.html deleted file mode 100644 index 2cd02f418..000000000 --- a/docs/manual/OptionalTasks/ilasm.html +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - Ilasm - Task - - - - - - - - - - - - - - - - - -
- - - -
- Ilasm - Task -
Assembles .NET Intermediate Language files. - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Assembles .NET Intermediate Language files. ilasm.exe must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter

All parameters are optional: <il/> should suffice to produce a debug build of all *.il files. The option set is roughly compatible with the CSharp class; even though the command line options are only vaguely equivalent. [The low level commands take things like /OUT=file, csc wants /out:file ... /verbose is used some places; /quiet here in ildasm... etc.] It would be nice if someone made all the command line tools consistent (and not as brittle as the java cmdline tools)

The task is a directory based task, so attributes like includes="*.il" and excludes="broken.il" can be used to control the files pulled in. You can also use nested <src> filesets to refer to source.

-

- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- debug - - set the debug flag on or off. - - boolean - - Optional -
- destfile - - Set the name of exe/library to create. - - File -
- extraoptions - - Any extra options which are not explicitly supported by this task. - - String -
- failonerror - - If true, fails if ilasm tool fails. - - boolean -
- keyfile - - the name of a file containing a private key. - - File -
- listing - - If true, produce a listing (off by default). - - boolean -
- outputfile - - Set the output file; identical to setDestFile - - File -
- resourcefile - - name of resource file to include. - - File -
- srcdir - - Set the source directory of the files to be compiled. - - File -
- verbose - - If true, enable verbose ILASM output. - - boolean -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- - - - - -
 
- - reference (org.apache.tools.ant.types.FileSet) -
- add a new reference fileset to the compilation -
- - - - - - -
 
- - src (org.apache.tools.ant.types.FileSet) -
- add a new source directory to the compile -
- - -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/ildasm.html b/docs/manual/OptionalTasks/ildasm.html deleted file mode 100644 index 113f6befa..000000000 --- a/docs/manual/OptionalTasks/ildasm.html +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - Ildasm - Task - - - - - - - - - - - - - - - - - -
- - - -
- Ildasm - Task -
Task to take a .NET or Mono -generated managed executable and turn it into ILASM assembly code. - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Task to take a .NET or Mono -generated managed executable and turn it into ILASM assembly code. Useful when converting imported typelibs into assembler before patching and recompiling, as one has to do when doing advanced typelib work.

As well as generating the named output file, the ildasm program will also generate resource files Icons.resources Message.resources and a .res file whose filename stub is derived from the source in ways to obscure to determine. There is no way to control whether or not these files are created, or where they are created (they are created in the current directory; their names come from inside the executable and may be those used by the original developer). This task creates the resources in the directory specified by resourceDir if set, else in the same directory as the destFile.

This task requires the .NET SDK installed and ildasm on the path. To disassemble using alternate CLR systems, set the executable attribute to the name/path of the alternate implementation -one that must support all the classic ildasm commands.

Dependency logic: the task executes the command if the output file is missing or older than the source file. It does not take into account changes in the options of the task, or timestamp differences in resource files. When the underlying ildasm executable fails for some reason, it leaves the .il file in place with some error message. To prevent this from confusing the dependency logic, the file specified by the dest attribute is always deleted after an unsuccessful build. -

- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- assembler - - enable (default) or disable assembly language in the output - - boolean - - Optional -
- bytes - - enable or disable (default) the original bytes as comments - - boolean -
- destfile - - the output file (required) - - File -
- encoding - - Select the output encoding: ascii, utf8 or unicode - - "ascii", "utf8", "unicode" -
- executable - - override the name of the executable (normally ildasm) or set its full path. Do not set a relative path, as the ugly hacks needed to create resource files in the dest directory force us to change to this directory before running the application. i.e use <property location> to create an absolute path from a relative one before setting this value. - - String -
- header - - include header information; default false. - - boolean -
- item - - name a single item to decode; a class or a method e.g item="Myclass::method" or item="namespace1::namespace2::Myclass:method(void(int32)) - - String -
- linenumbers - - include line number information; default=false - - boolean -
- metadata - - include metadata information - - boolean -
- progressbar - - show a graphical progress bar in a window during the process; off by default - - boolean -
- quoteallnames - - quote all names. - - boolean -
- rawexceptionhandling - - enable raw exception handling (default = false) - - boolean -
- resourcedir - - Set the name of the directory for resources to be created. We cannot control their names, but we can say where they get created. If not set, the directory of the dest file is used - - File -
- showsource - - include the source as comments (default=false) - - boolean -
- sourcefile - - the file to disassemble -required - - File -
- srcfile - - alternate name for sourceFile - - File -
- visibility - - visibility options: one or more of the following, with + signs to concatenate them: 
 pub : Public pri : Private fam : Family asm : Assembly faa : Family and Assembly foa : Family or Assembly psc : Private Scope
e.g. visibility="pub+pri". Family means protected in C#; - 		- String -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/importtypelib.html b/docs/manual/OptionalTasks/importtypelib.html deleted file mode 100644 index 12292b6e7..000000000 --- a/docs/manual/OptionalTasks/importtypelib.html +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - Importtypelib - Task - - - - - - - - - - - - - - - - - -
- - - -
- Importtypelib - Task -
Import a COM type library into the .NET framework. - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Import a COM type library into the .NET framework.

This task is a wrapper to .NET's tlbimport; it imports a tlb file to a NET assembly by generating a binary assembly (.dll) that contains all the binding metadata. It uses date timestamps to minimise rebuilds.

Example 

 <importtypelib srcfile="xerces.tlb" destfile="xerces.dll" namespace="Apache.Xerces"/>
-
- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- destfile - - name the output file. required - - File - - Optional -
- extraoptions - - set any extra options that are not yet supported by this task. - - String -
- namespace - - what namespace is the typelib to be in. required - - String -
- srcfile - - what is the source .tlb file? required. - - File -
- unsafe - - do you want unsafe code. - - boolean -
- usesysarray - - set this to map a COM SafeArray to the System.Array class - - boolean -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/jsharpc.html b/docs/manual/OptionalTasks/jsharpc.html deleted file mode 100644 index 276e42e1b..000000000 --- a/docs/manual/OptionalTasks/jsharpc.html +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - Jsharpc - Task - - - - - - - - - - - - - - - - - -
- - - -
- Jsharpc - Task -
Compile J# source down to a managed .NET application.

For historical reasons the pattern **/*.java is preset as includes list and you can not override it with an explicit includes attribute. Use nested <src> elements instead of the basedir attribute if you need more control.

 - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Compile J# source down to a managed .NET application.

J# is not Java. But it is the language closest to Java in the .NET framework. This task compiles jsharp source (.java files), and generates a .NET managed exe or dll.

-

- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- additionalmodules - note that your version of vjc may not support this option. - - Semicolon separated list of modules to refer to. - - String - - Optional -
- baseaddress - - - - String -
- debug - - set the debug flag on or off. - - boolean -
- destdir - - Set the destination directory of files to be compiled. - - File -
- destfile - - Set the name of exe/library to create. - - File -
- executable - - set the name of the program, overriding the defaults. Can be used to set the full path to a program, or to switch to an alternate implementation of the command, such as the Mono or Rotor versions -provided they use the same command line arguments as the .NET framework edition - - String -
- extraoptions - - Any extra options which are not explicitly supported by this task. - - String -
- failonerror - - If true, fail on compilation errors. - - boolean -
- includedefaultreferences - - If true, automatically includes the common assemblies in dotnet, and tells the compiler to link in mscore.dll. set the automatic reference inclusion flag on or off this flag controls the /nostdlib option in CSC - - boolean -
- mainclass - - Sets the name of main class for executables. - - String -
- optimize - - If true, enables optimization flag. - - boolean -
- purejava - - do we want pure java (default, true) or corrupted J#? - - boolean -
- referencefiles - - Path of references to include. Wildcards should work. - - Path -
- references - - Semicolon separated list of DLLs to refer to. - - String -
- securescoping - - Make package scoped code visible to the current assembly only (default: false) .NET does not have package scoping. Instead it has assembly, private and public. By default, package content is public to all. - - boolean -
- srcdir - - Set the source directory of the files to be compiled. - - File -
- targettype - - set the target type to one of exe|library|module|winexe - - "exe", "library", "module", "winexe" -
- utf8output - - If true, require all compiler output to be in UTF8 format. - - boolean -
- warnlevel - - Level of warning currently between 1 and 4 with 4 being the strictest. - - int -
- win32icon - - Set the filename of icon to include. - - File -
- win32res - - Sets the filename of a win32 resource (.RES) file to include. This is not a .NET resource, but what Windows is used to. - - File -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- - - - - -
 
- - define (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetDefine) -
- add a define to the list of definitions -
- - - - - - -
 
- - reference (org.apache.tools.ant.types.FileSet) -
- add a new reference fileset to the compilation -
- - - - - - -
 
- - resource (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetResource) -
- link or embed a resource -
- - - - - - -
 
- - src (org.apache.tools.ant.types.FileSet) -
- add a new source directory to the compile -
- - -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/vbc.html b/docs/manual/OptionalTasks/vbc.html deleted file mode 100644 index a2d3d4e1d..000000000 --- a/docs/manual/OptionalTasks/vbc.html +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - Vbc - Task - - - - - - - - - - - - - - - - - -
- - - -
- Vbc - Task -
This task compiles Visual Basic.NET source into executables or modules.

For historical reasons the pattern **/*.vb is preset as includes list and you can not override it with an explicit includes attribute. Use nested <src> elements instead of the basedir attribute if you need more control.

 - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- This task compiles Visual Basic.NET source into executables or modules. The task requires vbc.exe on the execute path, unless it or an equivalent program is specified in the executable parameter

All parameters are optional: <vbc/> should suffice to produce a debug build of all *.vb files.

The task is a directory based task, so attributes like includes="**\/*.vb" and excludes="broken.vb" can be used to control the files pulled in. By default, all *.vb files from the project folder down are included in the command. When this happens the destFile -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destfile is prudent.

Also, dependency checking only works if destfile is set. As with <csc> nested src filesets of source, reference filesets, definitions and resources can be provided.

Example 

<vbc optimize="true" debug="false" warnLevel="4" targetType="exe" definitions="RELEASE" excludes="src/unicode_class.vb" mainClass = "MainApp" destFile="NetApp.exe" optionExplicit="true" optionCompare="text" references="System.Xml,System.Web.Xml" > <reference file="${testCSC.dll}"/> <define name="RELEASE"/> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def2.property"/> </vbc>
-
- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- additionalmodules - - Semicolon separated list of modules to refer to. - - String - - Optional -
- debug - - set the debug flag on or off. - - boolean -
- destdir - - Set the destination directory of files to be compiled. - - File -
- destfile - - Set the name of exe/library to create. - - File -
- executable - - set the name of the program, overriding the defaults. Can be used to set the full path to a program, or to switch to an alternate implementation of the command, such as the Mono or Rotor versions -provided they use the same command line arguments as the .NET framework edition - - String -
- extraoptions - - Any extra options which are not explicitly supported by this task. - - String -
- failonerror - - If true, fail on compilation errors. - - boolean -
- imports - - Declare global imports for namespaces in referenced metadata files. - - String -
- includedefaultreferences - - If true, automatically includes the common assemblies in dotnet, and tells the compiler to link in mscore.dll. set the automatic reference inclusion flag on or off this flag controls the /nostdlib option in CSC - - boolean -
- mainclass - - Sets the name of main class for executables. - - String -
- optimize - - If true, enables optimization flag. - - boolean -
- optioncompare - - Specify binary- or text-style string comparisons. Defaults to "binary" - - String -
- optionexplicit - - Whether to require explicit declaration of variables. - - boolean -
- optionstrict - - Enforce strict language semantics. - - boolean -
- referencefiles - - Path of references to include. Wildcards should work. - - Path -
- references - - Semicolon separated list of DLLs to refer to. - - String -
- removeintchecks - - Whether to remove integer checks. Default false. - - boolean -
- rootnamespace - - Specifies the root namespace for all type declarations. - - String -
- srcdir - - Set the source directory of the files to be compiled. - - File -
- targettype - - set the target type to one of exe|library|module|winexe - - "exe", "library", "module", "winexe" -
- utf8output - - If true, require all compiler output to be in UTF8 format. - - boolean -
- warnlevel - - Level of warning currently between 1 and 4 with 4 being the strictest. - - int -
- win32icon - - Set the filename of icon to include. - - File -
- win32res - - Sets the filename of a win32 resource (.RES) file to include. This is not a .NET resource, but what Windows is used to. - - File -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- - - - - -
 
- - define (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetDefine) -
- add a define to the list of definitions -
- - - - - - -
 
- - reference (org.apache.tools.ant.types.FileSet) -
- add a new reference fileset to the compilation -
- - - - - - -
 
- - resource (org.apache.tools.ant.taskdefs.optional.dotnet.DotnetResource) -
- link or embed a resource -
- - - - - - -
 
- - src (org.apache.tools.ant.types.FileSet) -
- add a new source directory to the compile -
- - -
- - - -
- - - diff --git a/docs/manual/OptionalTasks/wsdltodotnet.html b/docs/manual/OptionalTasks/wsdltodotnet.html deleted file mode 100644 index dfd070fdd..000000000 --- a/docs/manual/OptionalTasks/wsdltodotnet.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - Wsdltodotnet - Task - - - - - - - - - - - - - - - - - -
- - - -
- Wsdltodotnet - Task -
Converts a WSDL file or URL resource into a .NET language. - 		- - - Apache Ant - -
-
- - - - - - - - - - -
 
- - - Description -
- Converts a WSDL file or URL resource into a .NET language. Why add a wrapper to the MS WSDL tool? So that you can verify that your web services, be they written with Axis or anyone else's SOAP toolkit, work with .NET clients. This task is dependency aware when using a file as a source and destination; so if you <get> the file (with usetimestamp="true") then you only rebuild stuff when the WSDL file is changed. Of course, if the server generates a new timestamp every time you ask for the WSDL, this is not enough...use the <filesmatch> <condition> to to byte for byte comparison against a cached WSDL file then make the target conditional on that test failing. See "Creating an XML Web Service Proxy", "wsdl.exe" docs in the framework SDK documentation -
- - - - - - - - -
 
- - - Parameters -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Attribute - - Description - - Type - - Requirement -
- destfile - - Name of the file to generate. Required - - File - - Optional -
- extraoptions - - Any extra WSDL.EXE options which aren't explicitly supported by the ant wrapper task; optional - - String -
- failonerror - - Whether or not a failure should halt the build. Optional - default is true. - - boolean -
- language - - set the language; one of "CS", "JS", or "VB" optional, default is CS for C# source - - String -
- namespace - - namespace to place the source in. optional; default "" - - String -
- server - - flag to enable server side code generation; optional, default=false - - boolean -
- srcfile - - The local WSDL file to parse; either url or srcFile is required. - - File -
- url - - Sets the URL to fetch. Fetching is by wsdl.exe; Ant proxy settings are ignored; either url or srcFile is required. - - String -
-
- - - - - - - - - - -
 
- - - Parameters as nested elements -
- -
- - - -
- - - diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html index 84860ef23..075335325 100644 --- a/docs/manual/dirtasks.html +++ b/docs/manual/dirtasks.html @@ -225,9 +225,6 @@ tasks that can act as an implicit fileset:

<renameextensions>
  • <depend>
    • -
  • <ilasm>
    • -
  • <csc>
    • -
  • <vbc>
  • <translate>
  • <image>
  • <jlink> (deprecated)
    • diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html index 5c0b1313a..11ce062d7 100644 --- a/docs/manual/optionaltasklist.html +++ b/docs/manual/optionaltasklist.html @@ -32,7 +32,6 @@ Concepts and Types

    Optional Tasks

    -.NET Tasks
    ANTLR
    Attrib
    Cab
    diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html index 9426f4807..17da10b7f 100644 --- a/docs/manual/tasksoverview.html +++ b/docs/manual/tasksoverview.html @@ -42,7 +42,6 @@ documentation.

    Logging Tasks
    Mail Tasks
    Miscellaneous Tasks
    -.NET Tasks
    Pre-process Tasks
    Property Tasks
    Remote Tasks
    @@ -810,28 +809,6 @@ documentation.

    -

    - - - - - -
    - -.NET Tasks -[Back to top]
    - - - - - - - - - - -
    Task NameDescription
    .NET Tasks

    (See the documentation describing the .NET tasks.)

    -

    diff --git a/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml b/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml deleted file mode 100644 index ca9b7d69d..000000000 --- a/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wsdl.found=${wsdl.found} - - - - - - - - - csc.found=${csc.found} - - - - - - - - vbc.found=${vbc.found} - - - - - - - dotnetapps.found=${dotnetapps.found} - - - - - - - - Needed .net apps are missing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No app created - - - - - - - No app created - - - - - - - - - - - - - - - No app created - - - - - - - No app created - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/etc/testcases/taskdefs/optional/dotnet.xml b/src/etc/testcases/taskdefs/optional/dotnet.xml deleted file mode 100644 index 86a008838..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet.xml +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - ilasm.found=${ilasm.found} - - - - - - - - csc.found=${csc.found} - - - - - - - - - vbc.found=${vbc.found} - - - - - - - - - jsharp.found=${jsharp.found} - - - - - - mcs.found=${mcs.found} - - - - - - - - - - - - - - mono.ilasm.found=${mono.ilasm.found} - - - - - - - - - ildasm.found=${ildasm.found} - - - - - - - - - - - - - - - dotnetapps.found=${dotnetapps.found} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Needed C# compiler is missing - - - - Needed ilasm is missing - - - - No vjc on the path - - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - No app ${testCSC.exe} created - - - - - - - - - - - - - - - No file ${testCSC.dll} created - - - - - - - No file ${testCSC2.dll} created - - - - - - - - - No file ${testCSC.dll} created - - - - - - - - - - - - - - - - No app ${testCscReferences.exe} created - - - - - - - - - - - - - - - No app ${testCscReferences.exe} created - - - - - - - - - - - - - - No app ${testILASM.exe} created - - - - - - - - - - - - - - - - - - - - - - - - - ${ilasm.string} - - - - - - - No file ${testILDASM.il} created - - - - - - - - - - - - - - - - - - - - - No app ${testCSCresponseFile.exe} created - - - - - - diff --git a/src/etc/testcases/taskdefs/optional/dotnet/HelloWorld.wsdl b/src/etc/testcases/taskdefs/optional/dotnet/HelloWorld.wsdl deleted file mode 100644 index 2c56a6693..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/HelloWorld.wsdl +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/etc/testcases/taskdefs/optional/dotnet/example.cs b/src/etc/testcases/taskdefs/optional/dotnet/example.cs deleted file mode 100644 index b5cb87975..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/example.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -using System; - -public class Example { - - public static void Main(String[] args) { - Example2.echo(); - Example3.echo(); - } -} diff --git a/src/etc/testcases/taskdefs/optional/dotnet/example.il b/src/etc/testcases/taskdefs/optional/dotnet/example.il deleted file mode 100644 index 2aa6d62b5..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/example.il +++ /dev/null @@ -1,92 +0,0 @@ -//created from ildasm of example.cs -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - - -.assembly extern /*23000001*/ mscorlib -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4.. - .ver 1:0:3300:0 -} -.assembly /*20000001*/ example -{ - // --- The following custom attribute is added automatically, do not uncomment ------- - // .custom /*0C000001:0A000001*/ instance void [mscorlib/* 23000001 */]System.Diagnostics.DebuggableAttribute/* 01000002 */::.ctor(bool, - // bool) /* 0A000001 */ = ( 01 00 00 01 00 00 ) - .hash algorithm 0x00008004 - .ver 0:0:0:0 -} -.module example.exe -// MVID: {641E4709-F7B6-4BB0-BC5D-49C2CF1F1CF8} -.imagebase 0x00400000 -.subsystem 0x00000003 -.file alignment 512 -.corflags 0x00000001 -// Image base: 0x03180000 -// -// ============== CLASS STRUCTURE DECLARATION ================== -// -.class /*02000002*/ public auto ansi beforefieldinit Example - extends [mscorlib/* 23000001 */]System.Object/* 01000001 */ -{ -} // end of class Example - - -// ============================================================= - - -// =============== GLOBAL FIELDS AND METHODS =================== - - -// ============================================================= - - -// =============== CLASS MEMBERS DECLARATION =================== -// note that class flags, 'extends' and 'implements' clauses -// are provided here for information only - -.class /*02000002*/ public auto ansi beforefieldinit Example - extends [mscorlib/* 23000001 */]System.Object/* 01000001 */ -{ - .method /*06000001*/ public hidebysig static - void Main(string[] args) cil managed - // SIG: 00 01 01 1D 0E - { - .entrypoint - // Method begins at RVA 0x2050 - // Code size 11 (0xb) - .maxstack 1 - IL_0000: /* 72 | (70)000001 */ ldstr "hello, I look like Java, but I'm really .NET" /* 70000001 */ - IL_0005: /* 28 | (0A)000002 */ call void [mscorlib/* 23000001 */]System.Console/* 01000003 */::WriteLine(string) /* 0A000002 */ - IL_000a: /* 2A | */ ret - } // end of method Example::Main - - .method /*06000002*/ public hidebysig specialname rtspecialname - instance void .ctor() cil managed - // SIG: 20 00 01 - { - // Method begins at RVA 0x2068 - // Code size 7 (0x7) - .maxstack 1 - IL_0000: /* 02 | */ ldarg.0 - IL_0001: /* 28 | (0A)000003 */ call instance void [mscorlib/* 23000001 */]System.Object/* 01000001 */::.ctor() /* 0A000003 */ - IL_0006: /* 2A | */ ret - } // end of method Example::.ctor - -} // end of class Example - - - diff --git a/src/etc/testcases/taskdefs/optional/dotnet/example2.cs b/src/etc/testcases/taskdefs/optional/dotnet/example2.cs deleted file mode 100644 index 0f4597154..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/example2.cs +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -using System; - -/** - * this is just here to create confusion - */ -public class Example2 { - - public int some_variable=3; - - public static void echo() { - Console.WriteLine("hello, I look like Java, but I'm really .NET"); - } - -} diff --git a/src/etc/testcases/taskdefs/optional/dotnet/example2.il b/src/etc/testcases/taskdefs/optional/dotnet/example2.il deleted file mode 100644 index 6a5c02ff2..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/example2.il +++ /dev/null @@ -1,45 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -.class public auto ansi beforefieldinit Example2 - extends [mscorlib]System.Object -{ -} // end of class Example2 - -// =============== CLASS MEMBERS DECLARATION =================== -// note that class flags, 'extends' and 'implements' clauses -// are provided here for information only - -.class public auto ansi beforefieldinit Example2 - extends [mscorlib]System.Object -{ - .field public int32 some_variable - .method public hidebysig specialname rtspecialname - instance void .ctor() cil managed - { - // Code size 14 (0xe) - .maxstack 2 - IL_0000: ldarg.0 - IL_0001: ldc.i4.3 - IL_0002: stfld int32 Example2::some_variable - IL_0007: ldarg.0 - IL_0008: call instance void [mscorlib]System.Object::.ctor() - IL_000d: ret - } // end of method Example2::.ctor - -} // end of class Example2 - - - diff --git a/src/etc/testcases/taskdefs/optional/dotnet/example3.cs b/src/etc/testcases/taskdefs/optional/dotnet/example3.cs deleted file mode 100644 index 95f69815d..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/example3.cs +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -using System; - -/** - * this is just here to create confusion - */ -public class Example3 { - - public static void echo() { - Console.WriteLine("hello, I look like Java, but I'm really .NET"); - } - -} diff --git a/src/etc/testcases/taskdefs/optional/dotnet/jsharp.java b/src/etc/testcases/taskdefs/optional/dotnet/jsharp.java deleted file mode 100644 index e23703465..000000000 --- a/src/etc/testcases/taskdefs/optional/dotnet/jsharp.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -/** - * this is a j# class, not a java one. - */ -public class jsharp { - - public static void main(String args[]) { - System.out.println("hello, I look like Java, but I'm really J#"); - } - -} diff --git a/src/etc/testcases/taskdefs/optional/dotnet/res.resources b/src/etc/testcases/taskdefs/optional/dotnet/res.resources deleted file mode 100644 index 20e265d8a..000000000 Binary files a/src/etc/testcases/taskdefs/optional/dotnet/res.resources and /dev/null differ diff --git a/src/etc/testcases/taskdefs/optional/wsdl/StockQuoteService.wsdl b/src/etc/testcases/taskdefs/optional/wsdl/StockQuoteService.wsdl deleted file mode 100644 index dd1292a01..000000000 --- a/src/etc/testcases/taskdefs/optional/wsdl/StockQuoteService.wsdl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index 4b23a7494..b9aa64326 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -130,7 +130,6 @@ ccunlock=org.apache.tools.ant.taskdefs.optional.clearcase.CCUnlock ccupdate=org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate chgrp=org.apache.tools.ant.taskdefs.optional.unix.Chgrp chown=org.apache.tools.ant.taskdefs.optional.unix.Chown -csc=org.apache.tools.ant.taskdefs.optional.dotnet.CSharp ddcreator=org.apache.tools.ant.taskdefs.optional.ejb.DDCreator depend=org.apache.tools.ant.taskdefs.optional.depend.Depend echoproperties=org.apache.tools.ant.taskdefs.optional.EchoProperties @@ -139,10 +138,7 @@ ejbc=org.apache.tools.ant.taskdefs.optional.ejb.Ejbc ejbjar=org.apache.tools.ant.taskdefs.optional.ejb.EjbJar ftp=org.apache.tools.ant.taskdefs.optional.net.FTP funtest=org.apache.tools.ant.taskdefs.optional.testing.Funtest -ilasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm -ildasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ildasm image=org.apache.tools.ant.taskdefs.optional.image.Image -importtypelib=org.apache.tools.ant.taskdefs.optional.dotnet.ImportTypelib iplanet-ejbc=org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask jarlib-available=org.apache.tools.ant.taskdefs.optional.extension.JarLibAvailableTask jarlib-display=org.apache.tools.ant.taskdefs.optional.extension.JarLibDisplayTask @@ -153,7 +149,6 @@ javah=org.apache.tools.ant.taskdefs.optional.Javah jdepend=org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask jjdoc=org.apache.tools.ant.taskdefs.optional.javacc.JJDoc jjtree=org.apache.tools.ant.taskdefs.optional.javacc.JJTree -jsharpc=org.apache.tools.ant.taskdefs.optional.dotnet.JSharp junit=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask junitreport=org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator makeurl=org.apache.tools.ant.taskdefs.MakeUrl @@ -202,7 +197,6 @@ stylebook=org.apache.tools.ant.taskdefs.optional.StyleBook symlink=org.apache.tools.ant.taskdefs.optional.unix.Symlink telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask translate=org.apache.tools.ant.taskdefs.optional.i18n.Translate -vbc=org.apache.tools.ant.taskdefs.optional.dotnet.VisualBasicCompile verifyjar=org.apache.tools.ant.taskdefs.VerifyJar vssadd=org.apache.tools.ant.taskdefs.optional.vss.MSVSSADD vsscheckin=org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKIN @@ -215,7 +209,6 @@ vsslabel=org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL wljspc=org.apache.tools.ant.taskdefs.optional.jsp.WLJspc wlrun=org.apache.tools.ant.taskdefs.optional.ejb.WLRun wlstop=org.apache.tools.ant.taskdefs.optional.ejb.WLStop -wsdltodotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet xmlvalidate=org.apache.tools.ant.taskdefs.optional.XMLValidateTask @@ -233,4 +226,3 @@ rename=org.apache.tools.ant.taskdefs.Rename renameext=org.apache.tools.ant.taskdefs.optional.RenameExtensions starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut style=org.apache.tools.ant.taskdefs.XSLTProcess -WsdlToDotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java deleted file mode 100644 index 66e39729a..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ /dev/null @@ -1,399 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -/* - * build notes - * -The reference CD to listen to while editing this file is - * nap: Underworld - Everything, Everything - */ -// ==================================================================== -// place in the optional ant tasks package -// but in its own dotnet group -// ==================================================================== - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -// ==================================================================== -// imports -// ==================================================================== - -import java.io.File; - -// ==================================================================== - -/** - * Compiles C# source into executables or modules. - * - * csc.exe on Windows or mcs on other platforms must be on the execute - * path, unless another executable or the full path to that executable - * is specified in the executable parameter - *

    - * All parameters are optional: <csc/> should suffice to produce a debug - * build of all *.cs files. However, naming an destFilestops the - * csc compiler from choosing an output name from random, and - * allows the dependency checker to determine if the file is out of date. - *

    - * The task is a directory based task, so attributes like includes="*.cs" - * and excludes="broken.cs" can be used to control the files pulled - * in. By default, all *.cs files from the project folder down are included in - * the command. When this happens the output file -if not specified- is taken - * as the first file in the list, which may be somewhat hard to control. - * Specifying the output file with destFile seems prudent.

    - * - *

    - * For more complex source trees, nested src elemements can be - * supplied. When such an element is present, the implicit fileset is ignored. - * This makes sense, when you think about it :) - * - *

    For historical reasons the pattern - * **/*.cs is preset as includes list and - * you can not override it with an explicit includes attribute. Use - * nested <src> elements instead of the basedir - * attribute if you need more control.

    - * - *

    - * References to external files can be made through the references attribute, - * or (since Ant1.6), via nested <reference> filesets. With the latter, - * the timestamps of the references are also used in the dependency - * checking algorithm. - *

    - * - * Example - * - * 

    <csc
- *       optimize="true"
- *       debug="false"
- *       docFile="documentation.xml"
- *       warnLevel="4"
- *       unsafe="false"
- *       targetType="exe"
- *       incremental="false"
- *       mainClass = "MainApp"
- *       destFile="NetApp.exe"
- *       >
- *           <src dir="src" includes="*.cs" />
- *       <reference file="${testCSC.dll}" />
- *       <define name="RELEASE" />
- *       <define name="DEBUG" if="debug.property"/>
- *       <define name="def3" unless="def3.property"/>
- *    </csc>
- *
    - * - * - * @ant.task name="csc" category="dotnet" - * @since Ant 1.3 - */ - -public class CSharp extends DotnetCompile { - - // CheckStyle:VisibilityModifier OFF - bc - /** - * defines list: RELEASE;WIN32;NO_SANITY_CHECKS;;SOMETHING_ELSE' - */ - String definitions; - - - /** - * output XML documentation flag - */ - private File docFile; - - /** - * file alignment; 0 means let the compiler decide - */ - private int fileAlign = 0; - - /** - * use full paths to things - */ - private boolean fullpaths = false; - - /** - * incremental build flag - */ - private boolean incremental; - - /** - * enable unsafe code flag. Clearly set to false by default - */ - protected boolean unsafe; - - /** - * A flag that tells the compiler not to read in the compiler - * settings files 'csc.rsp' in its bin directory and then the local directory - */ - private boolean noconfig = false; - // CheckStyle:VisibilityModifier ON - - - /** - * constructor inits everything and set up the search pattern - */ - - public CSharp() { - clear(); - } - - /** - * full cleanup - */ - public void clear() { - super.clear(); - docFile = null; - fileAlign = 0; - fullpaths = true; - incremental = false; - unsafe = false; - noconfig = false; - definitions = null; - setExecutable(isWindows ? "csc" : "mcs"); - } - - - - /** - * file for generated XML documentation - * - *@param f output file - */ - public void setDocFile(File f) { - docFile = f; - } - - - /** - * get the argument or null for no argument needed - * - *@return The DocFile Parameter to CSC - */ - protected String getDocFileParameter() { - if (docFile != null) { - return "/doc:" + docFile.toString(); - } else { - return null; - } - } - - /** - * Set the file alignment. - * Valid values are 0,512, 1024, 2048, 4096, 8192, - * and 16384, 0 means 'leave to the compiler' - * @param fileAlign the value to use. - */ - public void setFileAlign(int fileAlign) { - this.fileAlign = fileAlign; - } - - /** - * get the argument or null for no argument needed - * - *@return The OutputFile Parameter to CSC - */ - protected String getFileAlignParameter() { - if (fileAlign != 0 && !"mcs".equals(getExecutable())) { - return "/filealign:" + fileAlign; - } else { - return null; - } - } - - - /** - * If true, print the full path of files on errors. - * - *@param enabled The new fullPaths value - */ - public void setFullPaths(boolean enabled) { - fullpaths = enabled; - } - - - /** - * Gets the fullPathsParameter attribute of the CSharp object - * - *@return The fullPathsParameter value or null if unset - */ - protected String getFullPathsParameter() { - return fullpaths ? "/fullpaths" : null; - } - - - /** - * set the incremental compilation flag on or off. - * - *@param incremental on/off flag - */ - public void setIncremental(boolean incremental) { - this.incremental = incremental; - } - - - /** - * query the incrementalflag - * - *@return true if incremental compilation is turned on - */ - public boolean getIncremental() { - return incremental; - } - - - /** - * get the incremental build argument - * - *@return The Incremental Parameter to CSC - */ - protected String getIncrementalParameter() { - return "/incremental" + (incremental ? "+" : "-"); - } - - /** - * The output file. This is identical to the destFile attribute. - * - *@param params The new outputFile value - */ - public void setOutputFile(File params) { - setDestFile(params); - } - - - /** - * If true, enables the unsafe keyword. - * - *@param unsafe The new Unsafe value - */ - public void setUnsafe(boolean unsafe) { - this.unsafe = unsafe; - } - - - /** - * query the Unsafe attribute - * - *@return The Unsafe value - */ - public boolean getUnsafe() { - return this.unsafe; - } - - - /** - * get the argument or null for no argument needed - * - *@return The Unsafe Parameter to CSC - */ - protected String getUnsafeParameter() { - return unsafe ? "/unsafe" : null; - } - - - /** - * A flag that tells the compiler not to read in the compiler - * settings files 'csc.rsp' in its bin directory and then the local directory - * - *@param enabled The new noConfig value - */ - public void setNoConfig(boolean enabled) { - noconfig = enabled; - } - - - /** - * Gets the noConfigParameter attribute of the CSharp object - * - *@return The noConfigParameter value - */ - protected String getNoConfigParameter() { - return noconfig ? "/noconfig" : null; - } - - - /** - * Semicolon separated list of defined constants. - * - *@param params The new definitions value - */ - public void setDefinitions(String params) { - definitions = params; - } - - /** - * override the superclasses version of this method (which we call) - * with a check for a definitions attribute, the contents of which - * are appended to the list. - *@return The Definitions Parameter to CSC - */ - protected String getDefinitionsParameter() { - String predecessors = super.getDefinitionsParameter(); - if (notEmpty(definitions)) { - if (predecessors == null) { - predecessors = "/define:"; - } - return predecessors + definitions; - } else { - return predecessors; - } - } - - - /** - * add Commands unique to C#. - * @param command ongoing command - */ - public void addCompilerSpecificOptions(NetCommand command) { - command.addArgument(getIncludeDefaultReferencesParameter()); - command.addArgument(getWarnLevelParameter()); - command.addArgument(getDocFileParameter()); - command.addArgument(getFullPathsParameter()); - command.addArgument(getFileAlignParameter()); - command.addArgument(getIncrementalParameter()); - command.addArgument(getNoConfigParameter()); - command.addArgument(getUnsafeParameter()); - } - - // end execute - - /** - * Returns the delimiter which C# uses to separate references, i.e., a semi colon. - * @return the delimiter. - */ - public String getReferenceDelimiter() { - return ";"; - } - - - /** - * This method indicates the filename extension for C# files. - * @return the file extension for C#, i.e., "cs" (without the dot). - */ - public String getFileExtension() { - return "cs"; - } - - /** - * Build a C# style parameter. - * @param command the command. - * @param resource the resource. - */ - protected void createResourceParameter( - NetCommand command, DotnetResource resource) { - resource.getParameters(getProject(), command, true); - } - -} - diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java deleted file mode 100644 index 21a300f7c..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.DirectoryScanner; - -import java.io.File; -import java.util.Vector; -import java.util.Hashtable; -import java.util.Enumeration; - -/** - * refactoring of some stuff so that different things (like ILASM) - * can use shared code. - */ -public class DotnetBaseMatchingTask extends MatchingTask { - // CheckStyle:VisibilityModifier OFF - bc - /** - * output file. If not supplied this is derived from the source file - */ - protected File outputFile; - /** - * filesets of file to compile - */ - protected Vector filesets = new Vector(); - - /** - * source directory upon which the search pattern is applied - */ - protected File srcDir; - - /** - * Are we running on Windows? - * - * @since Ant 1.6.3 - */ - // CheckStyle:ConstantNameCheck OFF - bc - protected static final boolean isWindows = Os.isFamily("windows"); - - // CheckStyle:ConstantNameCheck ON - // CheckStyle:VisibilityModifier ON - - /** - * Overridden because we need to be able to set the srcDir. - * @return the source directory. - */ - public File getSrcDir() { - return this.srcDir; - } - - /** - * Set the source directory of the files to be compiled. - * - *@param srcDirName The new SrcDir value - */ - public void setSrcDir(File srcDirName) { - this.srcDir = srcDirName; - } - - /** - * Set the name of exe/library to create. - * - *@param file The new outputFile value - */ - public void setDestFile(File file) { - outputFile = file; - } - - /** - * add a new source directory to the compile - * @param src a fileset. - */ - public void addSrc(FileSet src) { - filesets.add(src); - } - - /** - * get the destination file - * @return the dest file or null for not assigned - */ - public File getDestFile() { - return outputFile; - } - - /** - * create the list of files - * @param command the command to create the files for. - * @param filesToBuild vector to add files to - * @param outputTimestamp timestamp to compare against - * @return number of files out of date - */ - protected int buildFileList(NetCommand command, Hashtable filesToBuild, long outputTimestamp) { - int filesOutOfDate = 0; - boolean scanImplicitFileset - = getSrcDir() != null || filesets.size() == 0; - if (scanImplicitFileset) { - //scan for an implicit fileset if there was a srcdir set - //or there was no srcDir set but there was no contained classes - if (getSrcDir() == null) { - //if there is no src dir here, set it - setSrcDir(getProject().resolveFile(".")); - } - log("working from source directory " + getSrcDir(), - Project.MSG_VERBOSE); - //get dependencies list. - DirectoryScanner scanner = getDirectoryScanner(getSrcDir()); - filesOutOfDate = command.scanOneFileset(scanner, - filesToBuild, outputTimestamp); - } - //get any included source directories - for (int i = 0; i < filesets.size(); i++) { - FileSet fs = (FileSet) filesets.elementAt(i); - filesOutOfDate += command.scanOneFileset( - fs.getDirectoryScanner(getProject()), - filesToBuild, - outputTimestamp); - } - - return filesOutOfDate; - } - - /** - * add the list of files to a command - * @param filesToBuild vector of files - * @param command the command to append to - */ - protected void addFilesToCommand(Hashtable filesToBuild, NetCommand command) { - int count = filesToBuild.size(); - log("compiling " + count + " file" + ((count == 1) ? "" : "s"), - Project.MSG_VERBOSE); - Enumeration files = filesToBuild.elements(); - while (files.hasMoreElements()) { - File file = (File) files.nextElement(); - command.addArgument(file.toString()); - } - } - - /** - * determine the timestamp of the output file - * @return a timestamp or 0 for no output file known/exists - */ - protected long getOutputFileTimestamp() { - long outputTimestamp; - if (getDestFile() != null && getDestFile().exists()) { - outputTimestamp = getDestFile().lastModified(); - } else { - outputTimestamp = 0; - } - return outputTimestamp; - } - - /** - * finish off the command by adding all dependent files, execute - * @param command the command to update. - * @param ignoreTimestamps not used. - */ - protected void addFilesAndExecute(NetCommand command, boolean ignoreTimestamps) { - long outputTimestamp = getOutputFileTimestamp(); - Hashtable filesToBuild = new Hashtable(); - int filesOutOfDate = buildFileList(command, filesToBuild, outputTimestamp); - - //now run the command of exe + settings + files - if (filesOutOfDate > 0) { - //add the files to the command - addFilesToCommand(filesToBuild, command); - command.runCommand(); - } else { - log("output file is up to date", Project.MSG_VERBOSE); - } - } - - - -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java deleted file mode 100644 index c67c73129..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ /dev/null @@ -1,996 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -/* - * build notes - * -The reference CD to listen to while editing this file is - * nap:Cream+Live+2001+CD+2 - */ - -// place in the optional ant tasks package -// but in its own dotnet group - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -// imports - -import java.io.File; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Hashtable; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.EnumeratedAttribute; - - -/** - * Abstract superclass for dotnet compiler tasks. - * - * History - * - * - * - * - * - * - * - *
    - * 0.1 - * - * First creation - * - * Most of the code here was copied verbatim from v0.3 of - * Steve Loughran's CSharp optional task. Abstracted functionality - * to allow subclassing of other dotnet compiler types. - *
    - * - * - * @version 0.1 - */ - -public abstract class DotnetCompile - extends DotnetBaseMatchingTask { - - private static final int DEFAULT_WARN_LEVEL = 3; - - /** - * list of reference classes. (pretty much a classpath equivalent) - */ - private String references; - - /** - * flag to enable automatic reference inclusion - */ - private boolean includeDefaultReferences = true; - - /** - * icon for incorporation into apps - */ - private File win32icon; - - /** - * icon for incorporation into apps - */ - private File win32res; - - /** - * flag to control action on execution trouble - */ - private boolean failOnError; - - /** - * using the path approach didn't work as it could not handle the implicit - * execution path. Perhaps that could be extracted from the runtime and - * then the path approach would be viable - */ - private Path referenceFiles; - - /** - * optimise flag - */ - private boolean optimize; - - // CheckStyle:VisibilityModifier OFF - bc - /** - * a list of definitions to support; - */ - protected Vector definitionList = new Vector(); - - /** - * our resources - */ - protected Vector resources = new Vector(); - - /** - * executable - */ - - protected String executable; - - protected static final String REFERENCE_OPTION = "/reference:"; - - /** - * debug flag. Controls generation of debug information. - */ - protected boolean debug; - - /** - * warning level: 0-4, with 4 being most verbose - */ - private int warnLevel; - - /** - * main class (or null for automatic choice) - */ - protected String mainClass; - - /** - * any extra command options? - */ - protected String extraOptions; - - /** - * type of target. Should be one of exe|library|module|winexe|(null) - * default is exe; the actual value (if not null) is fed to the command - * line.
    - * See /target - */ - protected String targetType; - - /** - * utf out flag - */ - - protected boolean utf8output = false; - - /** - * list of extra modules to refer to - */ - protected String additionalModules; - /** - * filesets of references - */ - protected Vector referenceFilesets = new Vector(); - - /** - * flag to set to to use @file based command cache - */ - private boolean useResponseFile = false; - private static final int AUTOMATIC_RESPONSE_FILE_THRESHOLD = 64; - - // CheckStyle:VisibilityModifier ON - - /** - * constructor inits everything and set up the search pattern - */ - - public DotnetCompile() { - clear(); - setIncludes(getFilePattern()); - } - - /** - * reset all contents. - */ - public void clear() { - targetType = null; - win32icon = null; - srcDir = null; - mainClass = null; - warnLevel = DEFAULT_WARN_LEVEL; - optimize = false; - debug = true; - references = null; - failOnError = true; - additionalModules = null; - includeDefaultReferences = true; - extraOptions = null; - } - - - /** - * Semicolon separated list of DLLs to refer to. - * - *@param s The new References value - */ - public void setReferences(String s) { - references = s; - } - - - /** - * get the reference string or null for no argument needed - * - *@return The References Parameter to CSC - */ - protected String getReferencesParameter() { - //bail on no references - if (notEmpty(references)) { - if (isWindows) { - return '\"' + REFERENCE_OPTION + references + '\"'; - } else { - return REFERENCE_OPTION + references; - } - } else { - return null; - } - } - - /** - * Path of references to include. - * Wildcards should work. - * - *@param path another path to append - */ - public void setReferenceFiles(Path path) { - //demand create pathlist - if (referenceFiles == null) { - referenceFiles = new Path(this.getProject()); - } - referenceFiles.append(path); - } - - /** - * add a new reference fileset to the compilation - * @param reference the files to use. - */ - public void addReference(FileSet reference) { - referenceFilesets.add(reference); - } - - - - /** - * turn the path list into a list of files and a /references argument - * - *@return null or a string of references. - */ - protected String getReferenceFilesParameter() { - //bail on no references - if (references == null) { - return null; - } - //iterate through the ref list & generate an entry for each - //or just rely on the fact that the toString operator does this, but - //noting that the separator is ';' on windows, ':' on unix - - //bail on no references listed - if (references.length() == 0) { - return null; - } - - StringBuffer s = new StringBuffer(REFERENCE_OPTION); - if (isWindows) { - s.append('\"'); - } - s.append(references); - if (isWindows) { - s.append('\"'); - } - return s.toString(); - } - - - /** - * If true, automatically includes the common assemblies - * in dotnet, and tells the compiler to link in mscore.dll. - * - * set the automatic reference inclusion flag on or off this flag controls - * the /nostdlib option in CSC - * - *@param f on/off flag - */ - public void setIncludeDefaultReferences(boolean f) { - includeDefaultReferences = f; - } - - - /** - * query automatic reference inclusion flag - * - *@return true if flag is turned on - */ - public boolean getIncludeDefaultReferences() { - return includeDefaultReferences; - } - - - /** - * get the include default references flag or null for no argument needed - * - *@return The Parameter to CSC - */ - protected String getIncludeDefaultReferencesParameter() { - return "/nostdlib" + (includeDefaultReferences ? "-" : "+"); - } - - - - /** - * If true, enables optimization flag. - * - *@param f on/off flag - */ - public void setOptimize(boolean f) { - optimize = f; - } - - - /** - * query the optimise flag - * - *@return true if optimise is turned on - */ - public boolean getOptimize() { - return optimize; - } - - - /** - * get the optimise flag or null for no argument needed - * - *@return The Optimize Parameter to CSC - */ - protected String getOptimizeParameter() { - return "/optimize" + (optimize ? "+" : "-"); - } - - - /** - * set the debug flag on or off. - * - *@param f on/off flag - */ - public void setDebug(boolean f) { - debug = f; - } - - - /** - * query the debug flag - * - *@return true if debug is turned on - */ - public boolean getDebug() { - return debug; - } - - - /** - * get the debug switch argument - * - *@return The Debug Parameter to CSC - */ - protected String getDebugParameter() { - return "/debug" + (debug ? "+" : "-"); - } - - - /** - * Level of warning currently between 1 and 4 - * with 4 being the strictest. - * - *@param warnLevel warn level -see .net docs for valid range (probably - * 0-4) - */ - public void setWarnLevel(int warnLevel) { - this.warnLevel = warnLevel; - } - - - /** - * query warn level - * - *@return current value - */ - public int getWarnLevel() { - return warnLevel; - } - - - /** - * get the warn level switch - * - *@return The WarnLevel Parameter to CSC - */ - protected String getWarnLevelParameter() { - return "/warn:" + warnLevel; - } - - - /** - * Sets the name of main class for executables. - * - *@param mainClass The new MainClass value - */ - public void setMainClass(String mainClass) { - this.mainClass = mainClass; - } - - - /** - * Gets the MainClass attribute - * - *@return The MainClass value - */ - public String getMainClass() { - return this.mainClass; - } - - - /** - * get the /main argument or null for no argument needed - * - *@return The MainClass Parameter to CSC - */ - protected String getMainClassParameter() { - if (mainClass != null && mainClass.length() != 0) { - return "/main:" + mainClass; - } else { - return null; - } - } - - - /** - * Any extra options which are not explicitly supported - * by this task. - * - *@param extraOptions The new ExtraOptions value - */ - public void setExtraOptions(String extraOptions) { - this.extraOptions = extraOptions; - } - - - /** - * Gets the ExtraOptions attribute - * - *@return The ExtraOptions value - */ - public String getExtraOptions() { - return this.extraOptions; - } - - - /** - * get any extra options or null for no argument needed - * - *@return The ExtraOptions Parameter to CSC - */ - protected String getExtraOptionsParameter() { - if (extraOptions != null && extraOptions.length() != 0) { - return extraOptions; - } else { - return null; - } - } - - /** - * get any extra options or null for no argument needed, split - * them if they represent multiple options. - * - * @return The ExtraOptions Parameter to CSC - */ - protected String[] getExtraOptionsParameters() { - String extra = getExtraOptionsParameter(); - return extra == null ? null : Commandline.translateCommandline(extra); - } - - /** - * Set the destination directory of files to be compiled. - * - *@param dirName The new DestDir value - */ - public void setDestDir(File dirName) { - log("DestDir currently unused", Project.MSG_WARN); - } - - - /** - * set the target type to one of exe|library|module|winexe - * @param targetType the enumerated value. - */ - public void setTargetType(TargetTypes targetType) { - this.targetType = targetType.getValue(); - } - /** - * Set the type of target. - * - *@param ttype The new TargetType value - *@exception BuildException if target is not one of - * exe|library|module|winexe - */ - public void setTargetType(String ttype) - throws BuildException { - ttype = ttype.toLowerCase(); - if (ttype.equals("exe") || ttype.equals("library") - || ttype.equals("module") || ttype.equals("winexe")) { - targetType = ttype; - } else { - throw new BuildException("targetType " + ttype - + " is not one of 'exe', 'module', 'winexe' or 'library'"); - } - } - - - /** - * Gets the TargetType attribute - * - *@return The TargetType value - */ - public String getTargetType() { - return targetType; - } - - - /** - * get the argument or null for no argument needed - * - *@return The TargetType Parameter to CSC - */ - protected String getTargetTypeParameter() { - if (notEmpty(targetType)) { - return "/target:" + targetType; - } else { - return null; - } - } - - - /** - * Set the filename of icon to include. - * - *@param fileName path to the file. Can be relative, absolute, whatever. - */ - public void setWin32Icon(File fileName) { - win32icon = fileName; - } - - - /** - * get the argument or null for no argument needed - * - *@return The Win32Icon Parameter to CSC - */ - protected String getWin32IconParameter() { - if (win32icon != null) { - return "/win32icon:" + win32icon.toString(); - } else { - return null; - } - } - - - /** - * Sets the filename of a win32 resource (.RES) file to include. - * This is not a .NET resource, but what Windows is used to. - * - *@param fileName path to the file. Can be relative, absolute, whatever. - */ - public void setWin32Res(File fileName) { - win32res = fileName; - } - - /** - * Gets the file of the win32 .res file to include. - * @return path to the file. - */ - public File getWin32Res() { - return win32res; - } - - - /** - * get the argument or null for no argument needed - * - *@return The Win32Res Parameter to CSC - */ - protected String getWin32ResParameter() { - if (win32res != null) { - return "/win32res:" + win32res.toString(); - } else { - return null; - } - } - - - /** - * If true, require all compiler output to be in UTF8 format. - * - *@param enabled The new utf8Output value - */ - public void setUtf8Output(boolean enabled) { - utf8output = enabled; - } - - - /** - * Gets the utf8OutpuParameter attribute of the CSharp object - * - *@return The utf8OutpuParameter value - */ - protected String getUtf8OutputParameter() { - return utf8output ? "/utf8output" : null; - } - - - /** - * add a define to the list of definitions - * @param define the define value. - */ - public void addDefine(DotnetDefine define) { - definitionList.addElement(define); - } - - - /** - * get a list of definitions or null - * @return a string beginning /D: or null for no definitions - * @throws BuildException if there is an error. - */ - protected String getDefinitionsParameter() throws BuildException { - StringBuffer defines = new StringBuffer(); - Enumeration defEnum = definitionList.elements(); - boolean firstDefinition = true; - while (defEnum.hasMoreElements()) { - //loop through all definitions - DotnetDefine define = (DotnetDefine) defEnum.nextElement(); - if (define.isSet(this)) { - //add those that are set, and a delimiter - if (!firstDefinition) { - defines.append(getDefinitionsDelimiter()); - } - defines.append(define.getValue(this)); - firstDefinition = false; - } - } - if (defines.length() == 0) { - return null; - } else { - return "/d:" + defines; - } - } - - - /** - * Semicolon separated list of modules to refer to. - * - *@param params The new additionalModules value - */ - public void setAdditionalModules(String params) { - additionalModules = params; - } - - - /** - * get the argument or null for no argument needed - * - *@return The AdditionalModules Parameter to CSC - */ - protected String getAdditionalModulesParameter() { - if (notEmpty(additionalModules)) { - return "/addmodule:" + additionalModules; - } else { - return null; - } - } - - - /** - * get the argument or null for no argument needed - * - *@return The OutputFile Parameter to CSC - */ - protected String getDestFileParameter() { - if (outputFile != null) { - return "/out:" + outputFile.toString(); - } else { - return null; - } - } - - - /** - * If true, fail on compilation errors. - * - *@param b The new FailOnError value - */ - public void setFailOnError(boolean b) { - failOnError = b; - } - - - /** - * query fail on error flag - * - *@return The FailFailOnError value - */ - public boolean getFailOnError() { - return failOnError; - } - - /** - * link or embed a resource - * @param resource the resource to use. - */ - public void addResource(DotnetResource resource) { - resources.add(resource); - } - - /** - * This method gets the name of the executable. - * @return the name of the executable - */ - protected String getExecutable() { - return executable; - } - - /** - * set the name of the program, overriding the defaults. - * Can be used to set the full path to a program, or to switch - * to an alternate implementation of the command, such as the Mono or Rotor - * versions -provided they use the same command line arguments as the - * .NET framework edition - * @param executable the name of the program. - */ - public void setExecutable(String executable) { - this.executable = executable; - } - - /** - * test for a string containing something useful - * - *@param s string in - *@return true if the argument is not null or empty - */ - protected boolean notEmpty(String s) { - return s != null && s.length() != 0; - } - - /** - * validation code - * @throws BuildException if validation failed - */ - protected void validate() - throws BuildException { - if (outputFile != null && outputFile.isDirectory()) { - throw new BuildException("destFile cannot be a directory"); - } - if (getExecutable() == null) { - throw new BuildException("There is no executable defined for this task"); - } - } - - /** - * Get the pattern for files to compile. - * @return The compilation file pattern. - */ - public String getFilePattern() { - return "**/*." + getFileExtension(); - } - - /** - * getter for flag - * @return The flag indicating whether the compilation is using a response file. - */ - public boolean isUseResponseFile() { - return useResponseFile; - } - - /** - * Flag to turn on response file use; default=false. - * When set the command params are saved to a file and - * this is passed in with @file. The task automatically switches - * to this mode with big commands; this option is here for - * testing and emergencies - * @param useResponseFile a boolean value. - */ - public void setUseResponseFile(boolean useResponseFile) { - this.useResponseFile = useResponseFile; - } - - /** - * do the work by building the command line and then calling it - * - *@throws BuildException if validation or execution failed - */ - public void execute() - throws BuildException { - log("This task is deprecated and will be removed in a future version\n" - + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/dotnet/index.html", - Project.MSG_WARN); - - validate(); - NetCommand command = createNetCommand(); - //set up response file options - command.setAutomaticResponseFileThreshold(AUTOMATIC_RESPONSE_FILE_THRESHOLD); - command.setUseResponseFile(useResponseFile); - //fill in args - fillInSharedParameters(command); - addResources(command); - addCompilerSpecificOptions(command); - int referencesOutOfDate - = addReferenceFilesets(command, getOutputFileTimestamp()); - //if the refs are out of date, force a build. - boolean forceBuild = referencesOutOfDate > 0; - addFilesAndExecute(command, forceBuild); - - } - - /** - * Get the delimiter that the compiler uses between references. - * For example, c# will return ";"; VB.NET will return "," - * @return The string delimiter for the reference string. - */ - public abstract String getReferenceDelimiter(); - - /** - * Get the extension of filenames to compile. - * @return The string extension of files to compile. - */ - public abstract String getFileExtension(); - - - /** - * fill in the common information - * @param command the net command. - */ - protected void fillInSharedParameters(NetCommand command) { - command.setFailOnError(getFailOnError()); - //fill in args - command.addArgument("/nologo"); - command.addArgument(getAdditionalModulesParameter()); - command.addArgument(getDebugParameter()); - command.addArgument(getDefinitionsParameter()); - command.addArguments(getExtraOptionsParameters()); - command.addArgument(getMainClassParameter()); - command.addArgument(getOptimizeParameter()); - command.addArgument(getDestFileParameter()); - command.addArgument(getReferencesParameter()); - command.addArgument(getTargetTypeParameter()); - command.addArgument(getUtf8OutputParameter()); - command.addArgument(getWin32IconParameter()); - command.addArgument(getWin32ResParameter()); - } - - /** - * for every resource declared, we get the (language specific) - * resource setting - * @param command the net command. - */ - protected void addResources(NetCommand command) { - Enumeration e = resources.elements(); - while (e.hasMoreElements()) { - DotnetResource resource = (DotnetResource) e.nextElement(); - createResourceParameter(command, resource); - } - } - - /** - * Build a C# style parameter. - * @param command the command. - * @param resource the resource. - */ - protected abstract void createResourceParameter(NetCommand command, DotnetResource resource); - - - /** - * run through the list of reference files and add them to the command - * @param command the command to use. - * @param outputTimestamp timestamp to compare against - * @return number of files out of date - */ - - protected int addReferenceFilesets(NetCommand command, long outputTimestamp) { - int filesOutOfDate = 0; - Hashtable filesToBuild = new Hashtable(); - for (int i = 0; i < referenceFilesets.size(); i++) { - FileSet fs = (FileSet) referenceFilesets.elementAt(i); - filesOutOfDate += command.scanOneFileset( - fs.getDirectoryScanner(getProject()), - filesToBuild, - outputTimestamp); - } - //bail out early if there were no files - if (filesToBuild.size() == 0) { - return 0; - } - //now scan the hashtable and add the files - Enumeration files = filesToBuild.elements(); - while (files.hasMoreElements()) { - File file = (File) files.nextElement(); - if (isFileManagedBinary(file)) { - if (isWindows) { - command.addArgument( - '"' + REFERENCE_OPTION + file.toString() + '"'); - } else { - command.addArgument(REFERENCE_OPTION + file.toString()); - } - } else { - log("ignoring " + file + " as it is not a managed executable", - Project.MSG_VERBOSE); - } - - } - - return filesOutOfDate; - } - - /** - * create our helper command - * @return a command prefilled with the exe name and task name - */ - protected NetCommand createNetCommand() { - NetCommand command = new NetCommand(this, getTaskName(), getExecutable()); - return command; - } - - /** - * add any compiler specifics - * @param command the command to use. - */ - protected abstract void addCompilerSpecificOptions(NetCommand command); - - /** - * override point for delimiting definitions. - * @return The definitions limiter, i.e., ";" - */ - public String getDefinitionsDelimiter() { - return ";"; - } - - - /** - * test for a file being managed or not - * @param file the file to test. - * @return true if we think this is a managed executable, and thus OK - * for linking - * @todo look at the PE header of the exe and see if it is managed or not. - */ - protected static boolean isFileManagedBinary(File file) { - String filename = file.toString().toLowerCase(); - return filename.endsWith(".exe") || filename.endsWith(".dll") - || filename.endsWith(".netmodule"); - } - - /** - * Target types to build. - * valid build types are exe|library|module|winexe - */ - public static class TargetTypes extends EnumeratedAttribute { - /** {@inheritDoc}. */ - public String[] getValues() { - return new String[] { - "exe", - "library", - "module", - "winexe" - }; - } - } - - -} - - diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java deleted file mode 100644 index 6de336f2f..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; - -/** - * definitions can be conditional. What .NET conditions can not be - * is in any state other than defined and undefined; you cannot give - * a definition a value. - */ -public class DotnetDefine { - private String name; - private String ifCond; - private String unlessCond; - - - /** - * the name of a property which must be defined for - * the definition to be set. Optional. - * @param condition the name of the property - */ - public void setIf(String condition) { - this.ifCond = condition; - } - - /** - * the name of a property which must be undefined for - * the definition to be set. Optional. - * @param condition the name of the property - */ - public void setUnless(String condition) { - this.unlessCond = condition; - } - - /** - * Get the name of the definition. - * @return the name. - */ - public String getName() { - return name; - } - - /** - * the name of the definition. Required. - * @param name the name value. - */ - public void setName(String name) { - this.name = name; - } - - /** - * This method gets the value of this definition. Will be null if a condition - * was declared and not met - * @param owner owning task - * @return The value of the definition. - * @throws BuildException if there is an error. - */ - public String getValue(Task owner) throws BuildException { - if (name == null) { - throw new BuildException("No name provided for the define element", - owner.getLocation()); - } - if (!isSet(owner)) { - return null; - } - return name; - } - - - /** - * logic taken from patternset - * @param owner the owning task. - * @return true if the condition is valid - */ - public boolean isSet(Task owner) { - Project p = owner.getProject(); - if (ifCond != null && p.getProperty(ifCond) == null) { - return false; - } else if (unlessCond != null && p.getProperty(unlessCond) != null) { - return false; - } - return true; - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java deleted file mode 100644 index 0ca4f61dd..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.BuildException; - -import java.io.File; -import java.util.ArrayList; -import org.apache.tools.ant.types.FileSet; -import java.util.Iterator; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.DirectoryScanner; - -/** - * Used by {@link DotnetCompile} to name resources. - * Could be upgraded to a datatype in the distant future. - * A resource maps to /res:file,name - */ -public class DotnetResource { - - /** - * name of resource - */ - private File file; - - /** - * embed (default) or link the resource - */ - private boolean embed = true; - - /** - * this is used in VBC and JSC - */ - private Boolean isPublic = null; - - /** - * name of the object - */ - private String name = null; - - /** - * A list of filesets with resources. - */ - private ArrayList fileSets = new ArrayList(); - - /** - * a namespace to be used with - */ - private String namespace = null; - - /** - * Return the embed attribute. - * @return the embed value. - */ - public boolean isEmbed() { - return embed; - } - - /** - * embed the resource in the assembly (default, true) or just link to it. - * - * @param embed a boolean value. - */ - public void setEmbed(boolean embed) { - this.embed = embed; - } - - /** - * The file resource. - * @return the file resource. - */ - public File getFile() { - return file; - } - - /** - * name the resource - * - * @param file the file. - */ - public void setFile(File file) { - this.file = file; - } - - /** - * Get the public attribute. - * @return the public attribute. - */ - public Boolean getPublic() { - return isPublic; - } - - /** - * VB and J# only: is a resource public or not? - * - * @param aPublic a boolean value. - */ - public void setPublic(Boolean aPublic) { - isPublic = aPublic; - } - - /** - * The name of the resource. - * @return the name of the resource. - */ - public String getName() { - return name; - } - - /** - * should the resource have a name? - * - * @param name the name of the resource. - */ - public void setName(String name) { - this.name = name; - } - - /** - * Filesets root namespace. The value always ends with '.' . - * - * @return String namespace name - */ - public String getNamespace() { - return namespace; - } - - /** - * Sets filesets root namespace. - * - * @param namespace - * String root namespace - */ - public void setNamespace(String namespace) { - if (namespace == null) { - this.namespace = null; - } else { - this.namespace = (namespace.length() == 0 || namespace.endsWith(".") ? namespace - : namespace + '.'); - } - } - - private void checkParameters() { - if (hasFilesets()) { - if (getName() != null) { - throw new BuildException( - "Cannot use attribute with filesets"); - } - if (getFile() != null) { - throw new BuildException( - "Cannot use attribute with filesets"); - } - } else { - if (getNamespace() != null) { - throw new BuildException( - "Cannot use attribute without filesets"); - } - } - } - - /** - * build the C# style parameter (which has no public/private option) - * @param p the current project. - * @param command the command. - * @param csharpStyle a boolean attribute. - */ - public void getParameters(Project p, NetCommand command, boolean csharpStyle) { - checkParameters(); - if (hasFilesets()) { - for (Iterator listIter = fileSets.iterator(); listIter.hasNext();) { - FileSet fs = (FileSet) listIter.next(); - String baseDirectory = fs.getDir(p).toString(); - String namespace = getNamespace(); // ends with '.' or null - DirectoryScanner ds = fs.getDirectoryScanner(p); - String[] files = ds.getIncludedFiles(); - for (int i = 0; i < files.length; i++) { - String file = files[i]; - command.addArgument(getParameter(baseDirectory + File.separatorChar + file, - (namespace == null ? null : namespace - + file.replace(File.separatorChar, '.')), csharpStyle)); - } - } - } else { - command.addArgument(getParameter(getFile().toString(), getName(), csharpStyle)); - } - } - - private String getParameter(String fileName, String name, boolean csharpStyle) { - StringBuffer buffer = new StringBuffer(); - buffer.append(isEmbed() ? "/resource" : "/linkresource"); - buffer.append(':'); - buffer.append(fileName); - if (name != null) { - buffer.append(','); - buffer.append(name); - if (csharpStyle) { - if (getPublic() != null) { - throw new BuildException("This compiler does not support the " - + "public/private option."); - } else { - if (getPublic() != null) { - buffer.append(','); - buffer.append(getPublic().booleanValue() ? "public" : "private"); - - } - } - } else if (getPublic() != null) { - throw new BuildException("You cannot have a public or private " - + "option without naming the resource"); - } - } - return buffer.toString(); - } - - /** - * Adds a resource file set. - * - * @param fileset - * FileSet - */ - public void addFileset(FileSet fileset) { - fileSets.add(fileset); - } - - /** - * Checks that node has embedded - * - * @return boolean - */ - public boolean hasFilesets() { - return fileSets.size() > 0; - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java deleted file mode 100644 index cc6a49d02..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ /dev/null @@ -1,540 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -/* - * build notes - * -The reference CD to listen to while editing this file is - * nap: Underworld - Everything, Everything - */ - -package org.apache.tools.ant.taskdefs.optional.dotnet; - - -import java.io.File; -import java.util.Vector; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.FileSet; - -/** - * Assembles .NET Intermediate Language files. - * ilasm.exe must be on the execute path, unless another executable - * or the full path to that executable is specified in the executable - * parameter - *

    - * - *

    - * - * All parameters are optional: <il/> should suffice to produce a debug - * build of all *.il files. The option set is roughly compatible with the - * CSharp class; even though the command line options are only vaguely - * equivalent. [The low level commands take things like /OUT=file, csc wants - * /out:file ... /verbose is used some places; /quiet here in ildasm... etc.] - * It would be nice if someone made all the command line tools consistent (and - * not as brittle as the java cmdline tools)

    - *

    - * The task is a directory based task, so attributes like includes="*.il" - * and excludes="broken.il" can be used to control the files pulled - * in. You can also use nested <src> filesets to refer to source. - *

    - * - * @ant.task name="ilasm" category="dotnet" - */ - -public class Ilasm - extends DotnetBaseMatchingTask { - - // CheckStyle:VisibilityModifier OFF - bc - // CheckStyle:ConstantNameCheck OFF - bc - /** - * Name of the executable. The .exe suffix is deliberately not included in - * anticipation of the unix version - */ - protected static final String exe_name = "ilasm"; - - /** - * what is the file extension we search on? - */ - protected static final String file_ext = "il"; - - /** - * and now derive the search pattern from the extension - */ - protected static final String file_pattern = "**/*." + file_ext; - - /** - * title of task for external presentation - */ - protected static final String exe_title = "ilasm"; - - /** - * type of target. Should be one of exe|library|module|winexe|(null) - * default is exe; the actual value (if not null) is fed to the command - * line.
    - * See /target - */ - protected String targetType; - - /** - * verbose flag - */ - protected boolean verbose; - - /** - * listing flag - */ - - protected boolean listing; - - /** - * resource file (.res format) to include in the app. - */ - protected File resourceFile; - - /** - * flag to control action on execution trouble - */ - protected boolean failOnError; - - /** - * debug flag. Controls generation of debug information. - */ - protected boolean debug; - - /** - * file containing private key - */ - - private File keyfile; - - /** - * any extra command options? - */ - protected String extraOptions; - - /** - * filesets of references - */ - protected Vector referenceFilesets = new Vector(); - - // CheckStyle:ConstantNameCheck ON - // CheckStyle:VisibilityModifier ON - - /** - * @since Ant 1.7 - */ - private boolean isMono = !Os.isFamily("windows"); - - /** - * constructor inits everything and set up the search pattern - */ - public Ilasm() { - Clear(); - setIncludes(file_pattern); - } - - // CheckStyle:MethodNameCheck OFF - bc - /** - * reset all contents. - */ - public void Clear() { - targetType = null; - srcDir = null; - listing = false; - verbose = false; - debug = true; - outputFile = null; - failOnError = true; - resourceFile = null; - extraOptions = null; - } - // CheckStyle:MethodNameCheck ON - - - - /** - * Sets the type of target, either "exe" or "library". - * - *@param targetType one of exe|library| - *@exception BuildException if target is not one of - * exe|library - */ - public void setTargetType(String targetType) - throws BuildException { - this.targetType = targetType.toLowerCase(); - if (!targetType.equals("exe") && !targetType.equals("library")) { - throw new BuildException("targetType " + targetType + " is not a valid type"); - } - } - - - /** - * accessor method for target type - * - *@return the current target option - */ - public String getTargetType() { - return targetType; - } - - - /** - * g get the target type or null for no argument needed - * - *@return The TargetTypeParameter value - */ - - protected String getTargetTypeParameter() { - if (!notEmpty(targetType)) { - return null; - } - if (targetType.equals("exe")) { - return "/exe"; - } else if (targetType.equals("library")) { - return "/dll"; - } else { - return null; - } - } - - - /** - * Sets the Owner attribute. - * - * @param s The new Owner value - * @ant.attribute ignore="true" - */ - public void setOwner(String s) { - log("This option is not supported by ILASM as of Beta-2, " - + "and will be ignored", Project.MSG_WARN); - } - - - /** - * test for a string containing something useful - * - *@param s any string - *@return true if the argument is not null or empty - */ - protected boolean notEmpty(String s) { - return s != null && s.length() != 0; - } - - - /** - * If true, enable verbose ILASM output. - * - *@param b flag set to true for verbose on - */ - public void setVerbose(boolean b) { - verbose = b; - } - - - /** - * turn the verbose flag into a parameter for ILASM - * - *@return null or the appropriate command line string - */ - protected String getVerboseParameter() { - return verbose ? null : "/quiet"; - } - - - /** - * If true, produce a listing (off by default). - * - *@param b flag set to true for listing on - */ - public void setListing(boolean b) { - listing = b; - } - - - /** - * turn the listing flag into a parameter for ILASM - * - *@return the appropriate string from the state of the listing flag - */ - protected String getListingParameter() { - if (!isMono) { - return listing ? "/listing" : "/nolisting"; - } - return null; - } - - - /** - * Set the output file; identical to setDestFile - * @see DotnetBaseMatchingTask#setDestFile - *@param params The new outputFile value - */ - public void setOutputFile(File params) { - outputFile = params; - } - - - /** - * get the output file - * - *@return the argument string or null for no argument - */ - protected String getOutputFileParameter() { - if (outputFile == null) { - return null; - } - return "/output=" + outputFile.toString(); - } - - - /** - * name of resource file to include. - * - * @param fileName path to the file. Can be relative, absolute, whatever. - */ - public void setResourceFile(File fileName) { - resourceFile = fileName; - } - - - /** - * Gets the resourceFileParameter attribute of the Ilasm task - * - *@return The resourceFileParameter value - */ - protected String getResourceFileParameter() { - if (resourceFile != null) { - return "/resource=" + resourceFile.toString(); - } else { - return null; - } - } - - - /** - * If true, fails if ilasm tool fails. - * - *@param b The new failOnError value - */ - public void setFailOnError(boolean b) { - failOnError = b; - } - - - /** - * query fail on error flag - * - *@return The failFailOnError value - */ - public boolean getFailOnError() { - return failOnError; - } - - - /** - * set the debug flag on or off. - * - *@param f on/off flag - */ - public void setDebug(boolean f) { - debug = f; - } - - - /** - * query the debug flag - * - *@return true if debug is turned on - */ - public boolean getDebug() { - return debug; - } - - - /** - * get the argument or null for no argument needed - * - *@return The debugParameter value - */ - protected String getDebugParameter() { - return debug ? "/debug" : null; - } - - - /** - * the name of a file containing a private key. - * - *@param keyfile The new keyfile value - */ - public void setKeyfile(File keyfile) { - this.keyfile = keyfile; - } - - - /** - * get the argument or null for no argument needed - * - *@return The keyfileParameter value - */ - protected String getKeyfileParameter() { - if (keyfile != null) { - return "/keyfile:" + keyfile.toString(); - } else { - return null; - } - } - - - /** - * Any extra options which are not explicitly - * supported by this task. - * - *@param extraOptions The new ExtraOptions value - */ - public void setExtraOptions(String extraOptions) { - this.extraOptions = extraOptions; - } - - - /** - * Gets the ExtraOptions attribute - * - *@return The ExtraOptions value - */ - public String getExtraOptions() { - return this.extraOptions; - } - - - /** - * get any extra options or null for no argument needed - * - *@return The ExtraOptions Parameter to CSC - */ - protected String getExtraOptionsParameter() { - if (extraOptions != null && extraOptions.length() != 0) { - return extraOptions; - } else { - return null; - } - } - - /** - * set the target type to one of exe|library - * @param targetType the enumerated value. - */ - public void setTargetType(TargetTypes targetType) { - this.targetType = targetType.getValue(); - } - - /** - * Explicitly override the Mono auto-detection. - * - *

    Defaults to false on Windows and true on any other platform.

    - * @param b a boolean value. - * @since Ant 1.7 - */ - public void setMono(boolean b) { - isMono = b; - } - - /** - * This is the execution entry point. Build a list of files and call ilasm - * on each of them. - * - *@throws BuildException if the assembly failed and FailOnError is true - */ - public void execute() - throws BuildException { - log("This task is deprecated and will be removed in a future version\n" - + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/dotnet/index.html", - Project.MSG_WARN); - NetCommand command = buildIlasmCommand(); - - addFilesAndExecute(command, false); - - } - // end execute - - - /** - * build up our ilasm command - * @return - */ - private NetCommand buildIlasmCommand() { - NetCommand command = new NetCommand(this, exe_title, exe_name); - command.setFailOnError(getFailOnError()); - //fill in args - command.addArgument(getDebugParameter()); - command.addArgument(getTargetTypeParameter()); - command.addArgument(getListingParameter()); - command.addArgument(getOutputFileParameter()); - command.addArgument(getResourceFileParameter()); - command.addArgument(getVerboseParameter()); - command.addArgument(getKeyfileParameter()); - command.addArgument(getExtraOptionsParameter()); - - /* - * space for more argumentativeness - * command.addArgument(); - * command.addArgument(); - */ - return command; - } - - /** - * add a new reference fileset to the compilation - * @param reference the fileset to use. - */ - public void addReference(FileSet reference) { - referenceFilesets.add(reference); - } - - /** - * test for a file being managed or not - * @param file the file to test. - * @return true if we think this is a managed executable, and thus OK - * for linking - * @todo look at the PE header of the exe and see if it is managed or not. - */ - protected static boolean isFileManagedBinary(File file) { - String filename = file.toString().toLowerCase(); - return filename.endsWith(".exe") || filename.endsWith(".dll") - || filename.endsWith(".netmodule"); - } - - - /** - * Target types to build. - * valid build types are exe|library|module|winexe - */ - public static class TargetTypes extends EnumeratedAttribute { - /** {@inheritDoc}. */ - public String[] getValues() { - return new String[]{ - "exe", - "library", - }; - } - } - -} - diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java deleted file mode 100644 index 41b9a8a63..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java +++ /dev/null @@ -1,474 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; - -import java.io.File; - -/** - * Task to take a .NET or Mono -generated managed executable and turn it - * into ILASM assembly code. Useful when converting imported typelibs into - * assembler before patching and recompiling, as one has to do when doing - * advanced typelib work. - *

    - * As well as generating the named output file, the ildasm program - * will also generate resource files Icons.resources - * Message.resources and a .res file whose filename stub is derived - * from the source in ways to obscure to determine. - * There is no way to control whether or not these files are created, or where they are created - * (they are created in the current directory; their names come from inside the - * executable and may be those used by the original developer). This task - * creates the resources in the directory specified by resourceDir if - * set, else in the same directory as the destFile. - * - *

    - * This task requires the .NET SDK installed and ildasm on the path. - * To disassemble using alternate CLR systems, set the executable attribute - * to the name/path of the alternate implementation -one that must - * support all the classic ildasm commands. - * - *

    - * Dependency logic: the task executes the command if the output file is missing - * or older than the source file. It does not take into account changes - * in the options of the task, or timestamp differences in resource files. - * When the underlying ildasm executable fails for some reason, it leaves the - * .il file in place with some error message. To prevent this from confusing - * the dependency logic, the file specified by the dest - * attribute is always deleted after an unsuccessful build. - * @ant.task category="dotnet" - */ -public class Ildasm extends Task { - - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - - /** - * source file (mandatory) - */ - private File sourceFile; - - /** - * dest file (mandatory) - */ - private File destFile; - /** - * progress bar switch - */ - private boolean progressBar = false; - - /** - * what is our encoding - */ - private String encoding; - - /** - * /bytes flag for byte markup - */ - - private boolean bytes = false; - - /** - * line numbers? /linenum - */ - private boolean linenumbers = false; - - /** - * /raweh flag for raw exception handling - */ - private boolean rawExceptionHandling = false; - - /** - * show the source; /source - */ - private boolean showSource = false; - - /** - * /quoteallnames to quote all names - */ - private boolean quoteallnames = false; - - /** - * /header for header information - */ - private boolean header = false; - - /** - * when false, sets the /noil attribute - * to suppress assembly info - */ - private boolean assembler = true; - - /** - * include metadata - * /tokens - */ - - private boolean metadata = false; - - /** - * what visibility do we want. - * - */ - private String visibility; - - /** - * specific item to disassemble - */ - - private String item; - - /** - * override for the executable - */ - private String executable = "ildasm"; - - /** - * name of the directory for resources to be created. We cannot control - * their names, but we can say where they get created. If not set, the - * directory of the dest file is used - */ - private File resourceDir; - - - /** - * Set the name of the directory for resources to be created. We cannot control - * their names, but we can say where they get created. If not set, the - * directory of the dest file is used - * @param resourceDir the directory in which to create resources. - */ - public void setResourceDir(File resourceDir) { - this.resourceDir = resourceDir; - } - - /** - * override the name of the executable (normally ildasm) or set - * its full path. Do not set a relative path, as the ugly hacks - * needed to create resource files in the dest directory - * force us to change to this directory before running the application. - * i.e use <property location> to create an absolute path from a - * relative one before setting this value. - * @param executable the name of the executable to use. - */ - public void setExecutable(String executable) { - this.executable = executable; - } - - /** - * Select the output encoding: ascii, utf8 or unicode - * @param encoding the enumerated value. - */ - public void setEncoding(EncodingTypes encoding) { - this.encoding = encoding.getValue(); - } - - /** - * enable (default) or disable assembly language in the output - * @param assembler a boolean value. - */ - public void setAssembler(boolean assembler) { - this.assembler = assembler; - } - - /** - * enable or disable (default) the original bytes as comments - * @param bytes a boolean value. - */ - public void setBytes(boolean bytes) { - this.bytes = bytes; - } - - /** - * the output file (required) - * @param destFile the destination file. - */ - public void setDestFile(File destFile) { - this.destFile = destFile; - } - - /** - * include header information; default false. - * @param header a boolean value. - */ - public void setHeader(boolean header) { - this.header = header; - } - - /** - * name a single item to decode; a class or a method - * e.g item="Myclass::method" or item="namespace1::namespace2::Myclass:method(void(int32)) - * @param item the item to decode. - */ - public void setItem(String item) { - this.item = item; - } - - /** - * include line number information; default=false - * @param linenumbers a boolean value. - */ - public void setLinenumbers(boolean linenumbers) { - this.linenumbers = linenumbers; - } - - /** - * include metadata information - * @param metadata a boolean value. - */ - public void setMetadata(boolean metadata) { - this.metadata = metadata; - } - - /** - * show a graphical progress bar in a window during the process; off by default - * @param progressBar a boolean value. - */ - public void setProgressBar(boolean progressBar) { - this.progressBar = progressBar; - } - - /** - * quote all names. - * @param quoteallnames a boolean value. - */ - public void setQuoteallnames(boolean quoteallnames) { - this.quoteallnames = quoteallnames; - } - - /** - * enable raw exception handling (default = false) - * @param rawExceptionHandling a boolean value. - */ - public void setRawExceptionHandling(boolean rawExceptionHandling) { - this.rawExceptionHandling = rawExceptionHandling; - } - - /** - * include the source as comments (default=false) - * @param showSource a boolean value. - */ - public void setShowSource(boolean showSource) { - this.showSource = showSource; - } - - /** - * the file to disassemble -required - * @param sourceFile the file to disassemble. - */ - public void setSourceFile(File sourceFile) { - this.sourceFile = sourceFile; - } - - /** - * alternate name for sourceFile - * @param sourceFile the source file. - */ - public void setSrcFile(File sourceFile) { - setSourceFile(sourceFile); - } - /** - * This method sets the visibility options. It chooses one - * or more of the following, with + signs to concatenate them: - * 

    -     * pub : Public
-     * pri : Private
-     * fam : Family
-     * asm : Assembly
-     * faa : Family and Assembly
-     * foa : Family or Assembly
-     * psc : Private Scope
-     *
    - * e.g. visibility="pub+pri". - * Family means protected in C#; - * @param visibility the options to use. - */ - public void setVisibility(String visibility) { - this.visibility = visibility; - } - - /** - * verify that source and dest are ok - */ - private void validate() { - if (sourceFile == null || !sourceFile.exists() || !sourceFile.isFile()) { - throw new BuildException("invalid source"); - } - if (destFile == null || destFile.isDirectory()) { - throw new BuildException("invalid dest"); - } - if (resourceDir != null - && (!resourceDir.exists() || !resourceDir.isDirectory())) { - throw new BuildException("invalid resource directory"); - } - } - - /** - * Test for disassembly being needed; use existence and granularity - * correct date stamps - * @return true iff a rebuild is required. - */ - private boolean isDisassemblyNeeded() { - if (!destFile.exists()) { - log("Destination file does not exist: a build is required", - Project.MSG_VERBOSE); - return true; - } - long sourceTime = sourceFile.lastModified(); - long destTime = destFile.lastModified(); - if (sourceTime > (destTime + FILE_UTILS.getFileTimestampGranularity())) { - log("Source file is newer than the dest file: a rebuild is required", - Project.MSG_VERBOSE); - return true; - } else { - log("The .il file is up to date", Project.MSG_VERBOSE); - return false; - } - - } - /** - * do the work - * @throws BuildException if there is an error. - */ - public void execute() throws BuildException { - log("This task is deprecated and will be removed in a future version\n" - + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/dotnet/index.html", - Project.MSG_WARN); - validate(); - if (!isDisassemblyNeeded()) { - return; - } - NetCommand command = new NetCommand(this, "ildasm", executable); - command.setFailOnError(true); - //fill in args - command.addArgument("/text"); - command.addArgument("/out=" + destFile.toString()); - if (!progressBar) { - command.addArgument("/nobar"); - } - if (linenumbers) { - command.addArgument("/linenum"); - } - if (showSource) { - command.addArgument("/source"); - } - if (quoteallnames) { - command.addArgument("/quoteallnames"); - } - if (header) { - command.addArgument("/header"); - } - if (!assembler) { - command.addArgument("/noil"); - } - if (metadata) { - command.addArgument("/tokens"); - } - command.addArgument("/item:", item); - if (rawExceptionHandling) { - command.addArgument("/raweh"); - } - command.addArgument(EncodingTypes.getEncodingOption(encoding)); - if (bytes) { - command.addArgument("/bytes"); - } - command.addArgument("/vis:", visibility); - - //add the source file - command.addArgument(sourceFile.getAbsolutePath()); - - //determine directory: resourceDir if set, - //the dir of the destFile if not - File execDir = resourceDir; - if (execDir == null) { - execDir = destFile.getParentFile(); - } - command.setDirectory(execDir); - - //now run - try { - command.runCommand(); - } catch (BuildException e) { - //forcibly delete the output file in case of trouble - if (destFile.exists()) { - log("Deleting destination file as it may be corrupt"); - destFile.delete(); - } - //then rethrow the exception - throw e; - } - - } - - /** - * encoding options; the default is ascii - */ - public static class EncodingTypes extends EnumeratedAttribute { - /** Unicode */ - public static final String UNICODE = "unicode"; - /** UTF8 */ - public static final String UTF8 = "utf8"; - /** ASCII */ - public static final String ASCII = "ascii"; - /** {@inheritDoc}. */ - public String[] getValues() { - return new String[]{ - ASCII, - UTF8, - UNICODE, - }; - } - - /** - * This method maps from an encoding enum to an encoding option. - * @param enumValue the value to use. - * @return The encoding option indicated by the enum value. - */ - public static String getEncodingOption(String enumValue) { - if (UNICODE.equals(enumValue)) { - return "/unicode"; - } - if (UTF8.equals(enumValue)) { - return "/utf8"; - } - return null; - } - } - - /** - * visibility options for decoding - */ - public static class VisibilityOptions extends EnumeratedAttribute { - /** {@inheritDoc}. */ - public String[] getValues() { - return new String[]{ - "pub", //Public - "pri", //Private - "fam", //Family - "asm", //Assembly - "faa", //Family and Assembly - "foa", //Family or Assembly - "psc", //Private Scope - }; - } - - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java deleted file mode 100644 index f9e46c7d2..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; - -import java.io.File; - -/** - * Import a COM type library into the .NET framework. - *

    - * - * This task is a wrapper to .NET's tlbimport; it imports a tlb file to a NET assembly - * by generating a binary assembly (.dll) that contains all the binding - * metadata. It uses date timestamps to minimise rebuilds. - *

    - * Example - * 

    - *     <importtypelib
- *       srcfile="xerces.tlb"
- *       destfile="xerces.dll"
- *       namespace="Apache.Xerces"/>
- *
    - * @since Ant 1.6 - * @ant.task category="dotnet" - */ -public class ImportTypelib extends Task { - - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - - /** - * input file; precedes options - */ - private File srcFile; - - /** - * /out:file - */ - private File destFile; - - /** - * /namespace:[string] - */ - private String namespace; - - /** - * /sysarray - */ - private boolean useSysArray = false; - - /** - * /unsafe - */ - private boolean unsafe = false; - - /** - * extra commands? - */ - private String extraOptions = null; - - /** - * This method names the output file. - * - * This is an operation which is required to have been performed. - * @param destFile the output file. - */ - public void setDestFile(File destFile) { - this.destFile = destFile; - } - - /** - * This method sets what namespace the typelib is to be in. - * This is an operation which is required to have been performed. - * @param namespace the namespace to use. - */ - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - /** - * This method sets which is the source .tlb file. - * This is an operation which is required to have been performed. - * @param srcFile the source file. - */ - public void setSrcFile(File srcFile) { - this.srcFile = srcFile; - } - - /** - * do you want unsafe code. - * @param unsafe a boolean value. - */ - public void setUnsafe(boolean unsafe) { - this.unsafe = unsafe; - } - - /** - * set this to map a COM SafeArray to the System.Array class - * @param useSysArray a boolean value. - */ - public void setUseSysArray(boolean useSysArray) { - this.useSysArray = useSysArray; - } - - /** - * set any extra options that are not yet supported by this task. - * @param extraOptions the options to use. - */ - public void setExtraOptions(String extraOptions) { - this.extraOptions = extraOptions; - } - - /** - * validation code - * @throws BuildException if validation failed - */ - protected void validate() - throws BuildException { - if (destFile == null) { - throw new BuildException("destination file must be specified"); - } - if (destFile.isDirectory()) { - throw new BuildException( - "destination file is a directory"); - } - if (srcFile == null || !srcFile.exists()) { - throw new BuildException( - "source file does not exist"); - } - if (srcFile.isDirectory()) { - throw new BuildException( - "source file is a directory"); - } - if (namespace == null) { - throw new BuildException("No namespace"); - } - } - - /** - * Test for disassembly being needed; use existence and granularity - * correct date stamps - * @return true iff a rebuild is required. - */ - private boolean isExecuteNeeded() { - if (!destFile.exists()) { - log("Destination file does not exist: a build is required", - Project.MSG_VERBOSE); - return true; - } - long sourceTime = srcFile.lastModified(); - long destTime = destFile.lastModified(); - if (sourceTime > (destTime + FILE_UTILS.getFileTimestampGranularity())) { - log("Source file is newer than the dest file: a rebuild is required", - Project.MSG_VERBOSE); - return true; - } else { - log("The output file is up to date", Project.MSG_VERBOSE); - return false; - } - - } - - - /** - * Create a typelib command - * @exception BuildException if something goes wrong with the build - */ - public void execute() throws BuildException { - log("This task is deprecated and will be removed in a future version\n" - + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/dotnet/index.html", - Project.MSG_WARN); - validate(); - log("Importing typelib " + srcFile - + " to assembly " + destFile - + " in namespace " + namespace, Project.MSG_VERBOSE); - //rebuild unless the dest file is newer than the source file - if (!isExecuteNeeded()) { - return; - } - - NetCommand command = new NetCommand(this, "ImportTypelib", "tlbimp"); - command.setFailOnError(true); - command.addArgument(srcFile.toString()); - //fill in args - command.addArgument("/nologo"); - command.addArgument("/out:" + destFile); - command.addArgument("/namespace:", namespace); - if (useSysArray) { - command.addArgument("/sysarray"); - } - if (unsafe) { - command.addArgument("/unsafe"); - } - command.addArgument(extraOptions); - command.runCommand(); - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java deleted file mode 100644 index 6053a615a..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.BuildException; - - -/** - * Compile J# source down to a managed .NET application. - *

    - * J# is not Java. But it is the language closest to Java in the .NET framework. - * This task compiles jsharp source (.java files), and - * generates a .NET managed exe or dll. - *

    - * - *

    For historical reasons the pattern - * **/*.java is preset as includes list and - * you can not override it with an explicit includes attribute. Use - * nested <src> elements instead of the basedir - * attribute if you need more control.

    - * - * @see Visual J++ online documentation - * - * @since ant1.6 - * @ant.task category="dotnet" name="jsharpc" - */ -public class JSharp extends DotnetCompile { - // CheckStyle:VisibilityModifier OFF - bc - /** - * hex base address - */ - String baseAddress; - - /** /x option to disable J++ and J# lang extensions - * - */ - boolean pureJava = true; - - /** - * whether to make package scoped stuff public or assembly scoped - */ - boolean secureScoping = false; - - // CheckStyle:VisibilityModifier ON - - /** No arg constructor. */ - public JSharp() { - setExecutable("vjc"); - } - - - /** - * Set the base address attribute. - * @param baseAddress the value to use. - */ - public void setBaseAddress(String baseAddress) { - this.baseAddress = baseAddress; - } - - /** - * do we want pure java (default, true) or corrupted J#? - * @param pureJava a boolean value. - */ - public void setPureJava(boolean pureJava) { - this.pureJava = pureJava; - } - - /** - * Make package scoped code visible to the current assembly only (default: false) - * .NET does not have package scoping. Instead it has assembly, private and public. - * By default, package content is public to all. - * @param secureScoping a boolean value. - */ - public void setSecureScoping(boolean secureScoping) { - this.secureScoping = secureScoping; - } - - /** - * Get the delimiter that the compiler uses between references. - * For example, c# will return ";"; VB.NET will return "," - * @return The string delimiter for the reference string. - */ - public String getReferenceDelimiter() { - return ";"; - } - - /** - * Get the extension of filenames to compile. - * @return The string extension of files to compile. - */ - public String getFileExtension() { - return ".java"; - } - - /** - * add jvc specific commands - * @param command the command to add to. - */ - protected void addCompilerSpecificOptions(NetCommand command) { - if (pureJava) { - command.addArgument("/x:all"); - } - if (secureScoping) { - command.addArgument("/securescoping"); - } - } - - /** {@inheritDoc} */ - protected void createResourceParameter(NetCommand command, DotnetResource resource) { - resource.getParameters(getProject(), command, true); - } - - /** - * validation code - * @throws org.apache.tools.ant.BuildException if validation failed - */ - protected void validate() - throws BuildException { - super.validate(); - if (getDestFile() == null) { - throw new BuildException("DestFile was not specified"); - } - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java deleted file mode 100644 index 6ff45e3a9..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -/* - * build notes - * The reference CD to listen to while editing this file is - * Underworld Everything, Everything - * variable naming policy from Fowler's refactoring book. - */ -// place below the optional ant tasks package - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -// imports - -import java.io.File; -import java.io.IOException; -import java.io.FileOutputStream; -import java.io.PrintWriter; -import java.io.BufferedOutputStream; -import java.util.Hashtable; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; -import org.apache.tools.ant.taskdefs.LogStreamHandler; -import org.apache.tools.ant.types.Commandline; - -/** - * This is a helper class to spawn net commands out. In its initial form it - * contains no .net specifics, just contains all the command line/exe - * construction stuff. However, it may be handy in future to have a means of - * setting the path to point to the dotnet bin directory; in which case the - * shared code should go in here. - * - *@version 0.5 - */ - -public class NetCommand { - private static final int DEFAULT_RESPONSE_THRESHOLD = 64; - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - // CheckStyle:VisibilityModifier OFF - bc - - /** - * owner project - */ - protected Task owner; - - /** - * executable - */ - protected Execute executable; - - /** - * what is the command line - */ - protected Commandline commandLine; - - /** - * title of the command - */ - protected String title; - - /** - * actual program to invoke - */ - protected String program; - - /** - * trace flag - */ - protected boolean traceCommandLine = false; - - /** - * flag to control action on execution trouble - */ - protected boolean failOnError; - - // CheckStyle:VisibilityModifier ON - - /** - * the directory to execute the command in. When null, the current - * directory is used. - */ - private File directory; - - /** - * flag to set to to use @file based command cache - */ - private boolean useResponseFile = false; - - /** - * name of a temp file; may be null - */ - private File temporaryCommandFile; - - /** - * internal threshold for auto-switch - */ - private int automaticResponseFileThreshold = DEFAULT_RESPONSE_THRESHOLD; - - /** - * constructor - * - *@param title (for logging/errors) - *@param owner owner task - *@param program app we are to run - */ - - public NetCommand(Task owner, String title, String program) { - this.owner = owner; - this.title = title; - this.program = program; - commandLine = new Commandline(); - commandLine.setExecutable(program); - } - - - /** - * turn tracing on or off - * - *@param b trace flag - */ - public void setTraceCommandLine(boolean b) { - traceCommandLine = b; - } - - - /** - * set fail on error flag - * - *@param b fail flag -set to true to cause an exception to be raised if - * the return value != 0 - */ - public void setFailOnError(boolean b) { - failOnError = b; - } - - - /** - * query fail on error flag - * - *@return The failFailOnError value - */ - public boolean getFailFailOnError() { - return failOnError; - } - - - /** - * set the directory to run from, if the default is inadequate - * @param directory the directory to use. - */ - public void setDirectory(File directory) { - this.directory = directory; - } - - /** - * verbose text log - * - *@param msg string to add to log if verbose is defined for the build - */ - protected void logVerbose(String msg) { - owner.getProject().log(msg, Project.MSG_VERBOSE); - } - - - /** - * error text log - * - *@param msg message to display as an error - */ - protected void logError(String msg) { - owner.getProject().log(msg, Project.MSG_ERR); - } - - - /** - * add an argument to a command line; do nothing if the arg is null or - * empty string - * - *@param argument The feature to be added to the Argument attribute - */ - public void addArgument(String argument) { - if (argument != null && argument.length() != 0) { - commandLine.createArgument().setValue(argument); - } - } - - /** - * add an argument to a command line; do nothing if the arg is null or - * empty string - * - *@param arguments The features to be added to the Argument attribute - */ - public void addArguments(String[] arguments) { - if (arguments != null && arguments.length != 0) { - for (int i = 0; i < arguments.length; i++) { - addArgument(arguments[i]); - } - } - } - - /** - * concatenate two strings together and add them as a single argument, - * but only if argument2 is non-null and non-zero length - * - *@param argument1 The first argument - *@param argument2 The second argument - */ - public void addArgument(String argument1, String argument2) { - if (argument2 != null && argument2.length() != 0) { - commandLine.createArgument().setValue(argument1 + argument2); - } - } - - /** - * getter - * @return response file state - */ - public boolean isUseResponseFile() { - return useResponseFile; - } - - /** - * set this to true to always use the response file - * @param useResponseFile a boolean value. - */ - public void setUseResponseFile(boolean useResponseFile) { - this.useResponseFile = useResponseFile; - } - - /** - * getter for threshold - * @return 0 for disabled, or a threshold for enabling response files - */ - public int getAutomaticResponseFileThreshold() { - return automaticResponseFileThreshold; - } - - /** - * set threshold for automatically using response files -use 0 for off - * @param automaticResponseFileThreshold the threshold value to use. - */ - public void setAutomaticResponseFileThreshold(int automaticResponseFileThreshold) { - this.automaticResponseFileThreshold = automaticResponseFileThreshold; - } - - /** - * set up the command sequence.. - */ - protected void prepareExecutor() { - // default directory to the project's base directory - if (owner == null) { - throw new RuntimeException("no owner"); - } - if (owner.getProject() == null) { - throw new RuntimeException("Owner has no project"); - } - File dir = owner.getProject().getBaseDir(); - if (directory != null) { - dir = directory; - } - - ExecuteStreamHandler handler = new LogStreamHandler(owner, - Project.MSG_INFO, Project.MSG_WARN); - executable = new Execute(handler, null); - executable.setAntRun(owner.getProject()); - executable.setWorkingDirectory(dir); - } - - - /** - * Run the command using the given Execute instance. - * - *@exception BuildException if something goes wrong and the - * failOnError flag is true - */ - public void runCommand() - throws BuildException { - prepareExecutor(); - int err = -1; - // assume the worst - try { - if (traceCommandLine) { - owner.log("In directory " + executable.getWorkingDirectory()); - owner.log(commandLine.describeCommand()); - } else { - //in verbose mode we always log stuff - logVerbose("In directory " + executable.getWorkingDirectory()); - logVerbose(commandLine.describeCommand()); - } - setExecutableCommandLine(); - err = executable.execute(); - if (Execute.isFailure(err)) { - if (failOnError) { - throw new BuildException(title + " returned: " + err, owner.getLocation()); - } else { - owner.log(title + " Result: " + err, Project.MSG_ERR); - } - } - } catch (IOException e) { - throw new BuildException(title + " failed: " + e, e, owner.getLocation()); - } finally { - if (temporaryCommandFile != null) { - temporaryCommandFile.delete(); - } - } - } - - /** - * set the executable command line - */ - private void setExecutableCommandLine() { - - String[] commands = commandLine.getCommandline(); - //always trigger file mode if commands are big enough - if (automaticResponseFileThreshold > 0 - && commands.length > automaticResponseFileThreshold) { - useResponseFile = true; - } - if (!useResponseFile || commands.length <= 1) { - //the simple action is to send the command line in as is - executable.setCommandline(commands); - } else { - //but for big operations, we save all the params to a temp file - //and set @tmpfile as the command -then we remember to delete the tempfile - //afterwards - FileOutputStream fos = null; - - temporaryCommandFile = FILE_UTILS.createTempFile("cmd", ".txt", null, false, true); - owner.log("Using response file " + temporaryCommandFile, Project.MSG_VERBOSE); - - try { - fos = new FileOutputStream(temporaryCommandFile); - PrintWriter out = new PrintWriter(new BufferedOutputStream(fos)); - //start at 1 because element 0 is the executable name - for (int i = 1; i < commands.length; ++i) { - out.println(commands[i]); - } - out.flush(); - out.close(); - } catch (IOException ex) { - throw new BuildException("saving command stream to " + temporaryCommandFile, ex); - } - - String[] newCommandLine = new String[2]; - newCommandLine[0] = commands[0]; - newCommandLine[1] = "@" + temporaryCommandFile.getAbsolutePath(); - logVerbose(Commandline.describeCommand(newCommandLine)); - executable.setCommandline(newCommandLine); - } - } - - - /** - * scan through one fileset for files to include - * @param scanner the directory scanner to use. - * @param filesToBuild the map to place the files. - * @param outputTimestamp timestamp to compare against - * @return #of files out of date - * @todo should FAT granularity be included here? - */ - public int scanOneFileset(DirectoryScanner scanner, Hashtable filesToBuild, - long outputTimestamp) { - int filesOutOfDate = 0; - String[] dependencies = scanner.getIncludedFiles(); - File base = scanner.getBasedir(); - //add to the list - for (int i = 0; i < dependencies.length; i++) { - File targetFile = new File(base, dependencies[i]); - if (filesToBuild.get(targetFile) == null) { - filesToBuild.put(targetFile, targetFile); - if (targetFile.lastModified() > outputTimestamp) { - filesOutOfDate++; - owner.log(targetFile.toString() + " is out of date", - Project.MSG_VERBOSE); - } else { - owner.log(targetFile.toString(), - Project.MSG_VERBOSE); - } - } - } - return filesOutOfDate; - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java deleted file mode 100644 index fe22e377e..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java +++ /dev/null @@ -1,366 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import org.apache.tools.ant.BuildException; - - -/** - * This task compiles Visual Basic.NET source into executables or modules. - * The task requires vbc.exe on the execute path, unless it or an equivalent - * program is specified in the executable parameter - * - *

    - * All parameters are optional: <vbc/> should suffice to produce a debug - * build of all *.vb files. - * - *

    - - * The task is a directory based task, so attributes like - * includes="**\/*.vb" and - * excludes="broken.vb" can be used to control - * the files pulled in. By default, - * all *.vb files from the project folder down are included in the command. - * When this happens the destFile -if not specified- - * is taken as the first file in the list, which may be somewhat hard to control. - Specifying the output file with destfile is prudent. -

    -

    - * Also, dependency checking only works if destfile is set. - * - *

    For historical reasons the pattern - * **/*.vb is preset as includes list and - * you can not override it with an explicit includes attribute. Use - * nested <src> elements instead of the basedir - * attribute if you need more control.

    - * - * As with <csc> nested src filesets of source, - * reference filesets, definitions and resources can be provided. - * - *

    - * Example - *

    - * 
    <vbc
- *   optimize="true"
- *   debug="false"
- *   warnLevel="4"
- *   targetType="exe"
- *   definitions="RELEASE"
- *   excludes="src/unicode_class.vb"
- *   mainClass = "MainApp"
- *   destFile="NetApp.exe"
- *   optionExplicit="true"
- *   optionCompare="text"
- *   references="System.Xml,System.Web.Xml"
- *   >
- *          <reference file="${testCSC.dll}" />
- *          <define name="RELEASE" />
- *          <define name="DEBUG" if="debug.property"/>
- *          <define name="def3" unless="def2.property"/>
- *   </vbc>
-
    - * @ant.task name="vbc" category="dotnet" - */ - -public class VisualBasicCompile extends DotnetCompile { - - /** - * Compiler option to remove integer checks. Default: false. - */ - private boolean removeIntChecks = false; - - /** - * Require explicit declaration of variables? Default: false. - */ - private boolean optionExplicit = false; - - /** - * Enforce strict language semantics? Default: false. - */ - private boolean optionStrict = false; - - /** - * Whether to compare strings as "text" or "binary". Default: "binary". - */ - private String optionCompare; - - /** - * Root namespace for all type declarations. - */ - private String rootNamespace; - - /** - * Declare global imports fornamespaces in referenced metadata files. - */ - private String imports; - - /** - * Constructor for VisualBasicCompile. - */ - public VisualBasicCompile() { - clear(); - } - - /** - * reset all contents. - */ - public void clear() { - super.clear(); - imports = null; - rootNamespace = null; - optionCompare = null; - optionExplicit = false; - optionStrict = false; - removeIntChecks = false; - setExecutable("vbc"); - } - - /** - * get the argument or null for no argument needed - * This is overridden from DotnetCompile.java because VBC uses - * "/win32resource:" rather than "/win32res:" - * - *@return The Win32Res Parameter to CSC - */ - protected String getWin32ResParameter() { - if (getWin32Res() != null) { - return "/win32resource:" + getWin32Res().toString(); - } else { - return null; - } - } - - /** - * Whether to remove integer checks. Default false. - * @param flag on/off flag - */ - public void setRemoveIntChecks(boolean flag) { - removeIntChecks = flag; - } - - /** - * Get the flag for removing integer checks. - * @return true if flag is turned on - */ - public boolean getRemoveIntChecks() { - return removeIntChecks; - } - - /** - * Form the option string for removeIntChecks. - * @return The parameter string. - */ - public String getRemoveIntChecksParameter() { - return "/removeintchecks" + (removeIntChecks ? "+" : "-"); - } - - /** - * Whether to require explicit declaration of variables. - * @param flag on/off flag - */ - public void setOptionExplicit(boolean flag) { - optionExplicit = flag; - } - - /** - * Get the flag for whether to require explicit declaration of variables. - *@return true if flag is turned on - */ - public boolean getOptionExplicit() { - return optionExplicit; - } - - /** - * Form the option string for optionExplicit.. - * @return The parameter string. - */ - public String getOptionExplicitParameter() { - return "/optionexplicit" + (optionExplicit ? "+" : "-"); - } - - /** - * Enforce strict language semantics. - * @param flag on/off flag - */ - public void setOptionStrict(boolean flag) { - optionStrict = flag; - } - - /** - * Get the flag for whether to enforce strict language semantics. - * @return true if flag is turned on - */ - public boolean getOptionStrict() { - return optionStrict; - } - - /** - * For the option string for optionStrict. - * @return The parameter string. - */ - public String getOptionStrictParameter() { - return "/optionstrict" + (optionStrict ? "+" : "-"); - } - - - /** - * Specifies the root namespace for all type declarations. - * @param rootNamespace a root namespace. - */ - public void setRootNamespace(String rootNamespace) { - this.rootNamespace = rootNamespace; - } - - - /** - * Get the root namespace. - * @return the root namespace. - */ - public String getRootNamespace() { - return this.rootNamespace; - } - - - /** - * Form the option string for rootNamespace. - * @return the root namespace option string. - */ - protected String getRootNamespaceParameter() { - if (rootNamespace != null && rootNamespace.length() != 0) { - return "/rootnamespace:" + rootNamespace; - } else { - return null; - } - } - - - /** - * Declare global imports for namespaces in referenced metadata files. - * @param imports the imports string - */ - public void setImports(String imports) { - this.imports = imports; - } - - - /** - * Get global imports for namespaces in referenced metadata files. - * @return the imports string. - */ - public String getImports() { - return this.imports; - } - - - /** - * Format the option for imports. - * @return the formatted import option. - */ - protected String getImportsParameter() { - if (imports != null && imports.length() != 0) { - return "/imports:" + imports; - } else { - return null; - } - } - - - /** - * Specify binary- or text-style string comparisons. Defaults - * to "binary" - * @param optionCompare the option compare style. "text" | "binary". - */ - public void setOptionCompare(String optionCompare) { - if ("text".equalsIgnoreCase(optionCompare)) { - this.optionCompare = "text"; - } else { - this.optionCompare = "binary"; - } - } - - - /** - * "binary" or "text" for the string-comparison style. - * @return the option compare style. - */ - public String getOptionCompare() { - return this.optionCompare; - } - - /** - * Format the option for string comparison style. - * @return The formatted option. - */ - protected String getOptionCompareParameter() { - if (optionCompare != null && "text".equalsIgnoreCase(optionCompare)) { - return "/optioncompare:text"; - } else { - return "/optioncompare:binary"; - } - } - - /** - * implement VBC commands - * @param command the command to set arguements on. - */ - protected void addCompilerSpecificOptions(NetCommand command) { - command.addArgument(getRemoveIntChecksParameter()); - command.addArgument(getImportsParameter()); - command.addArgument(getOptionExplicitParameter()); - command.addArgument(getOptionStrictParameter()); - command.addArgument(getRootNamespaceParameter()); - command.addArgument(getOptionCompareParameter()); - } - - /** - * Get the delimiter that the compiler uses between references. - * For example, c# will return ";"; VB.NET will return "," - * @return The string delimiter for the reference string. - */ - public String getReferenceDelimiter() { - return ","; - } - - - - /** - * Get the extension of filenames to compile. - * @return The string extension of files to compile. - */ - public String getFileExtension() { - return "vb"; - } - - /** {@inheritDoc} */ - protected void createResourceParameter(NetCommand command, DotnetResource resource) { - resource.getParameters(getProject(), command, false); - } - - /** - * validation code - * @throws BuildException if validation failed - */ - protected void validate() - throws BuildException { - super.validate(); - if (getDestFile() == null) { - throw new BuildException("DestFile was not specified"); - } - } -} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java deleted file mode 100644 index dd0a2cb5a..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java +++ /dev/null @@ -1,595 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.dotnet; - -import java.io.File; -import java.util.Vector; -import java.util.Iterator; -import java.net.MalformedURLException; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.util.FileUtils; - -/** - * Converts a WSDL file or URL resource into a .NET language. - * - * Why add a wrapper to the MS WSDL tool? - * So that you can verify that your web services, be they written with Axis or - *anyone else's SOAP toolkit, work with .NET clients. - * - *This task is dependency aware when using a file as a source and destination; - *so if you <get> the file (with usetimestamp="true") then - *you only rebuild stuff when the WSDL file is changed. Of course, - *if the server generates a new timestamp every time you ask for the WSDL, - *this is not enough...use the <filesmatch> <condition> to - *to byte for byte comparison against a cached WSDL file then make - *the target conditional on that test failing. - - * See "Creating an XML Web Service Proxy", "wsdl.exe" docs in - * the framework SDK documentation - * @version 0.5 - * @ant.task category="dotnet" - * @since Ant 1.5 - */ - -public class WsdlToDotnet extends Task { - - /** - * used for timestamp checking - */ - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - - /** - * name of output file (required) - */ - private File destFile = null; - - /** - * language; defaults to C# - */ - private String language = "CS"; - - /** - * flag set to true to generate server side skeleton - */ - private boolean server = false; - - /** - * namespace - */ - private String namespace = null; - - /** - * flag to control action on execution trouble - */ - private boolean failOnError = true; - - // CheckStyle:VisibilityModifier OFF - bc - /** - * any extra command options? - */ - protected String extraOptions = null; - - // CheckStyle:VisibilityModifier ON - - - /** - * protocol string. Exact value set depends on SOAP stack version. - * @since Ant 1.7 - */ - private String protocol = null; - - /** - * should errors come in an IDE format. This - * is WSE only. - * @since Ant 1.7 - */ - private boolean ideErrors = false; - - /** - * filesets of file to compile - * @since Ant 1.7 - */ - private Vector schemas = new Vector(); - - /** - * our WSDL file. - * @since ant1.7 - */ - private Schema wsdl = new Schema(); - - /** - * compiler - * @since ant1.7 - */ - private Compiler compiler = null; - - /** - * error message: dest file is a directory - */ - public static final String ERROR_DEST_FILE_IS_DIR = "destination file is a directory"; - - /** - * error message: no dest file - */ - public static final String ERROR_NO_DEST_FILE = "destination file must be specified"; - - /** - * Name of the file to generate. Required - * @param destFile filename - */ - public void setDestFile(File destFile) { - this.destFile = destFile; - } - - /** - * Sets the URL to fetch. Fetching is by wsdl.exe; Ant proxy settings - * are ignored; either url or srcFile is required. - * @param url url to save - */ - - public void setUrl(String url) { - wsdl.setUrl(url); - } - - /** - * The local WSDL file to parse; either url or srcFile is required. - * @param srcFile WSDL file - */ - public void setSrcFile(File srcFile) { - wsdl.setFile(srcFile); - } - - /** - * set the language; one of "CS", "JS", or "VB" - * optional, default is CS for C# source - * @param language language to generate - */ - public void setLanguage(String language) { - this.language = language; - } - - /** - * flag to enable server side code generation; - * optional, default=false - * @param server server-side flag - */ - - public void setServer(boolean server) { - this.server = server; - } - - /** - * namespace to place the source in. - * optional; default "" - * @param namespace new namespace - */ - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - /** - * Whether or not a failure should halt the build. - * Optional - default is true. - * @param failOnError new failure option - */ - public void setFailOnError(boolean failOnError) { - this.failOnError = failOnError; - } - - /** - * Any extra WSDL.EXE options which aren't explicitly - * supported by the ant wrapper task; optional - * - *@param extraOptions The new ExtraOptions value - */ - public void setExtraOptions(String extraOptions) { - this.extraOptions = extraOptions; - } - - /** - * Defines wether errors are machine parseable. - * Optional, default=true - * - * @since Ant 1.7 - * @param ideErrors a boolean value. - */ - public void setIdeErrors(boolean ideErrors) { - this.ideErrors = ideErrors; - } - - /** - * what protocol to use. SOAP, SOAP1.2, HttpPost and HttpGet - * are the base options. Different version and implementations may. - * offer different options. - * @since Ant 1.7 - * - * @param protocol the protocol to use. - */ - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - /** - * add a new source schema to the compilation - * @since Ant 1.7 - * - * @param source a nested schema element. - */ - public void addSchema(Schema source) { - schemas.add(source); - } - - /** - * flag to trigger turning a filename into a file:url - * ignored for the mono compiler. - * @param b a boolean value. - */ - public void setMakeURL(boolean b) { - wsdl.setMakeURL(b); - } - - /** - * identify the compiler - * @since Ant 1.7 - * @param compiler the enumerated value. - */ - public void setCompiler(Compiler compiler) { - this.compiler = compiler; - } - - /** - * validation code - * @throws BuildException if validation failed - */ - protected void validate() - throws BuildException { - if (destFile == null) { - throw new BuildException(ERROR_NO_DEST_FILE); - } - if (destFile.isDirectory()) { - throw new BuildException( - ERROR_DEST_FILE_IS_DIR); - } - wsdl.validate(); - } - - /** - * do the work by building the command line and then calling it - * - *@throws BuildException if validation or execution failed - */ - public void execute() - throws BuildException { - log("This task is deprecated and will be removed in a future version\n" - + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/dotnet/index.html", - Project.MSG_WARN); - - if (compiler == null) { - compiler = Compiler.createDefaultCompiler(); - } - validate(); - NetCommand command = new NetCommand(this, - "WSDL", - compiler.getCommand()); - command.setFailOnError(failOnError); - //fill in args - compiler.applyExtraArgs(command); - command.addArgument("/nologo"); - command.addArgument("/out:" + destFile); - command.addArgument("/language:", language); - if (server) { - command.addArgument("/server"); - } - command.addArgument("/namespace:", namespace); - if (protocol != null) { - command.addArgument("/protocol:" + protocol); - } - if (ideErrors) { - command.addArgument("/parsableErrors"); - } - command.addArgument(extraOptions); - - //set source and rebuild options - boolean rebuild = true; - long destLastModified = -1; - - //rebuild unless the dest file is newer than the source file - if (destFile.exists()) { - destLastModified = destFile.lastModified(); - rebuild = isRebuildNeeded(wsdl, destLastModified); - } - String path; - //mark for a rebuild if the dest file is newer - path = wsdl.evaluate(); - if (!compiler.supportsAbsoluteFiles() && wsdl.getFile() != null) { - // Mono 1.0's wsdl doesn't deal with absolute paths - File f = wsdl.getFile(); - command.setDirectory(f.getParentFile()); - path = f.getName(); - } - command.addArgument(path); - //add in any extra files. - //this is an error in mono, but we do not warn on it as they may fix that outside - //the ant build cycle. - Iterator it = schemas.iterator(); - while (it.hasNext()) { - Schema schema = (Schema) it.next(); - //mark for a rebuild if we are newer - rebuild |= isRebuildNeeded(schema, destLastModified); - command.addArgument(schema.evaluate()); - } - //conditionally compile - if (rebuild) { - command.runCommand(); - } - } - - /** - * checks for a schema being out of data - * @param schema url/file - * @param destLastModified timestamp, -1 for no dest - * @return true if a rebuild is needed. - */ - private boolean isRebuildNeeded(Schema schema, long destLastModified) { - if (destLastModified == -1) { - return true; - } - return !FILE_UTILS.isUpToDate(schema.getTimestamp(), destLastModified); - } - - - /** - * nested schema class - * Only supported on NET until mono add multi-URL handling on the command line - */ - public static class Schema { - private File file; - private String url; - private boolean makeURL = false; - - // Errors - /** One of file or url must be set */ - public static final String ERROR_NONE_DECLARED = "One of file and url must be set"; - /** Only one of file or url */ - public static final String ERROR_BOTH_DECLARED = "Only one of file or url can be set"; - /** Not found */ - public static final String ERROR_FILE_NOT_FOUND = "Not found: "; - /** File is a directory */ - public static final String ERROR_FILE_IS_DIR = "File is a directory: "; - /** Could not URL convert */ - public static final String ERROR_NO_URL_CONVERT = "Could not URL convert "; - - /** - * validate the schema - */ - public void validate() { - - if (file != null) { - if (!file.exists()) { - throw new BuildException(ERROR_FILE_NOT_FOUND + file.toString()); - } - if (file.isDirectory()) { - throw new BuildException(ERROR_FILE_IS_DIR + file.toString()); - } - } - if (file != null && url != null) { - throw new BuildException(ERROR_BOTH_DECLARED); - } - if (file == null && url == null) { - throw new BuildException(ERROR_NONE_DECLARED); - } - } - - /** - * Validate our settings. - * @return either the URL or the full file path - */ - public String evaluate() { - validate(); - if (url != null) { - return getUrl(); - } - if (makeURL) { - try { - return FILE_UTILS.getFileURL(file).toExternalForm(); - } catch (MalformedURLException e) { - throw new BuildException(ERROR_NO_URL_CONVERT + file); - } - } - return file.toString(); - } - - /** - * Get the file. - * @return the file used. - */ - public File getFile() { - return file; - } - - /** - * name of a file to use as a source of WSDL or XSD data - * @param file the file to use. - */ - public void setFile(File file) { - this.file = file; - } - - /** - * Get the url. - * @return the URL of the resource. - */ - public String getUrl() { - return url; - } - - /** - * url of a resource. - * URLs have no timestamp checking, and are not validated - * @param url the URL string to use. - */ - public void setUrl(String url) { - this.url = url; - } - - /** - * Get the makeURL attribute. - * @return the attribute. - */ - public boolean isMakeURL() { - return makeURL; - } - - /** - * flag to request that a file is turned into an absolute file: URL - * before being passed to the WSDL compiler - * @param makeURL a boolean value. - */ - public void setMakeURL(boolean makeURL) { - this.makeURL = makeURL; - } - - /** - * Gets the file timestamp. - * @return the timestamp of a file, or -1 for a URL (meaning we do not know its age) - */ - public long getTimestamp() { - if (file != null) { - return file.lastModified(); - } else { - return -1; - } - } - } - - /** - * The enumerated values for our compiler - */ - public static class Compiler extends EnumeratedAttribute { - - /** microsoft */ - public static final String COMPILER_MS = "microsoft"; - /** mono */ - public static final String COMPILER_MONO = "mono"; - /** microsoft-on-mono */ - public static final String COMPILER_MS_ON_MONO = "microsoft-on-mono"; - // CheckStyle:VisibilityModifier OFF - bc - /** the index to string mappings */ - String[] compilers = { - COMPILER_MS, - COMPILER_MONO, - COMPILER_MS_ON_MONO - }; - - /** WSDL */ - public static final String EXE_WSDL = "wsdl"; - /** MONO */ - public static final String EXE_MONO = "mono"; - /** - * programs to run - */ - String[] compilerExecutables = { - EXE_WSDL, - EXE_WSDL, - EXE_MONO - }; - - - /** - * extra things - */ - String[][] extraCompilerArgs = { - {}, - {}, - {EXE_WSDL + ".exe"} - }; - - boolean[] absoluteFiles = { - true, - false, - true - }; - - // CheckStyle:VisibilityModifier ON - /** - * This is the only method a subclass needs to implement. - * - * @return an array holding all possible values of the enumeration. - * The order of elements must be fixed so that indexOfValue(String) - * always return the same index for the same value. - */ - public String[] getValues() { - return compilers; - } - - /** - * Create the default compiler for this platform. - * @return the default compiler - */ - public static Compiler createDefaultCompiler() { - Compiler c = new Compiler(); - String compilerName; - compilerName = Os.isFamily("windows") ? COMPILER_MS : COMPILER_MONO; - c.setValue(compilerName); - return c; - } - - /** - * return the command to run - * @return the command - */ - public String getCommand() { - return compilerExecutables[getIndex()]; - } - - /** - * return any extra arguments for the compiler - * @return extra compiler arguments - */ - public String[] getExtraArgs() { - return extraCompilerArgs[getIndex()]; - } - - /** - * Get where the current value supports absolute files. - * @return true if the compiler does supports absolute files. - */ - public boolean supportsAbsoluteFiles() { - return absoluteFiles[getIndex()]; - } - - /** - * apply any extra arguments of this class - * @param command the command to apply the arguments to. - */ - public void applyExtraArgs(NetCommand command) { - String[] args = getExtraArgs(); - for (int i = 0; i < args.length; i++) { - command.addArgument(args[i]); - } - } - - } - -} diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/DotnetTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/DotnetTest.java deleted file mode 100644 index 79cd72f6a..000000000 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/DotnetTest.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional; - -import org.apache.tools.ant.BuildFileTest; - -/** - * Tests the Dotnet tasks, based off WsdlToDotnetTest - * - * @since Ant 1.6 - */ -public class DotnetTest extends BuildFileTest { - - /** - * Description of the Field - */ - private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/"; - - - /** - * Constructor - * - * @param name testname - */ - public DotnetTest(String name) { - super(name); - } - - - /** - * The JUnit setup method - */ - public void setUp() { - configureProject(TASKDEFS_DIR + "dotnet.xml"); - } - - - /** - * The teardown method for JUnit - */ - public void tearDown() { - executeTarget("teardown"); - } - - - /** - * A unit test for JUnit - */ - public void testCSC() throws Exception { - executeTarget("testCSC"); - } - - - /** - * A unit test for JUnit - */ - public void testCSCintrinsicFileset() throws Exception { - executeTarget("testCSCintrinsicFileset"); - } - - - /** - * A unit test for JUnit - */ - public void testCSCdll() throws Exception { - executeTarget("testCSCdll"); - } - - /** - * A unit test for JUnit - */ - public void testCscReferences() throws Exception { - executeTarget("testCscReferences"); - } - - /** - * A unit test for JUnit - */ - public void testCscResources() throws Exception { - executeTarget("testCSCResources"); - } - - /** - * test we can assemble - */ - public void testILASM() throws Exception { - executeTarget("testILASM"); - } - - /** - * test we can disassemble - */ - public void testILDASM() throws Exception { - executeTarget("testILDASM"); - } - - /** - * test we can disassemble - */ - public void testILDASM_empty() throws Exception { - expectBuildExceptionContaining("testILDASM_empty", - "parameter validation", - "invalid"); - } - - /** - * test we can handle jsharp (if found) - */ - public void testJsharp() throws Exception { - executeTarget("jsharp"); - } - - /** - * test we can handle jsharp (if found) - */ - public void testResponseFile() throws Exception { - executeTarget("testCSCresponseFile"); - } - -} - diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java deleted file mode 100644 index 9d3d4ea7f..000000000 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional; - -import org.apache.tools.ant.BuildFileTest; -import org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet; - -/** - * Tests the WsdlToDotnet task. - * - * @since Ant 1.5 - */ -public class WsdlToDotnetTest extends BuildFileTest { - - /** - * dir for taskdefs - */ - private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/"; - - /** - * message from exec - */ - private static final String WSDL_FAILED = "WSDL returned:"; - - - /** - * Constructor - * - * @param name testname - */ - public WsdlToDotnetTest(String name) { - super(name); - } - - - /** - * The JUnit setup method - */ - public void setUp() { - configureProject(TASKDEFS_DIR + "WsdlToDotnet.xml"); - } - - - /** - * The teardown method for JUnit - */ - public void tearDown() { - executeTarget("teardown"); - } - - - - /** - * A unit test for JUnit - */ - public void testNoParams() throws Exception { - expectBuildExceptionContaining("testNoParams", - "expected failure", - WsdlToDotnet.ERROR_NO_DEST_FILE); - } - - /** - * A unit test for JUnit - */ - public void testNoSrc() throws Exception { - expectBuildExceptionContaining("testNoSrc", - "expected failure", - WsdlToDotnet.Schema.ERROR_NONE_DECLARED); - } - - /** - * A unit test for JUnit - */ - public void testDestIsDir() throws Exception { - expectBuildExceptionContaining("testDestIsDir", - "expected failure", - WsdlToDotnet.ERROR_DEST_FILE_IS_DIR); - } - - /** - * A unit test for JUnit - */ - public void testBothSrc() throws Exception { - expectBuildExceptionContaining("testBothSrc", - "expected failure", - WsdlToDotnet.Schema.ERROR_BOTH_DECLARED); - } - /** - * A unit test for JUnit - */ - public void testSrcIsDir() throws Exception { - expectBuildExceptionContaining("testSrcIsDir", - "expected failure", - WsdlToDotnet.Schema.ERROR_FILE_IS_DIR); - } - - /** - * A unit test for JUnit - */ - public void testSrcIsMissing() throws Exception { - expectBuildExceptionContaining("testSrcIsMissing", - "expected failure", - WsdlToDotnet.Schema.ERROR_FILE_NOT_FOUND); - } - - /** - * A unit test for JUnit - */ - public void testLocalWsdl() throws Exception { - executeTarget("testLocalWsdl"); - } - /** - * A unit test for JUnit - */ - public void testLocalWsdlServer() throws Exception { - executeTarget("testLocalWsdlServer"); - } - /** - * A unit test for JUnit - */ - public void testInvalidExtraOps() throws Exception { - expectBuildExceptionContaining("testInvalidExtraOps", - "expected failure", - WSDL_FAILED); - } - - /** - * A unit test for JUnit - */ - public void testLocalWsdlVB() throws Exception { - executeTarget("testLocalWsdlVB"); - } - /** - * A unit test for JUnit - */ - public void testLocalWsdlServerVB() throws Exception { - executeTarget("testLocalWsdlServerVB"); - } - /** - * A unit test for JUnit - */ - public void testInvalidExtraOpsVB() throws Exception { - expectBuildExceptionContaining("testInvalidExtraOpsVB", - "expected failure", - WSDL_FAILED); - } - - /** - * as if parseable errors were not ignored, mono and WSE1.0 would - * crash and burn. So here we verify the property exists, - * and that it is not passed to the app when false - */ - public void testParseableErrorsIgnoredWhenFalse() throws Exception { - executeTarget("testLocalWsdl"); - } - - /** - * A unit test for JUnit - */ - public void testSchemaFileMustExist() throws Exception { - expectBuildExceptionContaining("testSchemaFileMustExist", - "expected failure", - WsdlToDotnet.Schema.ERROR_FILE_NOT_FOUND); - } - - /** - * A unit test for JUnit - */ - public void testSchemaFileMustHaveOneOptionOnly() throws Exception { - expectBuildExceptionContaining("testSchemaFileMustHaveOneOptionOnly", - "expected failure", - WsdlToDotnet.Schema.ERROR_BOTH_DECLARED); - } - - /** - * A unit test for JUnit - */ - public void testSchemaMustBeSet() throws Exception { - expectBuildExceptionContaining("testSchemaMustBeSet", - "expected failure", - WsdlToDotnet.Schema.ERROR_NONE_DECLARED); - } - - -} -