From: Curt A. <ca...@us...> - 2004-04-21 22:49:55
|
Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/sun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv865/src/net/sf/antcontrib/cpptasks/sun Modified Files: C89Linker.java C89Processor.java Log Message: Adds type attribute to libset/syslibset (bug 814132) Index: C89Linker.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/sun/C89Linker.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** C89Linker.java 28 Feb 2004 20:03:11 -0000 1.6 --- C89Linker.java 21 Apr 2004 22:48:25 -0000 1.7 *************** *** 25,30 **** import net.sf.antcontrib.cpptasks.compiler.Linker; import net.sf.antcontrib.cpptasks.types.LibrarySet; /** ! * Adapter for the IBM (R) OS/390 (tm) Linker * * @author Hiram Chirino (coj...@ho...) --- 25,32 ---- import net.sf.antcontrib.cpptasks.compiler.Linker; import net.sf.antcontrib.cpptasks.types.LibrarySet; + import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum; + /** ! * Adapter for the Sun C89 Linker * * @author Hiram Chirino (coj...@ho...) *************** *** 90,95 **** return CUtil.getPathFromEnvironment("LIB", ";"); } ! public String[] getLibraryPatterns(String[] libnames) { ! return C89Processor.getLibraryPatterns(libnames); } public Linker getLinker(LinkType linkType) { --- 92,97 ---- return CUtil.getPathFromEnvironment("LIB", ";"); } ! public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) { ! return C89Processor.getLibraryPatterns(libnames, libType); } public Linker getLinker(LinkType linkType) { Index: C89Processor.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/sun/C89Processor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** C89Processor.java 28 Feb 2004 20:03:11 -0000 1.5 --- C89Processor.java 21 Apr 2004 22:48:41 -0000 1.6 *************** *** 17,22 **** package net.sf.antcontrib.cpptasks.sun; import java.util.Vector; /** ! * A add-in class for IBM (r) OS/390 compilers and linkers * * @author Hiram Chirino (coj...@ho...) --- 17,24 ---- package net.sf.antcontrib.cpptasks.sun; import java.util.Vector; + import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum; + /** ! * A add-in class for Sun C89 compilers and linkers * * @author Hiram Chirino (coj...@ho...) *************** *** 73,82 **** return "-I" + includeDir; } ! public static String[] getLibraryPatterns(String[] libnames) { StringBuffer buf = new StringBuffer(); ! String[] patterns = new String[libnames.length * 2]; ! int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0); ! offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns, offset); return patterns; } --- 75,93 ---- return "-I" + includeDir; } ! public static String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) { StringBuffer buf = new StringBuffer(); ! int patternCount = libnames.length*2; ! if (libType != null) { ! patternCount = libnames.length; ! } ! String[] patterns = new String[patternCount]; ! int offset = 0; ! if (libType == null || "static".equals(libType.getValue())) { ! offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0); ! } ! if (libType == null || !"static".equals(libType.getValue())) { ! offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns, offset); + } return patterns; } |