[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/arm ADSLibrarian.java,1.2,1.3 ADSLinker.java,1.2,1.3

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/arm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv865/src/net/sf/antcontrib/cpptasks/arm

Modified Files:
	ADSLibrarian.java ADSLinker.java 
Log Message:
Adds type attribute to libset/syslibset (bug 814132)

Index: ADSLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ADSLibrarian.java	28 Feb 2004 19:59:46 -0000	1.2
--- ADSLibrarian.java	21 Apr 2004 22:48:18 -0000	1.3
***************
*** 23,26 ****
--- 23,27 ----
  import net.sf.antcontrib.cpptasks.compiler.LinkType;
  import net.sf.antcontrib.cpptasks.compiler.Linker;
+ import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
  
  /**
***************
*** 113,119 ****
       * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
       */
!     public String[] getLibraryPatterns(String[] libnames) {
!         // TODO Auto-generated method stub
!         return null;
      }
  
--- 114,119 ----
       * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
       */
!     public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
!         return new String[0];
      }
  

Index: ADSLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/arm/ADSLinker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ADSLinker.java	28 Feb 2004 19:59:46 -0000	1.2
--- ADSLinker.java	21 Apr 2004 22:48:22 -0000	1.3
***************
*** 23,26 ****
--- 23,28 ----
  import net.sf.antcontrib.cpptasks.compiler.LinkType;
  import net.sf.antcontrib.cpptasks.compiler.Linker;
+ import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+ 
  /**
   * Adapter for the ARM Linker
***************
*** 116,120 ****
       * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
       */
!     public String[] getLibraryPatterns(String[] libnames) {
          return new String[]{".o"};
      }
--- 118,125 ----
       * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
       */
!     public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
!     	//
!     	//  TODO: looks like bad extension
!     	//
          return new String[]{".o"};
      }