? src/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java
? src/net/sf/antcontrib/cpptasks/sun/ForteCLinker.java
? src/net/sf/antcontrib/cpptasks/sun/ForteCompiler.java
? src/net/sf/antcontrib/cpptasks/sun/ForteLinker.java
cvs diff: Diffing .
cvs diff: Diffing base-implementations
cvs diff: Diffing base-implementations/Murdoch
cvs diff: Diffing base-implementations/Murdoch/org
cvs diff: Diffing base-implementations/Murdoch/org/apache
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/cc
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc/compiler
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc/devstudio
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc/gcc
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc/os
cvs diff: Diffing base-implementations/Murdoch/org/apache/tools/ant/taskdefs/optional/cc/types
cvs diff: Diffing base-implementations/Murdoch/src
cvs diff: Diffing base-implementations/Murdoch/src/net
cvs diff: Diffing base-implementations/Murdoch/src/net/sf
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc/compiler
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc/devstudio
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc/gcc
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc/os
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/cc/types
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/compiler
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/devstudio
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/gcc
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/os
cvs diff: Diffing base-implementations/Murdoch/src/net/sf/antcontrib/cpptasks/types
cvs diff: Diffing samples
cvs diff: Diffing schema
cvs diff: Diffing src
cvs diff: Diffing src/etc
cvs diff: Diffing src/net
cvs diff: Diffing src/net/sf
cvs diff: Diffing src/net/sf/antcontrib
cvs diff: Diffing src/net/sf/antcontrib/cpptasks
Index: src/net/sf/antcontrib/cpptasks/CompilerEnum.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CompilerEnum.java,v
retrieving revision 1.18
diff -r1.18 CompilerEnum.java
36a37
> import net.sf.antcontrib.cpptasks.sun.ForteCCompiler;
195a197
>             new ProcessorEnumValue("suncc", ForteCCompiler.getInstance()),
Index: src/net/sf/antcontrib/cpptasks/LinkerEnum.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/LinkerEnum.java,v
retrieving revision 1.16
diff -r1.16 LinkerEnum.java
34a35
> import net.sf.antcontrib.cpptasks.sun.ForteCLinker;
60a62
>             new ProcessorEnumValue("suncc", ForteCLinker.getInstance()),
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/apple
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/arm
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/borland
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/compaq
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/compiler
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/devstudio
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/gcc
Index: src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java,v
retrieving revision 1.32
diff -r1.32 GccLinker.java
89a90
>                 case 'a' :
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/gcc/cross
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/hp
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/ibm
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/ide
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/intel
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/libtool
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/mozilla
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/openwatcom
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/os
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/os390
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/os400
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/parser
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/platforms
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/sun
Index: src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java,v
retrieving revision 1.12
diff -r1.12 ForteCCCompiler.java
29a30
>  * @author Kenneth Russell
31,32c32,39
< public final class ForteCCCompiler extends GccCompatibleCCompiler {
<     private static final ForteCCCompiler instance = new ForteCCCompiler("CC");
---
> public final class ForteCCCompiler extends ForteCompiler {
>     protected String getForteCompilerName() {
>         return "CC";
>     }
>     protected boolean isCPlusPlus() {
>         return true;
>     }
>     private static final ForteCCCompiler instance = new ForteCCCompiler();
39,40d45
<     private String identifier;
<     private File[] includePath;
42c47
<      * Private constructor. Use ForteCCCompiler.getInstance() to get singleton
---
>      * Private constructor. Use ForteCCompiler.getInstance() to get singleton
45,117c50,51
<     private ForteCCCompiler(String command) {
<         super(command, "-V", false, null, false, null);
<     }
<     public void addImpliedArgs(final Vector args, 
<     		final boolean debug,
<             final boolean multithreaded, 
< 			final boolean exceptions, 
< 			final LinkType linkType,
< 			final Boolean rtti,
< 			final OptimizationEnum optimization) {
<         args.addElement("-c");
<         if (debug) {
<             args.addElement("-g");
<         }
<     	if (optimization != null) {
<     		if (optimization.isSpeed()) {
<     			args.addElement("-xO2");
<     		}
<     	}
<     	if (rtti != null) {
<     		if (rtti.booleanValue()) {
<     			args.addElement("-features=rtti");
<     		} else {
<     			args.addElement("-features=no%rtti");
<     		}
<     	}
<         if (multithreaded) {
<             args.addElement("-mt");
<         }
<         if (linkType.isSharedLibrary()) {
<             args.addElement("-KPIC");
<         }
<         
<     }
<     public void addWarningSwitch(Vector args, int level) {
<         switch (level) {
<             case 0 :
<                 args.addElement("-w");
<                 break;
<             case 1 :
<             case 2 :
<                 args.addElement("+w");
<                 break;
<             case 3 :
<             case 4 :
<             case 5 :
<                 args.addElement("+w2");
<                 break;
<         }
<     }
<     public File[] getEnvironmentIncludePath() {
<         if (includePath == null) {
<             File ccLoc = CUtil.getExecutableLocation("CC");
<             if (ccLoc != null) {
<                 File compilerIncludeDir = new File(
<                         new File(ccLoc, "../include").getAbsolutePath());
<                 if (compilerIncludeDir.exists()) {
<                     includePath = new File[2];
<                     includePath[0] = compilerIncludeDir;
<                 }
<             }
<             if (includePath == null) {
<                 includePath = new File[1];
<             }
<             includePath[includePath.length - 1] = new File("/usr/include");
<         }
<         return includePath;
<     }
<     public Linker getLinker(LinkType linkType) {
<         return ForteCCLinker.getInstance().getLinker(linkType);
<     }
<     public int getMaximumCommandLength() {
<         return Integer.MAX_VALUE;
---
>     private ForteCCCompiler() {
>         super("CC");
Index: src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java,v
retrieving revision 1.11
diff -r1.11 ForteCCLinker.java
30,34c30,31
< public final class ForteCCLinker extends AbstractLdLinker {
<     private static final String[] discardFiles = new String[]{".dll", ".so",
<     ".sl"};
<     private static final String[] objFiles = new String[]{".o", ".a", ".lib"};
<     private static final ForteCCLinker arLinker = new ForteCCLinker("CC",
---
> public final class ForteCCLinker extends ForteLinker {
>     private static final ForteCCLinker arLinker = new ForteCCLinker(
36c33
<     private static final ForteCCLinker dllLinker = new ForteCCLinker("CC",
---
>     private static final ForteCCLinker dllLinker = new ForteCCLinker(
38c35
<     private static final ForteCCLinker instance = new ForteCCLinker("CC",
---
>     private static final ForteCCLinker instance = new ForteCCLinker(
40,44c37,38
<     public static ForteCCLinker getInstance() {
<         return instance;
<     }
<     private File[] libDirs;
<     private ForteCCLinker(String command, String[] extensions,
---
> 
>     private ForteCCLinker(String[] extensions,
46,47c40
<         super(command, "-V", extensions, ignoredExtensions, outputPrefix,
<                 outputSuffix, false, null);
---
>         super("CC", extensions, ignoredExtensions, outputPrefix, outputSuffix);
49,67c42,44
<     public void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
<         if (debug) {
<             args.addElement("-g");
<         }
<         if (linkType.isStaticRuntime()) {
<             args.addElement("-static");
<         }
<         if (linkType.isSharedLibrary()) {
<             args.addElement("-G");
<         }
<         if (linkType.isStaticLibrary()) {
<             args.addElement("-xar");
<         }
<     }
<     public void addIncremental(boolean incremental, Vector args) {
<         /*
<          * if (incremental) { args.addElement("-xidlon"); } else {
<          * args.addElement("-xidloff"); }
<          */
---
> 
>     protected String getForteLinkerName() {
>         return "CC";
69,89c46,48
<     /**
<      * Returns library path.
<      *  
<      */
<     public File[] getLibraryPath() {
<         if (libDirs == null) {
<             File CCloc = CUtil.getExecutableLocation("CC");
<             if (CCloc != null) {
<                 File compilerLib = new File(new File(CCloc, "../lib")
<                         .getAbsolutePath());
<                 if (compilerLib.exists()) {
<                     libDirs = new File[2];
<                     libDirs[0] = compilerLib;
<                 }
<             }
<             if (libDirs == null) {
<                 libDirs = new File[1];
<             }
<         }
<         libDirs[libDirs.length - 1] = new File("/usr/lib");
<         return libDirs;
---
> 
>     public static ForteCCLinker getInstance() {
>         return instance;
90a50
> 
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/ti
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/trolltech
cvs diff: Diffing src/net/sf/antcontrib/cpptasks/types
cvs diff: Diffing test
cvs diff: Diffing test/c-src
cvs diff: Diffing test/c-src/include
cvs diff: Diffing test/c-src/lib_shared
cvs diff: Diffing test/c-src/lib_static
cvs diff: Diffing test/c-src/testapp
cvs diff: Diffing test/f-src
cvs diff: Diffing test/f-src/include
cvs diff: Diffing test/f-src/lib_shared
cvs diff: Diffing test/f-src/lib_static
cvs diff: Diffing test/f-src/testapp
cvs diff: Diffing test/junit
cvs diff: Diffing test/junit/files
cvs diff: Diffing test/junit/files/openshore
cvs diff: Diffing test/junit/files/xerces-c
cvs diff: Diffing test/junit/net
cvs diff: Diffing test/junit/net/sf
cvs diff: Diffing test/junit/net/sf/antcontrib
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/borland
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/compiler
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/devstudio
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/gcc
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/parser
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/trolltech
cvs diff: Diffing test/junit/net/sf/antcontrib/cpptasks/types
