diff options
6 files changed, 160 insertions, 4 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java index 9926cc4..588f198 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java @@ -21,6 +21,7 @@ import net.sf.antcontrib.cpptasks.borland.BorlandResourceCompiler; import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranCompiler; import net.sf.antcontrib.cpptasks.compiler.Compiler; import net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler; +import net.sf.antcontrib.cpptasks.devstudio.DevStudio2005CCompiler; import net.sf.antcontrib.cpptasks.devstudio.DevStudioMIDLCompiler; import net.sf.antcontrib.cpptasks.devstudio.DevStudioResourceCompiler; import net.sf.antcontrib.cpptasks.gcc.GccCCompiler; @@ -67,6 +68,10 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * <td>Microsoft Visual C++</td> * </tr> * <tr> + * <td>msvc8</td> + * <td>Microsoft Visual C++ 8</td> + * </tr> + * <tr> * <td>bcc</td> * <td>Borland C++ Compiler</td> * </tr> @@ -182,6 +187,7 @@ public class CompilerEnum extends EnumeratedAttribute { new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()), new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()), new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()), + new ProcessorEnumValue("msvc8", DevStudio2005CCompiler.getInstance()), new ProcessorEnumValue("bcc", BorlandCCompiler.getInstance()), new ProcessorEnumValue("msrc", DevStudioResourceCompiler .getInstance()), diff --git a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudio2005CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudio2005CCompiler.java new file mode 100644 index 0000000..8df73bd --- /dev/null +++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudio2005CCompiler.java @@ -0,0 +1,62 @@ +/* + * + * Copyright 2002-2007 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.devstudio; +import java.util.Vector; + +import net.sf.antcontrib.cpptasks.compiler.LinkType; +import net.sf.antcontrib.cpptasks.compiler.Linker; +import net.sf.antcontrib.cpptasks.compiler.Processor; + +import org.apache.tools.ant.types.Environment; + +/** + * Adapter for the Microsoft(r) C/C++ 8 Optimizing Compiler + * + * @author David Haney + */ +public final class DevStudio2005CCompiler extends DevStudioCompatibleCCompiler { + private static final DevStudio2005CCompiler instance = new DevStudio2005CCompiler( + "cl", false, null); + public static DevStudio2005CCompiler getInstance() { + return instance; + } + private DevStudio2005CCompiler(String command, boolean newEnvironment, + Environment env) { + super(command, "/bogus", newEnvironment, env); + } + /** + * Override the default debug flags to use VC 8 compatible versions. + */ + protected void addDebugSwitch(Vector args) { + args.addElement("/Zi"); + args.addElement("/Od"); + args.addElement("/RTC1"); + args.addElement("/D_DEBUG"); + } + public Processor changeEnvironment(boolean newEnvironment, Environment env) { + if (newEnvironment || env != null) { + return new DevStudio2005CCompiler(getCommand(), newEnvironment, env); + } + return this; + } + public Linker getLinker(LinkType type) { + return DevStudioLinker.getInstance().getLinker(type); + } + public int getMaximumCommandLength() { + return 32767; + } +} diff --git a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java index 2502799..5f37855 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java @@ -72,10 +72,7 @@ public abstract class DevStudioCompatibleCCompiler } if (debug) { mindex += 1; - args.addElement("/Zi"); - args.addElement("/Od"); - args.addElement("/GZ"); - args.addElement("/D_DEBUG"); + addDebugSwitch(args); } else { if (optimization != null) { if (optimization.isSize()) { @@ -97,6 +94,12 @@ public abstract class DevStudioCompatibleCCompiler args.addElement("/GR"); } } + protected void addDebugSwitch(Vector args) { + args.addElement("/Zi"); + args.addElement("/Od"); + args.addElement("/GZ"); + args.addElement("/D_DEBUG"); + } protected void addWarningSwitch(Vector args, int level) { DevStudioProcessor.addWarningSwitch(args, level); } diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java b/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java index e8d7c33..de6c491 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java @@ -37,6 +37,8 @@ public class TestAllClasses extends TestSuite { addTestSuite(net.sf.antcontrib.cpptasks.compiler.TestCommandLineCompilerConfiguration.class); addTestSuite(net.sf.antcontrib.cpptasks.TestDependencyTable.class); addTestSuite(net.sf.antcontrib.cpptasks.types.TestDefineArgument.class); + addTestSuite(net.sf.antcontrib.cpptasks.devstudio.TestDevStudio2005CCompiler.class); + addTestSuite(net.sf.antcontrib.cpptasks.devstudio.TestDevStudioCCompiler.class); addTestSuite(net.sf.antcontrib.cpptasks.devstudio.TestDevStudioLinker.class); addTestSuite(net.sf.antcontrib.cpptasks.TestLinkerDef.class); addTestSuite(net.sf.antcontrib.cpptasks.TestTargetInfo.class); @@ -53,5 +55,6 @@ public class TestAllClasses extends TestSuite { addTestSuite(net.sf.antcontrib.cpptasks.gcc.TestAbstractLdLinker.class); addTestSuite(net.sf.antcontrib.cpptasks.gcc.TestAbstractArLibrarian.class); addTestSuite(net.sf.antcontrib.cpptasks.gcc.TestGccLinker.class); + addTestSuite(net.sf.antcontrib.cpptasks.gcc.TestGccLinker.class); } } diff --git a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java new file mode 100644 index 0000000..dccb986 --- /dev/null +++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java @@ -0,0 +1,41 @@ +/* + * + * Copyright 2002-2007 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.devstudio; +import java.util.Vector; + +import junit.framework.TestCase; + +import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; +/** + * Test Microsoft C/C++ compiler adapter + * + */ +public class TestDevStudio2005CCompiler extends TestCase { + public TestDevStudio2005CCompiler(String name) { + super(name); + } + public void testDebug() { + DevStudio2005CCompiler compiler = DevStudio2005CCompiler.getInstance(); + Vector args = new Vector(); + compiler.addDebugSwitch(args); + assertEquals(4, args.size()); + assertEquals("/Zi", args.elementAt(0)); + assertEquals("/Od", args.elementAt(1)); + assertEquals("/RTC1", args.elementAt(2)); + assertEquals("/D_DEBUG", args.elementAt(3)); + } +} diff --git a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java new file mode 100644 index 0000000..eeeec14 --- /dev/null +++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java @@ -0,0 +1,41 @@ +/* + * + * Copyright 2002-2007 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.devstudio; +import java.util.Vector; + +import junit.framework.TestCase; + +import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; +/** + * Test Microsoft C/C++ compiler adapter + * + */ +public class TestDevStudioCCompiler extends TestCase { + public TestDevStudioCCompiler(String name) { + super(name); + } + public void testDebug() { + DevStudioCCompiler compiler = DevStudioCCompiler.getInstance(); + Vector args = new Vector(); + compiler.addDebugSwitch(args); + assertEquals(4, args.size()); + assertEquals("/Zi", args.elementAt(0)); + assertEquals("/Od", args.elementAt(1)); + assertEquals("/GZ", args.elementAt(2)); + assertEquals("/D_DEBUG", args.elementAt(3)); + } +} |