From: Curt A. <ca...@us...> - 2004-04-21 22:50:20
|
Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/os400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv865/src/net/sf/antcontrib/cpptasks/os400 Modified Files: IccProcessor.java IccLinker.java Log Message: Adds type attribute to libset/syslibset (bug 814132) Index: IccProcessor.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/os400/IccProcessor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IccProcessor.java 28 Feb 2004 20:02:34 -0000 1.4 --- IccProcessor.java 21 Apr 2004 22:47:06 -0000 1.5 *************** *** 23,37 **** */ public class IccProcessor { - private static int addLibraryPatterns(String[] libnames, StringBuffer buf, - String prefix, String extension, String[] patterns, int offset) { - for (int i = 0; i < libnames.length; i++) { - buf.setLength(0); - buf.append(prefix); - buf.append(libnames[i]); - buf.append(extension); - patterns[offset + i] = buf.toString(); - } - return offset + libnames.length; - } public static void addWarningSwitch(Vector args, int level) { switch (level) { --- 23,26 ---- *************** *** 63,74 **** return "-I" + includeDir; } - public static String[] getLibraryPatterns(String[] libnames) { - StringBuffer buf = new StringBuffer(); - String[] patterns = new String[libnames.length * 3]; - int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0); - offset = addLibraryPatterns(libnames, buf, "", ".x", patterns, offset); - offset = addLibraryPatterns(libnames, buf, "", ".o", patterns, offset); - return patterns; - } public static String[] getOutputFileSwitch(String outPath) { StringBuffer buf = new StringBuffer("-o "); --- 52,55 ---- Index: IccLinker.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/os400/IccLinker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IccLinker.java 28 Feb 2004 20:02:34 -0000 1.5 --- IccLinker.java 21 Apr 2004 22:47:20 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- import net.sf.antcontrib.cpptasks.compiler.Linker; import net.sf.antcontrib.cpptasks.types.LibrarySet; + import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum; import org.apache.tools.ant.BuildException; /** *************** *** 111,117 **** return CUtil.getPathFromEnvironment("LIB", ";"); } ! public String[] getLibraryPatterns(String[] libnames) { ! return IccProcessor.getLibraryPatterns(libnames); } public Linker getLinker(LinkType linkType) { if (this == datasetLinker) --- 112,137 ---- return CUtil.getPathFromEnvironment("LIB", ";"); } ! public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) { ! StringBuffer buf = new StringBuffer(); ! String[] patterns = new String[libnames.length * 3]; ! int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0); ! offset = addLibraryPatterns(libnames, buf, "", ".x", patterns, offset); ! offset = addLibraryPatterns(libnames, buf, "", ".o", patterns, offset); ! return patterns; ! } ! ! private static int addLibraryPatterns(String[] libnames, StringBuffer buf, ! String prefix, String extension, String[] patterns, int offset) { ! for (int i = 0; i < libnames.length; i++) { ! buf.setLength(0); ! buf.append(prefix); ! buf.append(libnames[i]); ! buf.append(extension); ! patterns[offset + i] = buf.toString(); ! } ! return offset + libnames.length; } + + public Linker getLinker(LinkType linkType) { if (this == datasetLinker) |