3 files changed, 0 insertions, 534 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java b/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
deleted file mode 100644
index c844ac4..0000000
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 
- * Copyright 2001-2004 The Ant-Contrib project
- *
- *  Licensed 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 net.sf.antcontrib.cpptasks.ti;
-import java.io.File;
-import java.util.Vector;
-
-import net.sf.antcontrib.cpptasks.CUtil;
-import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
-import net.sf.antcontrib.cpptasks.compiler.LinkType;
-import net.sf.antcontrib.cpptasks.compiler.Linker;
-import net.sf.antcontrib.cpptasks.OptimizationEnum;
-
-
-import org.apache.tools.ant.types.Environment;
-/**
- * Adapter for TI DSP compilers with cl** commands
- * 
- * @author CurtA
- */
-public class ClxxCCompiler extends CommandLineCCompiler {
-    /**
-     * Header file extensions
-     */
-    private static final String[] headerExtensions = new String[]{".h", ".hpp",
-            ".inl"};
-    /**
-     * Source file extensions
-     */
-    private static final String[] sourceExtensions = new String[]{".c", ".cc",
-            ".cpp", ".cxx", ".c++"};
-    /**
-     * Singleton for TMS320C55x
-     */
-    private static final ClxxCCompiler cl55 = new ClxxCCompiler("cl55", false,
-            null);
-    /**
-     * Singleton for TMS320C6000
-     */
-    private static final ClxxCCompiler cl6x = new ClxxCCompiler("cl6x", false,
-            null);
-    public static ClxxCCompiler getCl55Instance() {
-        return cl55;
-    }
-    public static ClxxCCompiler getCl6xInstance() {
-        return cl6x;
-    }
-    /**
-     * Private constructor
-     * 
-     * @param command
-     *            executable name
-     * @param newEnvironment
-     *            Change environment
-     * @param env
-     *            New environment
-     */
-    private ClxxCCompiler(String command, boolean newEnvironment,
-            Environment env) {
-        super(command, "-h", sourceExtensions, headerExtensions, ".o", false,
-                null, newEnvironment, env);
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addImpliedArgs(java.util.Vector,
-     *      boolean, boolean, boolean,
-     *      net.sf.antcontrib.cpptasks.compiler.LinkType)
-     */
-    protected void addImpliedArgs(
-    		final Vector args, 
-			final boolean debug,
-            final boolean multithreaded, 
-			final boolean exceptions, 
-			final LinkType linkType,
-			final Boolean rtti,
-			final OptimizationEnum optimization) {
-        if (debug) {
-            args.addElement("-gw");
-        }
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addWarningSwitch(java.util.Vector,
-     *      int)
-     */
-    protected void addWarningSwitch(Vector args, int warnings) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getDefineSwitch(java.lang.StringBuffer,
-     *      java.lang.String, java.lang.String)
-     */
-    protected void getDefineSwitch(StringBuffer buffer, String define,
-            String value) {
-        buffer.append("-d");
-        buffer.append(define);
-        if (value != null) {
-            buffer.append('=');
-            buffer.append(value);
-        }
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getEnvironmentIncludePath()
-     */
-    protected File[] getEnvironmentIncludePath() {
-        File[] c_dir = CUtil.getPathFromEnvironment("C_DIR", ";");
-        File[] cx_dir = CUtil.getPathFromEnvironment("C6X_C_DIR", ";");
-        if (c_dir.length == 0) {
-            return cx_dir;
-        }
-        if (cx_dir.length == 0) {
-            return c_dir;
-        }
-        File[] combo = new File[c_dir.length + cx_dir.length];
-        for (int i = 0; i < cx_dir.length; i++) {
-            combo[i] = cx_dir[i];
-        }
-        for (int i = 0; i < c_dir.length; i++) {
-            combo[i + cx_dir.length] = c_dir[i];
-        }
-        return combo;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getIncludeDirSwitch(java.lang.String)
-     */
-    protected String getIncludeDirSwitch(String source) {
-        return "-I" + source;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
-     */
-    public Linker getLinker(LinkType type) {
-        if (type.isStaticLibrary()) {
-            if (this == cl6x) {
-                return ClxxLibrarian.getCl6xInstance();
-            }
-            return ClxxLibrarian.getCl55Instance();
-        }
-        if (type.isSharedLibrary()) {
-            if (this == cl6x) {
-                return ClxxLinker.getCl6xDllInstance();
-            }
-            return ClxxLinker.getCl55DllInstance();
-        }
-        if (this == cl6x) {
-            return ClxxLinker.getCl6xInstance();
-        }
-        return ClxxLinker.getCl55Instance();
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getMaximumCommandLength()
-     */
-    public int getMaximumCommandLength() {
-        return 1024;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getUndefineSwitch(java.lang.StringBuffer,
-     *      java.lang.String)
-     */
-    protected void getUndefineSwitch(StringBuffer buffer, String define) {
-        buffer.append("-u");
-        buffer.append(define);
-    }
-}
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java b/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
deleted file mode 100644
index c48815a..0000000
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 
- * Copyright 2001-2004 The Ant-Contrib project
- *
- *  Licensed 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 net.sf.antcontrib.cpptasks.ti;
-import java.io.File;
-import java.util.Vector;
-
-import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
-import net.sf.antcontrib.cpptasks.compiler.LinkType;
-import net.sf.antcontrib.cpptasks.compiler.Linker;
-import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
-
-/**
- * 
- * Adapter for TI DSP librarian
- *  *
- * @author CurtA
- */
-public class ClxxLibrarian extends CommandLineLinker {
-    private static final ClxxLibrarian cl55Instance = new ClxxLibrarian("ar55");
-    private static final ClxxLibrarian cl6xInstance = new ClxxLibrarian("ar6x");
-    public static final ClxxLibrarian getCl55Instance() {
-        return cl55Instance;
-    }
-    public static final ClxxLibrarian getCl6xInstance() {
-        return cl6xInstance;
-    }
-    private ClxxLibrarian(String command) {
-        super(command, null, new String[]{".o"}, new String[0], ".lib", false,
-                null);
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long,
-     *      java.util.Vector)
-     */
-    protected void addBase(long base, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean,
-     *      java.util.Vector)
-     */
-    protected void addFixed(Boolean fixed, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean,
-     *      net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
-     */
-    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean,
-     *      java.util.Vector)
-     */
-    protected void addIncremental(boolean incremental, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean,
-     *      java.util.Vector)
-     */
-    protected void addMap(boolean map, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int,
-     *      java.util.Vector)
-     */
-    protected void addStack(int stack, Vector args) {
-        // TODO Auto-generated method stub
-    }
-    /* (non-Javadoc)
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
-     */
-    protected void addEntry(String entry, Vector args) {
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
-     */
-    protected String getCommandFileSwitch(String commandFile) {
-        return "@" + commandFile;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
-     */
-    public File[] getLibraryPath() {
-        return new File[0];
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
-     */
-    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
-        return new String[0];
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
-     */
-    public Linker getLinker(LinkType linkType) {
-        return null;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
-     */
-    protected int getMaximumCommandLength() {
-        return 1024;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
-     */
-    protected String[] getOutputFileSwitch(String outputFile) {
-        return new String[]{"-o", outputFile};
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
-     */
-    public boolean isCaseSensitive() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-}
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java b/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
deleted file mode 100644
index bb644a4..0000000
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * 
- * Copyright 2001-2004 The Ant-Contrib project
- *
- *  Licensed 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 net.sf.antcontrib.cpptasks.ti;
-import java.io.File;
-import java.util.Vector;
-
-import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
-import net.sf.antcontrib.cpptasks.compiler.LinkType;
-import net.sf.antcontrib.cpptasks.compiler.Linker;
-import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
-
-/**
- * Adapter for TI DSP linkers
- *  *
- * @author CurtA
- *  
- */
-public class ClxxLinker extends CommandLineLinker {
-    private static final ClxxLinker cl55DllInstance = new ClxxLinker("lnk55",
-            ".dll");
-    private static final ClxxLinker cl55Instance = new ClxxLinker("lnk55",
-            ".exe");
-    private static final ClxxLinker cl6xDllInstance = new ClxxLinker("lnk6x",
-            ".dll");
-    private static final ClxxLinker cl6xInstance = new ClxxLinker("lnk6x",
-            ".exe");
-    public static ClxxLinker getCl55DllInstance() {
-        return cl55DllInstance;
-    }
-    public static ClxxLinker getCl55Instance() {
-        return cl55Instance;
-    }
-    public static ClxxLinker getCl6xDllInstance() {
-        return cl6xDllInstance;
-    }
-    public static ClxxLinker getCl6xInstance() {
-        return cl6xInstance;
-    }
-    private ClxxLinker(String command, String outputSuffix) {
-        super(command, "-h", new String[]{".o", ".lib", ".res"}, new String[]{
-                ".map", ".pdb", ".lnk"}, outputSuffix, false, null);
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long,
-     *      java.util.Vector)
-     */
-    protected void addBase(long base, Vector args) {
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean,
-     *      java.util.Vector)
-     */
-    protected void addFixed(Boolean fixed, Vector args) {
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean,
-     *      net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
-     */
-    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
-        if (linkType.isSharedLibrary()) {
-            args.addElement("-abs");
-        }
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean,
-     *      java.util.Vector)
-     */
-    protected void addIncremental(boolean incremental, Vector args) {
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean,
-     *      java.util.Vector)
-     */
-    protected void addMap(boolean map, Vector args) {
-        if (map) {
-            args.addElement("-m");
-        }
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int,
-     *      java.util.Vector)
-     */
-    protected void addStack(int stack, Vector args) {
-    }
-    /* (non-Javadoc)
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
-     */
-    protected void addEntry(String entry, Vector args) {
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
-     */
-    protected String getCommandFileSwitch(String commandFile) {
-        return "@" + commandFile;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
-     */
-    public File[] getLibraryPath() {
-        return new File[0];
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
-     */
-    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
-    	//
-    	//  TODO: Looks bogus, should be .a or .so's not .o's
-    	//
-    	String[] libpats = new String[libnames.length];
-        for (int i = 0; i < libnames.length; i++) {
-            libpats[i] = libnames[i] + ".o";
-        }
-        return libpats;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
-     */
-    public Linker getLinker(LinkType linkType) {
-        return this;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
-     */
-    protected int getMaximumCommandLength() {
-        return 1024;
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
-     */
-    protected String[] getOutputFileSwitch(String outputFile) {
-        return new String[]{"-o", outputFile};
-    }
-    /*
-     * (non-Javadoc)
-     * 
-     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
-     */
-    public boolean isCaseSensitive() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-}