Fixed NARPLUGIN-106

7 files changed, 782 insertions, 351 deletions

diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
index 6b6c5b5..1281046 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
@@ -45,6 +45,6 @@ public final class DevStudioCCompiler extends DevStudioCompatibleCCompiler {
         return DevStudioLinker.getInstance().getLinker(type);
     }
     public int getMaximumCommandLength() {
-        return 1024;
+        return 32767;
     }
 }
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
index 0ac4f77..2502799 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
@@ -58,7 +58,8 @@ public abstract class DevStudioCompatibleCCompiler
         args.addElement("/c");
         args.addElement("/nologo");
         if (exceptions) {
-            // FREEHEP changed /GX into /EHsc (for VC8, and backward compatible with VC7 and VC6)
+            //   changed to eliminate warning on VC 2005, should support VC 6 and later
+            //   use /GX to support VC5 - 2005 (with warning)
             args.addElement("/EHsc");
         }
         int mindex = 0;
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
index a5e4b41..985dfcf 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
@@ -61,7 +61,7 @@ public abstract class DevStudioCompatibleLibrarian extends CommandLineLinker {
         return new String[0];
     }
     public int getMaximumCommandLength() {
-        return 1024;
+        return 32767;
     }
     public String[] getOutputFileSwitch(String outFile) {
         StringBuffer buf = new StringBuffer("/OUT:");
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
index 8b8e8a6..c21a6f6 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
@@ -63,12 +63,14 @@ public abstract class DevStudioCompatibleLinker extends CommandLineLinker {
         if (linkType.isSharedLibrary()) {
             args.addElement("/DLL");
         }
-        /*
-         * if(linkType.isSubsystemGUI()) {
-         * args.addElement("/SUBSYSTEM:WINDOWS"); } else {
-         * if(linkType.isSubsystemConsole()) {
-         * args.addElement("/SUBSYSTEM:CONSOLE"); } }
-         */
+        //
+        //  The following lines were commented out
+        //   from v 1.5 to v 1.12 with no explanation
+        //
+         if(linkType.isSubsystemGUI()) {
+           args.addElement("/SUBSYSTEM:WINDOWS"); } else {
+         if(linkType.isSubsystemConsole()) {
+           args.addElement("/SUBSYSTEM:CONSOLE"); } }
     }
     protected void addIncremental(boolean incremental, Vector args) {
         if (incremental) {
@@ -115,7 +117,7 @@ public abstract class DevStudioCompatibleLinker extends CommandLineLinker {
         return patterns;
     }
     public int getMaximumCommandLength() {
-        return 1024;
+        return 32767;
     }
     public String[] getOutputFileSwitch(String outputFile) {
         return new String[]{"/OUT:" + outputFile};
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
index 4a7463d..fa2e414 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
@@ -94,7 +94,7 @@ public final class DevStudioMIDLCompiler extends CommandLineCompiler {
         return DevStudioLinker.getInstance().getLinker(type);
     }
     public int getMaximumCommandLength() {
-        return 1024;
+        return 32767;
     }
     protected int getMaximumInputFilesPerCommand() {
         return 1;
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
index e8c8662..6f8360b 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
@@ -99,7 +99,7 @@ public final class DevStudioResourceCompiler extends CommandLineCompiler {
         return DevStudioLinker.getInstance().getLinker(type);
     }
     public int getMaximumCommandLength() {
-        return 1024;
+        return 32767;
     }
     protected int getMaximumInputFilesPerCommand() {
         return 1;
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java b/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
index 9e6072c..898503e 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2004-2005 The Ant-Contrib project
+ * Copyright 2004-2006 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.
@@ -16,25 +16,14 @@
  */
 package net.sf.antcontrib.cpptasks.devstudio;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
 import net.sf.antcontrib.cpptasks.CCTask;
 import net.sf.antcontrib.cpptasks.CUtil;
 import net.sf.antcontrib.cpptasks.TargetInfo;
 import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
-import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
 import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
 import net.sf.antcontrib.cpptasks.ide.ProjectDef;
 import net.sf.antcontrib.cpptasks.ide.ProjectWriter;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.Serializer;
@@ -43,367 +32,806 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Writes a Visual Studio.NET project file.
- * (Visual Studio 5 and 6 project writer is substantially more
-* complete at this point).
- * @author curta
  *
+ * @author curta
  */
 public final class VisualStudioNETProjectWriter
-    implements ProjectWriter {
-  /**
-   * Version of VisualStudio.NET.
-   */
-  private String version;
-
-  /**
-   * Constructor.
-   * @param versionArg String VisualStudio.NET version
-   */
-  public VisualStudioNETProjectWriter(final String versionArg) {
-    this.version = versionArg;
-  }
+        implements ProjectWriter {
+    /**
+     * Version of VisualStudio.NET.
+     */
+    private final String version;
+
+    /**
+     * Literal to represent a true value.
+     */
+    private final String trueLiteral;
+
+    /**
+     * Literal to represent a false value.
+     */
+    private final String falseLiteral;
+
+    /**
+     * Constructor.
+     *
+     * @param versionArg String VisualStudio.NET version
+     * @param trueArg    literal to represent true, "true" in VC 2005.
+     * @param falseArg    literal to represent false, "false" in VC 2005.
+     */
+    public VisualStudioNETProjectWriter(final String versionArg,
+                                        final String trueArg,
+                                        final String falseArg) {
+        if (versionArg == null) {
+            throw new IllegalArgumentException("versionArg");
+        }
+        if (trueArg == null) {
+            throw new IllegalArgumentException("trueArg");
+        }
+        if (falseArg == null) {
+            throw new IllegalArgumentException("falseArg");
+        }
+        this.version = versionArg;
+        this.trueLiteral = trueArg;
+        this.falseLiteral = falseArg;
+    }
+
+    /**
+     * Get configuration name.
+     * @param task cc task, may not be null.
+     * @return configuration name.
+     */
+    private String getConfigurationName(final CCTask task) {
+        if (task.getDebug()) {
+            return "Debug|Win32";
+        }
+        return "Release|Win32";
+    }
+
+    /**
+     * Gets the configuration type.
+     *
+     * @param task cc task, may not be null.
+     * @return configuration type
+     */
+    private String getConfigurationType(final CCTask task) {
+        String outputType = task.getOuttype();
+        String targtype = "2"; // Win32 (x86) Dynamic-Link Library";
+        if ("executable".equals(outputType)) {
+            targtype = "1"; // "Win32 (x86) Console Application";
+        } else if ("static".equals(outputType)) {
+            targtype = "4"; //"Win32 (x86) Static Library";
+        }
+        return targtype;
+    }
 
-  /**
-   * Writes a project definition file.
-   *
-   * @param fileName
-   *            project name for file, should has .cbx extension
-   * @param task
-   *            cc task for which to write project
-   * @param projectDef
-   *            project element
-   * @param sources source files
-   * @param targets compilation targets
-   * @param linkTarget link target
-   * @throws IOException if I/O error
-   * @throws SAXException if XML serialization error
-   */
-  public void writeProject(final File fileName,
-                           final CCTask task,
-                           final ProjectDef projectDef,
-                           final List sources,
-                           final Hashtable targets,
-                           final TargetInfo linkTarget) throws
-      IOException,
-      SAXException {
-
-    boolean isDebug = task.getDebug();
-
-    String projectName = projectDef.getName();
-    if (projectName == null) {
-      projectName = fileName.getName();
+    /**
+     * Get output directory.
+     * @param basePath path to parent of project file.
+     * @param task cc task, may not be null.
+     * @return  output directory relative path.
+     */
+    private String getOutputDirectory(final String basePath,
+                                      final CCTask task) {
+        File outFile = task.getOutfile();
+        File buildDir = outFile.getParentFile();
+        return CUtil.getRelativePath(basePath, buildDir);
+    }
+
+    /**
+     * Get object file directory.
+     * @param basePath path to parent of project file.
+     * @param task cc task, may not be null.
+     * @return  object file directory relative path.
+     */
+    private String getIntermediateDirectory(final String basePath,
+                                            final CCTask task) {
+        File objDir = task.getObjdir();
+        return CUtil.getRelativePath(basePath, objDir);
     }
 
 
-    File dspFile = new File(fileName + ".dsp");
-    if (!projectDef.getOverwrite() && dspFile.exists()) {
-      throw new BuildException("Not allowed to overwrite project file "
-                               + dspFile.toString());
+    /**
+     * Get character set for Windows API.
+     * @param compilerConfig compiler configuration, may not be null.
+     * @return "1" is TCHAR is unicode, "0" if TCHAR is multi-byte.
+     */
+    private String getCharacterSet(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String[] args = compilerConfig.getPreArguments();
+        String charset = "0";
+        for (int i = 0; i < args.length; i++) {
+            if ("/D_UNICODE".equals(args[i]) || "/DUNICODE".equals(args[i])) {
+                charset = "1";
+            }
+            if ("/D_MBCS".equals(args[i])) {
+                charset = "2";
+            }
+        }
+        return charset;
     }
-    File dswFile = new File(fileName + ".dsw");
-    if (!projectDef.getOverwrite() && dswFile.exists()) {
-        throw new BuildException("Not allowed to overwrite project file "
-                                 + dswFile.toString());
-      }
-
-    CommandLineCompilerConfiguration compilerConfig =
-        getBaseCompilerConfiguration(targets);
-    if (compilerConfig == null) {
-      throw new BuildException(
-          "Unable to generate Visual Studio.NET project "
-          + "when Microsoft C++ is not used.");
+
+    /**
+     * Write the start tag of the Configuration element.
+     * @param content serialization content handler.
+     * @param basePath path of directory containing project file.
+     * @param task cc task.
+     * @param compilerConfig compiler configuration.
+     * @throws SAXException thrown if serialization error.
+     */
+    private void writeConfigurationStartTag(final ContentHandler content,
+                                            final String basePath,
+                                            final CCTask task,
+                  final CommandLineCompilerConfiguration compilerConfig)
+            throws SAXException {
+        AttributesImpl attributes = new AttributesImpl();
+        addAttribute(attributes, "Name",
+                getConfigurationName(task));
+        addAttribute(attributes, "OutputDirectory",
+                getOutputDirectory(basePath, task));
+        addAttribute(attributes, "IntermediateDirectory",
+                getIntermediateDirectory(basePath, task));
+        addAttribute(attributes, "ConfigurationType",
+                getConfigurationType(task));
+        addAttribute(attributes, "CharacterSet",
+                getCharacterSet(compilerConfig));
+        content.startElement(null,
+                "Configuration", "Configuration", attributes);
+    }
+
+    /**
+     * Get value of Optimization property.
+     * @param compilerConfig compiler configuration, may not be null.
+     * @return value of Optimization property.
+     */
+    private String getOptimization(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String[] args = compilerConfig.getPreArguments();
+        String opt = "0";
+        for (int i = 0; i < args.length; i++) {
+            if ("/Od".equals(args[i])) {
+                opt = "0";
+            }
+            if ("/O1".equals(args[i])) {
+                opt = "1";
+            }
+            if ("/O2".equals(args[i])) {
+                opt = "2";
+            }
+            if ("/Ox".equals(args[i])) {
+                opt = "3";
+            }
+        }
+        return opt;
     }
 
-    OutputStream outStream = new FileOutputStream(fileName + ".vcproj");
-    OutputFormat format = new OutputFormat("xml", "UTF-8", true);
-    Serializer serializer = new XMLSerializer(outStream, format);
-    ContentHandler content = serializer.asContentHandler();
-    String basePath = fileName.getParentFile().getAbsolutePath();
-    content.startDocument();
-    AttributesImpl emptyAttrs = new AttributesImpl();
-    startElement(content, "VisualStudioProject", new String[] {"ProjectType",
-                 "Version", "Name", "SccProjectName", "SccLocalPath"}
-                 ,
-                 new String[] {"Visual C++", this.version, projectName,
-                 "", ""});
-    content.startElement(null, "Platforms", "Platforms", emptyAttrs);
-    startElement(content, "Platform", new String[] {"Name"}
-                 , new String[] {"Win32"});
-    content.endElement(null, "Platform", "Platform");
-    content.endElement(null, "Platforms", "Platforms");
-    content.startElement(null, "Configurations", "Configurations", emptyAttrs);
-
-    String[] configValues = new String[] {
-            "Debug|Win32",
-            ".\\Debug",
-            ".\\Debug",
-            "2",
-            "0",
-            "FALSE"};
-    if (!isDebug) {
-        configValues[0] = "Release|Win32";
+    /**
+     * Get value of AdditionalIncludeDirectories property.
+     * @param compilerConfig compiler configuration.
+     * @return value of AdditionalIncludeDirectories property.
+     */
+    private String getAdditionalIncludeDirectories(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        StringBuffer includeDirs = new StringBuffer();
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].startsWith("/I")) {
+                includeDirs.append(args[i].substring(2));
+                includeDirs.append(';');
+            }
+        }
+
+        if (includeDirs.length() > 0) {
+            includeDirs.setLength(includeDirs.length() - 1);
+        }
+        return includeDirs.toString();
     }
 
-    startElement(content, "Configuration",
-                 new String[] {"Name", "OutputDirectory",
-                 "IntermediateDirectory", "ConfigurationType", "UseOfMFC",
-                 "ATLMinimizeCRunTimeLibraryUsage"}
-                 , configValues);
-    String[] clValues = new String[] {
-        "VCCLCompilerTool", "0", null, null,
-        "1", "2", ".\\Debug\\testdllproh.pch", ".\\Debug/",
-        ".\\Debug/", ".\\Debug/", "3", "TRUE", "4"};
-    StringBuffer includeDirs = new StringBuffer();
-    StringBuffer defines = new StringBuffer();
-    String[] args = compilerConfig.getPreArguments();
-    for (int i = 0; i < args.length; i++) {
-      if (args[i].startsWith("/I")) {
-        includeDirs.append(args[i].substring(2));
-        includeDirs.append(';');
-      }
-      if (args[i].startsWith("/D")) {
-        defines.append(args[i].substring(2));
-        defines.append(";");
-      }
+    /**
+     * Get value of PreprocessorDefinitions property.
+     * @param compilerConfig compiler configuration.
+     * @return value of PreprocessorDefinitions property.
+     */
+    private String getPreprocessorDefinitions(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        StringBuffer defines = new StringBuffer();
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].startsWith("/D")) {
+                defines.append(args[i].substring(2));
+                defines.append(";");
+            }
+        }
+
+        if (defines.length() > 0) {
+            defines.setLength(defines.length() - 1);
+        }
+        return defines.toString();
     }
 
-    if (includeDirs.length() > 0) {
-      includeDirs.setLength(includeDirs.length() - 1);
+    /**
+     * Get value of RuntimeLibrary property.
+     * @param compilerConfig compiler configuration.
+     * @return value of RuntimeLibrary property.
+     */
+    private String getRuntimeLibrary(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String rtl = null;
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/MT".equals(args[i])) {
+                rtl = "0";
+            }
+            if ("/MTd".equals(args[i])) {
+                rtl = "1";
+            }
+            if ("/MD".equals(args[i])) {
+                rtl = "2";
+            }
+            if ("/MDd".equals(args[i])) {
+                rtl = "3";
+            }
+        }
+        return rtl;
     }
-    if (defines.length() > 0) {
-        defines.setLength(defines.length() - 1);
+
+    /**
+     * Get value of UsePrecompiledHeader property.
+     * @param compilerConfig compiler configuration.
+     * @return value of UsePrecompiledHeader property.
+     */
+    private String getUsePrecompiledHeader(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String usePCH = "0";
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/Yc".equals(args[i])) {
+                usePCH = "1";
+            }
+            if ("/Yu".equals(args[i])) {
+                usePCH = "2";
+            }
+        }
+        return usePCH;
     }
-    clValues[2] = includeDirs.toString();
-    clValues[3] = defines.toString();
-
-    startElement(content, "Tool",
-                 new String[] {"Name", "Optimization",
-                 "AdditionalIncludeDirectories",
-                 "PreprocessorDefinitions", "RuntimeLibrary",
-                 "UsePrecompiledHeaders", "PrecompiledHeaderFile",
-                 "AssemblerListingLocation", "ObjectFile", "WarningLevel",
-                 "SuppressStartupBanner", "DebugInformationFormat"}
-                 , clValues);
-    content.endElement(null, "Tool", "Tool");
-
-
-    String[] linkerValues = new String[] {"VCLinkerTool", null,
-            ".\\Debug/testdllproj.dll", "1",
-            "TRUE", "TRUE", ".\\Debug\\testdllproh.pdb", "2",
-            ".\\Debug/testdllproj.lib", "1"};
-
-    if (!isDebug) {
-        linkerValues[5] = "FALSE";
+
+    /**
+     * Get value of PrecompiledHeaderFile property.
+     * @param compilerConfig compiler configuration.
+     * @return value of PrecompiledHeaderFile property.
+     */
+    private String getPrecompiledHeaderFile(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String pch = null;
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].startsWith("/Fp")) {
+                pch = args[i].substring(3);
+            }
+        }
+        return pch;
     }
 
-    ProcessorConfiguration config = linkTarget.getConfiguration();
-    if (config instanceof CommandLineLinkerConfiguration) {
-      CommandLineLinkerConfiguration linkConfig =
-          (CommandLineLinkerConfiguration) config;
 
-      File[] linkSources = linkTarget.getAllSources();
-      StringBuffer buf = new StringBuffer();
-      for (int i = 0; i < linkSources.length; i++) {
-        //
-        //   if file was not compiled or otherwise generated
-        //
-        if (targets.get(linkSources[i].getName()) == null) {
-          String relPath = CUtil.getRelativePath(basePath, linkSources[i]);
+    /**
+     * Get value of MinimalRebuild property.
+     * @param compilerConfig compiler configuration.
+     * @return value of MinimalRebuild property.
+     */
+    private String getMinimalRebuild(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        return trueLiteral;
+    }
+
+    /**
+     * Get value of BasicRuntimeChecks property.
+     * @param compilerConfig compiler configuration.
+     * @return value of BasicRuntimeChecks property.
+     */
+    private String getBasicRuntimeChecks(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String checks = "0";
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/RTCs".equals(args[i])) {
+                checks = "1";
+            }
+            if ("/RTCu".equals(args[i])) {
+                checks = "2";
+            }
+            if ("/RTC1".equals(args[i]) || "/GZ".equals(args[i])) {
+                checks = "3";
+            }
+        }
+        return checks;
+    }
+
+    /**
+     * Get value of WarningLevel property.
+     * @param compilerConfig compiler configuration.
+     * @return value of WarningLevel property.
+     */
+    private String getWarningLevel(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String warn = null;
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/W0".equals(args[i])) {
+                warn = "0";
+            }
+            if ("/W1".equals(args[i])) {
+                warn = "1";
+            }
+            if ("/W2".equals(args[i])) {
+                warn = "2";
+            }
+            if ("/W3".equals(args[i])) {
+                warn = "3";
+            }
+        }
+        return warn;
+    }
+
+    /**
+     * Get value of Detect64BitPortabilityProblems property.
+     * @param compilerConfig compiler configuration.
+     * @return value of Detect64BitPortabilityProblems property.
+     */
+    private String getDetect64BitPortabilityProblems(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String warn64 = null;
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/Wp64".equals(args[i])) {
+                warn64 = trueLiteral;
+            }
+        }
+        return warn64;
+    }
+
+    /**
+     * Get value of DebugInformationFormat property.
+     * @param compilerConfig compiler configuration.
+     * @return value of DebugInformationFormat property.
+     */
+    private String getDebugInformationFormat(
+            final CommandLineCompilerConfiguration compilerConfig) {
+        String format = "0";
+        String[] args = compilerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/Z7".equals(args[i])) {
+                format = "1";
+            }
+            if ("/Zi".equals(args[i])) {
+                format = "3";
+            }
+            if ("/ZI".equals(args[i])) {
+                format = "4";
+            }
+        }
+        return format;
+    }
+
+    /**
+     * write the Compiler element.
+     * @param content serialization content handler.
+     * @param compilerConfig compiler configuration.
+     * @throws SAXException thrown if error during serialization.
+     */
+    private void writeCompilerElement(final ContentHandler content,
+            final CommandLineCompilerConfiguration compilerConfig)
+            throws SAXException {
+        AttributesImpl attributes = new AttributesImpl();
+        addAttribute(attributes, "Name", "VCCLCompilerTool");
+        addAttribute(attributes, "Optimization",
+                getOptimization(compilerConfig));
+        addAttribute(attributes, "AdditionalIncludeDirectories",
+                getAdditionalIncludeDirectories(compilerConfig));
+        addAttribute(attributes, "PreprocessorDefinitions",
+                getPreprocessorDefinitions(compilerConfig));
+        addAttribute(attributes, "MinimalRebuild",
+                getMinimalRebuild(compilerConfig));
+        addAttribute(attributes, "BasicRuntimeChecks",
+                getBasicRuntimeChecks(compilerConfig));
+        addAttribute(attributes, "RuntimeLibrary",
+                getRuntimeLibrary(compilerConfig));
+        addAttribute(attributes, "UsePrecompiledHeader",
+                getUsePrecompiledHeader(compilerConfig));
+        addAttribute(attributes, "PrecompiledHeaderFile",
+                getPrecompiledHeaderFile(compilerConfig));
+        addAttribute(attributes, "WarningLevel",
+                getWarningLevel(compilerConfig));
+        addAttribute(attributes, "Detect64BitPortabilityProblems",
+                getDetect64BitPortabilityProblems(compilerConfig));
+        addAttribute(attributes, "DebugInformationFormat",
+                getDebugInformationFormat(compilerConfig));
+        content.startElement(null, "Tool", "Tool", attributes);
+        content.endElement(null, "Tool", "Tool");
+
+    }
+
+
+    /**
+     * Get value of LinkIncremental property.
+     * @param linkerConfig linker configuration.
+     * @return value of LinkIncremental property
+     */
+    private String getLinkIncremental(
+            final CommandLineLinkerConfiguration linkerConfig) {
+        String incremental = "0";
+        String[] args = linkerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/INCREMENTAL:NO".equals(args[i])) {
+                incremental = "1";
+            }
+            if ("/INCREMENTAL:YES".equals(args[i])) {
+                incremental = "2";
+            }
+        }
+        return incremental;
+    }
+
+    /**
+     * Get value of GenerateDebugInformation property.
+     * @param linkerConfig linker configuration.
+     * @return value of GenerateDebugInformation property
+     */
+    private String getGenerateDebugInformation(
+            final CommandLineLinkerConfiguration linkerConfig) {
+        String debug = falseLiteral;
+        String[] args = linkerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/DEBUG".equals(args[i])) {
+                debug = trueLiteral;
+            }
+        }
+        return debug;
+    }
+
+    /**
+     * Get value of Subsystem property.
+     * @param linkerConfig linker configuration.
+     * @return value of Subsystem property
+     */
+    private String getSubsystem(
+            final CommandLineLinkerConfiguration linkerConfig) {
+        String subsystem = "0";
+        String[] args = linkerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/SUBSYSTEM:CONSOLE".equals(args[i])) {
+                subsystem = "1";
+            }
+            if ("/SUBSYSTEM:WINDOWS".equals(args[i])) {
+                subsystem = "2";
+            }
+            if ("/SUBSYSTEM:WINDOWSCE".equals(args[i])) {
+                subsystem = "9";
+            }
+        }
+        return subsystem;
+    }
+
+    /**
+     * Get value of TargetMachine property.
+     * @param linkerConfig linker configuration.
+     * @return value of TargetMachine property
+     */
+    private String getTargetMachine(
+            final CommandLineLinkerConfiguration linkerConfig) {
+        String subsystem = "0";
+        String[] args = linkerConfig.getPreArguments();
+        for (int i = 0; i < args.length; i++) {
+            if ("/MACHINE:X86".equals(args[i])) {
+                subsystem = "1";
+            }
+        }
+        return subsystem;
+    }
+
+    /**
+     * Get value of AdditionalDependencies property.
+     * @param linkTarget link target.
+     * @param targets all targets.
+     * @param basePath path to directory containing project file.
+     * @return value of AdditionalDependencies property.
+     */
+    private String getAdditionalDependencies(final TargetInfo linkTarget,
+                                             final Map targets,
+                                             final String basePath) {
+      String dependencies = null;
+        File[] linkSources = linkTarget.getAllSources();
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < linkSources.length; i++) {
+          //
+          //   if file was not compiled or otherwise generated
           //
-          //   if path has an embedded space then
-          //      must quote
-          if (relPath.indexOf(' ') > 0) {
-            buf.append('\"');
-            buf.append(relPath);
-            buf.append('\"');
-          } else {
-             buf.append(relPath);
+          if (targets.get(linkSources[i].getName()) == null) {
+            String relPath = CUtil.getRelativePath(basePath, linkSources[i]);
+            //
+            //   if path has an embedded space then
+            //      must quote
+            if (relPath.indexOf(' ') > 0) {
+              buf.append('\"');
+              buf.append(relPath);
+              buf.append('\"');
+            } else {
+               buf.append(relPath);
+            }
+            buf.append(';');
           }
-          buf.append(';');
         }
-      }
-      if (buf.length() > 0) {
-        buf.setLength(buf.length() - 1);
-        linkerValues[1] = buf.toString();
-      }
+        if (buf.length() > 0) {
+          buf.setLength(buf.length() - 1);
+          dependencies = buf.toString();
+        }
+      return dependencies;
+
     }
 
-    startElement(content, "Tool",
-                 new String[] {"Name",
-                               "AdditionalDependencies",
-                               "OutputFile",
-                               "LinkIncremental",
-                               "SuppressStartupBanner",
-                               "GenerateDebugInformation",
-                               "ProgramDatabaseFile",
-                               "SubSystem",
-                               "ImportLibrary",
-                               "TargetMachine"}
-                 , linkerValues);
-    content.endElement(null, "Tool", "Tool");
-    content.endElement(null, "Configuration", "Configuration");
-    content.endElement(null, "Configurations", "Configurations");
-    content.startElement(null, "References", "References", emptyAttrs);
-    content.endElement(null, "References", "References");
-    content.startElement(null, "Files", "Files", emptyAttrs);
-
-
-    File[] sortedSources = new File[sources.size()];
-    sources.toArray(sortedSources);
-    Arrays.sort(sortedSources, new Comparator() {
-      public int compare(final Object o1, final Object o2) {
-        return ((File) o1).getName().compareTo(((File) o2).getName());
-      }
-    });
-
-    writeFilteredSources("Source Files",
-       "cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx",
-       basePath, sortedSources, content);
-
-    writeFilteredSources("Header Files", "h;hpp;hxx;hm;inl;inc;xsd",
-       basePath, sortedSources, content);
-
-    writeFilteredSources("Resource Files",
-       "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx",
-       basePath, sortedSources, content);
-
-    content.endElement(null, "Files", "Files");
-    content.startElement(null, "Globals", "Globals", emptyAttrs);
-    content.endElement(null, "Globals", "Globals");
-    content.endElement(null, "VisualStudioProject", "VisualStudioProject");
-    content.endDocument();
-  }
+    /**
+     * Write Tool element for linker.
+     * @param content serialization content handler.
+     * @param basePath path to directory containing project file.
+     * @param linkTarget link target.
+     * @param targets  all targets.
+     * @throws SAXException thrown if error during serialization.
+     */
+    private void writeLinkerElement(final ContentHandler content,
+                                    final String basePath,
+                                    final TargetInfo linkTarget,
+                                    final Map targets) throws SAXException {
+        AttributesImpl attributes = new AttributesImpl();
+        addAttribute(attributes, "Name", "VCLinkerTool");
+
+        ProcessorConfiguration config = linkTarget.getConfiguration();
+        if (config instanceof CommandLineLinkerConfiguration) {
+            CommandLineLinkerConfiguration linkerConfig =
+                    (CommandLineLinkerConfiguration) config;
+            if (linkerConfig.getLinker() instanceof DevStudioCompatibleLinker) {
+                addAttribute(attributes, "LinkIncremental",
+                        getLinkIncremental(linkerConfig));
+                addAttribute(attributes, "GenerateDebugInformation",
+                        getGenerateDebugInformation(linkerConfig));
+                addAttribute(attributes, "SubSystem",
+                        getSubsystem(linkerConfig));
+                addAttribute(attributes, "TargetMachine",
+                        getTargetMachine(linkerConfig));
+            }
+        }
+        addAttribute(attributes, "AdditionalDependencies",
+                getAdditionalDependencies(linkTarget, targets, basePath));
+        content.startElement(null, "Tool", "Tool", attributes);
+        content.endElement(null, "Tool", "Tool");
+    }
 
-  /**
-   * Writes a cluster of source files to the project.
-   * @param name name of filter
-   * @param filter file extensions
-   * @param basePath base path for files
-   * @param sortedSources array of source files
-   * @param content generated project
-   * @throws SAXException if invalid content
-   */
-  private void writeFilteredSources(final String name, final String filter,
-        final String basePath,
-        final File[] sortedSources,
-        final ContentHandler content)
-        throws SAXException {
-    AttributesImpl filterAttrs = new AttributesImpl();
-    filterAttrs.addAttribute(null, "Name", "Name", "#PCDATA", name);
-    filterAttrs.addAttribute(null, "Filter", "Filter", "#PCDATA", filter);
-    content.startElement(null, "Filter", "Filter", filterAttrs);
-
-
-    AttributesImpl fileAttrs = new AttributesImpl();
-    fileAttrs.addAttribute(null, "RelativePath", "RelativePath",
-                           "#PCDATA", "");
-
-    AttributesImpl fileConfigAttrs = new AttributesImpl();
-    fileConfigAttrs.addAttribute(null, "Name", "Name",
-                                 "#PCDATA", "Debug|Win32");
-
-    AttributesImpl toolAttrs = new AttributesImpl();
-    toolAttrs.addAttribute(null, "Name", "Name",
-                           "#PCDATA", "VCCLCompilerTool");
-    toolAttrs.addAttribute(null, "Optimization", "Optimization",
-                           "#PCDATA", "0");
-    toolAttrs.addAttribute(null, "PreprocessorDefinitions",
-                           "PreprocessorDefinitions", "#PCDATA",
-                           "WIN32;_DEBUG;_WINDOWS;$(NoInherit}");
-
-    for (int i = 0; i < sortedSources.length; i++) {
-       if (isGroupMember(filter, sortedSources[i])) {
-            String relativePath = CUtil.getRelativePath(basePath,
-                             sortedSources[i]);
-            fileAttrs.setValue(0, relativePath);
-            content.startElement(null, "File", "File", fileAttrs);
-            content.startElement(null, "FileConfiguration", "FileConfiguration",
-                             fileConfigAttrs);
-            content.startElement(null, "Tool", "Tool", toolAttrs);
-            content.endElement(null, "Tool", "Tool");
-            content.endElement(null, "FileConfiguration", "FileConfiguration");
-            content.endElement(null, "File", "File");
-        }
-     }
-     content.endElement(null, "Filter", "Filter");
+    /**
+     * Writes a project definition file.
+     *
+     * @param fileName   project name for file, should has .cbx extension
+     * @param task       cc task for which to write project
+     * @param projectDef project element
+     * @param sources    source files
+     * @param targets    compilation targets
+     * @param linkTarget link target
+     * @throws IOException  if I/O error
+     * @throws SAXException if XML serialization error
+     */
+    public void writeProject(final File fileName,
+                             final CCTask task,
+                             final ProjectDef projectDef,
+                             final List sources,
+                             final Hashtable targets,
+                             final TargetInfo linkTarget) throws
+            IOException,
+            SAXException {
+
+        String projectName = projectDef.getName();
+        if (projectName == null) {
+            projectName = fileName.getName();
+        }
 
-  }
 
-  /**
-   * Returns true if the file has an extension that appears in the group filter.
-   * @param filter String group filter
-   * @param candidate File file
-   * @return boolean true if member of group
-   */
-  private boolean isGroupMember(final String filter, final File candidate) {
-    String fileName = candidate.getName();
-    int lastDot = fileName.lastIndexOf('.');
-    if (lastDot >= 0 && lastDot < fileName.length() - 1) {
-      String extension =
-           ";" + fileName.substring(lastDot + 1).toLowerCase() + ";";
-      String semiFilter = ";" + filter + ";";
-      return semiFilter.indexOf(extension) >= 0;
+        File vcprojFile = new File(fileName + ".vcproj");
+        if (!projectDef.getOverwrite() && vcprojFile.exists()) {
+            throw new BuildException("Not allowed to overwrite project file "
+                    + vcprojFile.toString());
+        }
+        File slnFile = new File(fileName + ".sln");
+        if (!projectDef.getOverwrite() && slnFile.exists()) {
+            throw new BuildException("Not allowed to overwrite project file "
+                    + slnFile.toString());
+        }
+
+        CommandLineCompilerConfiguration compilerConfig =
+                getBaseCompilerConfiguration(targets);
+        if (compilerConfig == null) {
+            throw new BuildException(
+                    "Unable to generate Visual Studio.NET project "
+                            + "when Microsoft C++ is not used.");
+        }
+
+        OutputStream outStream = new FileOutputStream(fileName + ".vcproj");
+        OutputFormat format = new OutputFormat("xml", "UTF-8", true);
+        Serializer serializer = new XMLSerializer(outStream, format);
+        ContentHandler content = serializer.asContentHandler();
+        String basePath = fileName.getParentFile().getAbsolutePath();
+        content.startDocument();
+        AttributesImpl emptyAttrs = new AttributesImpl();
+
+        AttributesImpl attributes = new AttributesImpl();
+        addAttribute(attributes, "ProjectType", "Visual C++");
+        addAttribute(attributes, "Version", version);
+        addAttribute(attributes, "Name", projectName);
+        content.startElement(null, "VisualStudioProject",
+                "VisualStudioProject", attributes);
+
+        content.startElement(null, "Platforms", "Platforms", emptyAttrs);
+        attributes.clear();
+        addAttribute(attributes, "Name", "Win32");
+        content.startElement(null, "Platform", "Platform", attributes);
+        content.endElement(null, "Platform", "Platform");
+        content.endElement(null, "Platforms", "Platforms");
+        content.startElement(null, "Configurations",
+                "Configurations", emptyAttrs);
+
+        writeConfigurationStartTag(content, basePath, task, compilerConfig);
+
+        writeCompilerElement(content, compilerConfig);
+
+        writeLinkerElement(content, basePath, linkTarget, targets);
+
+        content.endElement(null, "Configuration", "Configuration");
+        content.endElement(null, "Configurations", "Configurations");
+        content.startElement(null, "References", "References", emptyAttrs);
+        content.endElement(null, "References", "References");
+        content.startElement(null, "Files", "Files", emptyAttrs);
+
+
+        File[] sortedSources = new File[sources.size()];
+        sources.toArray(sortedSources);
+        Arrays.sort(sortedSources, new Comparator() {
+            public int compare(final Object o1, final Object o2) {
+                return ((File) o1).getName().compareTo(((File) o2).getName());
+            }
+        });
+
+        writeFilteredSources("Source Files",
+                "cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx",
+                basePath, sortedSources, content);
+
+        writeFilteredSources("Header Files", "h;hpp;hxx;hm;inl;inc;xsd",
+                basePath, sortedSources, content);
+
+        writeFilteredSources("Resource Files",
+                "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx",
+                basePath, sortedSources, content);
+
+        content.endElement(null, "Files", "Files");
+        content.startElement(null, "Globals", "Globals", emptyAttrs);
+        content.endElement(null, "Globals", "Globals");
+        content.endElement(null, "VisualStudioProject", "VisualStudioProject");
+        content.endDocument();
     }
-    return false;
-  }
 
+    /**
+     * Writes a cluster of source files to the project.
+     *
+     * @param name          name of filter
+     * @param filter        file extensions
+     * @param basePath      base path for files
+     * @param sortedSources array of source files
+     * @param content       generated project
+     * @throws SAXException if invalid content
+     */
+    private void writeFilteredSources(final String name, final String filter,
+                                      final String basePath,
+                                      final File[] sortedSources,
+                                      final ContentHandler content)
+            throws SAXException {
+        AttributesImpl filterAttrs = new AttributesImpl();
+        filterAttrs.addAttribute(null, "Name", "Name", "#PCDATA", name);
+        filterAttrs.addAttribute(null, "Filter", "Filter", "#PCDATA", filter);
+        content.startElement(null, "Filter", "Filter", filterAttrs);
+
+
+        AttributesImpl fileAttrs = new AttributesImpl();
+        fileAttrs.addAttribute(null, "RelativePath", "RelativePath",
+                "#PCDATA", "");
+
+
+        for (int i = 0; i < sortedSources.length; i++) {
+            if (isGroupMember(filter, sortedSources[i])) {
+                String relativePath = CUtil.getRelativePath(basePath,
+                        sortedSources[i]);
+                fileAttrs.setValue(0, relativePath);
+                content.startElement(null, "File", "File", fileAttrs);
+                content.endElement(null, "File", "File");
+            }
+        }
+        content.endElement(null, "Filter", "Filter");
+
+    }
 
-  /**
-   * Start an element.
-   * @param content ContentHandler content handler
-   * @param tagName String tag name
-   * @param attributeNames String[] attribute names
-   * @param attributeValues String[] attribute values
-   * @throws SAXException if error writing element
-   */
-  private void startElement(final ContentHandler content,
-                                  final String tagName,
-                                  final String[] attributeNames,
-                                  final String[] attributeValues)
-      throws SAXException {
-    AttributesImpl attributes = new AttributesImpl();
-    for (int i = 0; i < attributeNames.length; i++) {
-        if (attributeValues[i] != null) {
-            attributes.addAttribute(null, attributeNames[i],
-               attributeNames[i], "#PCDATA", attributeValues[i]);
+    /**
+     * Returns true if the file has an extension that
+     *   appears in the group filter.
+     *
+     * @param filter    String group filter
+     * @param candidate File file
+     * @return boolean true if member of group
+     */
+    private boolean isGroupMember(final String filter, final File candidate) {
+        String fileName = candidate.getName();
+        int lastDot = fileName.lastIndexOf('.');
+        if (lastDot >= 0 && lastDot < fileName.length() - 1) {
+            String extension =
+                    ";" + fileName.substring(lastDot + 1).toLowerCase() + ";";
+            String semiFilter = ";" + filter + ";";
+            return semiFilter.indexOf(extension) >= 0;
         }
+        return false;
     }
-    content.startElement(null, tagName, tagName, attributes);
-  }
 
-  /**
-   * Gets the first recognized compiler from the
-   * compilation targets.
-   * @param targets compilation targets
-   * @return representative (hopefully) compiler configuration
-   */
-  private CommandLineCompilerConfiguration
-      getBaseCompilerConfiguration(final Hashtable targets) {
-    //
-    //   find first target with an DevStudio C compilation
-    //
-    CommandLineCompilerConfiguration compilerConfig = null;
-    //
-    //   get the first target and assume that it is representative
-    //
-    Iterator targetIter = targets.values().iterator();
-    while (targetIter.hasNext()) {
-      TargetInfo targetInfo = (TargetInfo) targetIter.next();
-      ProcessorConfiguration config = targetInfo.getConfiguration();
-      String identifier = config.getIdentifier();
-      //
-      //   for the first cl compiler
-      //
-      if (config instanceof CommandLineCompilerConfiguration) {
-        compilerConfig = (CommandLineCompilerConfiguration) config;
-        if (compilerConfig.getCompiler() instanceof DevStudioCCompiler) {
-          return compilerConfig;
-        }
-      }
+
+    /**
+     * Adds an non-namespace-qualified attribute to attribute list.
+     * @param attributes list of attributes.
+     * @param attrName attribute name, may not be null.
+     * @param attrValue attribute value, if null attribute is not added.
+     */
+    private static void addAttribute(final AttributesImpl attributes,
+                                     final String attrName,
+                                     final String attrValue) {
+        if (attrName == null) {
+            throw new IllegalArgumentException("attrName");
+        }
+        if (attrValue != null) {
+            attributes.addAttribute(null, attrName, attrName,
+                    "#PCDATA", attrValue);
+        }
     }
-    return null;
-  }
 
+    /**
+     * Gets the first recognized compiler from the
+     * compilation targets.
+     * @param targets compilation targets
+     * @return representative (hopefully) compiler configuration
+     */
+    private CommandLineCompilerConfiguration
+            getBaseCompilerConfiguration(final Hashtable targets) {
+        //
+        //   get the first target and assume that it is representative
+        //
+        Iterator targetIter = targets.values().iterator();
+        while (targetIter.hasNext()) {
+            TargetInfo targetInfo = (TargetInfo) targetIter.next();
+            ProcessorConfiguration config = targetInfo.getConfiguration();
+            //
+            //   for the first cl compiler
+            //
+            if (config instanceof CommandLineCompilerConfiguration) {
+                CommandLineCompilerConfiguration compilerConfig =
+                        (CommandLineCompilerConfiguration) config;
+                if (compilerConfig.getCompiler()
+                        instanceof DevStudioCCompiler) {
+                    return compilerConfig;
+                }
+            }
+        }
+        return null;
+  }
 }
+