Update for bug 1690945. Adds a new compiler option 'msvc8' that extends

'msvc', but switches a flag associated with debug builds (/GZ -> /RTC1) 
to avoid deprecation warnings.



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

3 files changed, 85 insertions, 0 deletions

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));
+    }
+}