Bug 1760649: Rearrge to Maven 2 Standard Directory Layout

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@121 32d7a393-a5a9-423c-abd3-5d954feb1f2f

3 files changed, 435 insertions, 0 deletions

diff --git a/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
new file mode 100644
index 0000000..6b1895f
--- /dev/null
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
@@ -0,0 +1,156 @@
+/*
+ * 
+ * Copyright 2002-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.os390;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.CompilerDef;
+import net.sf.antcontrib.cpptasks.compiler.AbstractCompiler;
+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.compiler.Processor;
+import net.sf.antcontrib.cpptasks.types.DefineArgument;
+import net.sf.antcontrib.cpptasks.types.UndefineArgument;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) C++ Compiler
+ * 
+ * @author Hiram Chirino ([email protected])
+ */
+public class OS390CCompiler extends CommandLineCCompiler {
+    private static final AbstractCompiler instance = new OS390CCompiler(false,
+            null);
+    public static AbstractCompiler getInstance() {
+        return instance;
+    }
+    private OS390CCompiler(boolean newEnvironment, Environment env) {
+        super("cxx", null, new String[]{".c", ".cc", ".cpp", ".cxx", ".c++",
+                ".s"}, new String[]{".h", ".hpp"}, ".o", false, null,
+                newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization) {
+        // Specifies that only compilations and assemblies be done.
+        //  Link-edit is not done
+        args.addElement("-c");
+        args.addElement("-W");
+        args.addElement("c,NOEXPMAC,NOSHOWINC");
+        /*
+         * if (exceptions) { args.addElement("/GX"); }
+         */
+        if (debug) {
+            args.addElement("-g");
+            args.addElement("-D");
+            args.addElement("_DEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MTd"); } else { args.addElement("/MDd");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/MLd"); }
+             */
+        } else {
+            args.addElement("-D");
+            args.addElement("NEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MT"); } else { args.addElement("/MD");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/ML"); }
+             */
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        OS390Processor.addWarningSwitch(args, level);
+    }
+    /**
+     * The buildDefineArguments implementation CommandLineCCompiler is not good
+     * for us because os390 defines are give by -D definex instead of
+     * /Ddefinex, 2 args not 1! since we implement this ourslefs, we do not
+     * have to implement the getDefineSwitch() and the getUndefineSwitch().
+     */
+    protected void buildDefineArguments(CompilerDef[] defs, Vector args) {
+        //
+        //   assume that we aren't inheriting defines from containing <cc>
+        //
+        UndefineArgument[] merged = defs[0].getActiveDefines();
+        for (int i = 1; i < defs.length; i++) {
+            //
+            //  if we are inheriting, merge the specific defines with the
+            //      containing defines
+            merged = DefineArgument.merge(defs[i].getActiveDefines(), merged);
+        }
+        StringBuffer buf = new StringBuffer(30);
+        for (int i = 0; i < merged.length; i++) {
+            buf.setLength(0);
+            UndefineArgument current = merged[i];
+            if (current.isDefine()) {
+                args.addElement("-D");
+                buf.append(current.getName());
+                if (current.getValue() != null
+                        && current.getValue().length() > 0) {
+                    buf.append('=');
+                    buf.append(current.getValue());
+                }
+                args.addElement(buf.toString());
+            } else {
+                args.addElement("-U");
+                args.addElement(current.getName());
+            }
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new OS390CCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    /*
+     * @see CommandLineCompiler#getDefineSwitch(StringBuffer, String, String)
+     */
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return OS390Processor.getIncludeDirSwitch(includeDir);
+    }
+    public Linker getLinker(LinkType type) {
+        return OS390Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    /* Only compile one file at time for now */
+    protected int getMaximumInputFilesPerCommand() {
+        return Integer.MAX_VALUE;
+    }
+    /*
+     * @see CommandLineCompiler#getUndefineSwitch(StringBuffer, String)
+     */
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+    }
+}
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
new file mode 100644
index 0000000..9c4f845
--- /dev/null
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
@@ -0,0 +1,208 @@
+/*
+ * 
+ * Copyright 2002-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.os390;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+import net.sf.antcontrib.cpptasks.VersionInfo;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) Linker
+ * 
+ * @author Hiram Chirino ([email protected])
+ */
+public final class OS390Linker extends CommandLineLinker {
+    private static final OS390Linker datasetLinker = new OS390Linker();
+    private static final OS390Linker dllLinker = new OS390Linker("", ".dll");
+    private static final OS390Linker instance = new OS390Linker("", "");
+    public static OS390Linker getDataSetInstance() {
+        return datasetLinker;
+    }
+    public static OS390Linker getInstance() {
+        return instance;
+    }
+    private boolean isADatasetLinker;
+    File outputFile;
+    private String outputPrefix;
+    CCTask task;
+    private OS390Linker() {
+        super("cxx", "/bogus", new String[]{".o", ".a", ".lib", ".xds"},
+                new String[]{".dll", ".x"}, ".xds", false, null);
+        this.outputPrefix = "";
+        this.isADatasetLinker = true;
+    }
+    private OS390Linker(String outputPrefix, String outputSuffix) {
+        super("cxx", "/bogus", new String[]{".o", ".a", ".lib", ".x"},
+                new String[]{".dll"}, outputSuffix, false, null);
+        this.outputPrefix = outputPrefix;
+        this.isADatasetLinker = false;
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-W");
+            args.addElement("l,DLL");
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    /*
+     * @see CommandLineLinker#addLibrarySets(LibrarySet[], Vector, Vector,
+     *      Vector)
+     */
+    protected String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        // If yo want to link against a library sitting in a dataset and
+        // not in the HFS, you can just use the //'dataset' notation
+        // to specify it. e.g:
+        // <libset dir="." libs="//'MQM.V5R2M0.SCSQLOAD'"/>
+        //
+        // We have to have special handling here because the file is not
+        // on the normal filesystem so the task will not noramly include it
+        // as part of the link command.
+        if (libsets != null) {
+            for (int i = 0; i < libsets.length; i++) {
+                String libs[] = libsets[i].getLibs();
+                for (int j = 0; j < libs.length; j++) {
+                    if (libs[j].startsWith("//")) {
+                        endargs.addElement("-l");
+                        endargs.addElement(libs[j]);
+                    } else if (libsets[i].getDataset() != null) {
+                        String ds = libsets[i].getDataset();
+                        endargs.addElement("//'" + ds + "(" + libs[j] + ")'");
+                    }
+                }
+            }
+        }
+        return super.addLibrarySets(task, libsets, preargs, midargs, endargs);
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public File[] getLibraryPath() {
+        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)
+            return datasetLinker;
+        if (linkType.isSharedLibrary())
+            return dllLinker;
+        return instance;
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    public String[] getOutputFileNames(String baseName, VersionInfo versionInfo) {
+    	String[] baseNames = super.getOutputFileNames(baseName, versionInfo);
+    	if (outputPrefix.length() > 0) {
+    		for(int i = 0; i < baseNames.length; i++) {
+    			baseNames[i] = outputPrefix + baseNames[i];
+    		}
+    	}
+        return baseNames;
+    }
+    protected String[] getOutputFileSwitch(CCTask task, String outputFile) {
+        if (isADatasetLinker && task.getDataset() != null) {
+            String ds = task.getDataset();
+            outputFile = "//'" + ds + "(" + outputFile + ")'";
+        }
+        return getOutputFileSwitch(outputFile);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    public boolean isCaseSensitive() {
+        return OS390Processor.isCaseSensitive();
+    }
+    /*
+     * @see CommandLineLinker#link(Task, File, String[],
+     *      CommandLineLinkerConfiguration)
+     */
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        this.task = task;
+        this.outputFile = outputFile;
+        if (isADatasetLinker) {
+            int p = outputFile.getName().indexOf(".");
+            if (p >= 0) {
+                String newname = outputFile.getName().substring(0, p);
+                outputFile = new File(outputFile.getParent(), newname);
+            }
+        }
+        super.link(task, outputFile, sourceFiles, config);
+    }
+    /*
+     * @see CommandLineLinker#runCommand(Task, File, String[])
+     */
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+            throws BuildException {
+        int rc = super.runCommand(task, workingDir, cmdline);
+        // create the .xds file if everything was ok.
+        if (rc == 0) {
+            try {
+                outputFile.delete();
+                new FileOutputStream(outputFile).close();
+            } catch (IOException e) {
+                throw new BuildException(e.getMessage());
+            }
+        }
+        return rc;
+    }
+}
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
new file mode 100644
index 0000000..d3243fc
--- /dev/null
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
@@ -0,0 +1,71 @@
+/*
+ * 
+ * Copyright 2002-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.os390;
+import java.util.Vector;
+/**
+ * A add-in class for IBM (r) OS/390 compilers and linkers
+ * 
+ * @author Hiram Chirino ([email protected])
+ */
+public class OS390Processor {
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+        /*
+         * case 0: args.addElement("/W0"); break;
+         * 
+         * case 1: args.addElement("/W1"); break;
+         * 
+         * case 2: break;
+         * 
+         * case 3: args.addElement("/W3"); break;
+         * 
+         * case 4: args.addElement("/W4"); break;
+         */
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        if (cmdFile.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(cmdFile);
+            buf.append('\"');
+        } else {
+            buf.append(cmdFile);
+        }
+        return buf.toString();
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        StringBuffer buf = new StringBuffer("-o ");
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+        String[] retval = new String[]{buf.toString()};
+        return retval;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    private OS390Processor() {
+    }
+}