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, 75 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);
     }