[Ant-contrib-cvs] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/ide ProjectDef.java,1.6,1.7 ProjectWriterEnum.java,1.2,1.3

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/ide
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1864/src/net/sf/antcontrib/cpptasks/ide

Modified Files:
	ProjectDef.java ProjectWriterEnum.java 
Log Message:
Bug 980130: Improve VS.NET project generation

Index: ProjectDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/ide/ProjectDef.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ProjectDef.java	21 Jan 2005 21:18:57 -0000	1.6
--- ProjectDef.java	7 Apr 2006 04:20:55 -0000	1.7
***************
*** 1,5 ****
  /*
   *
!  * Copyright 2004-2005 The Ant-Contrib project
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
--- 1,5 ----
  /*
   *
!  * Copyright 2004-2006 The Ant-Contrib project
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 17,33 ****
  package net.sf.antcontrib.cpptasks.ide;
  
- import java.io.File;
- import java.lang.reflect.Method;
- import java.util.Hashtable;
- import java.util.List;
- 
  import net.sf.antcontrib.cpptasks.CCTask;
  import net.sf.antcontrib.cpptasks.CUtil;
  import net.sf.antcontrib.cpptasks.TargetInfo;
- 
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.Project;
  import org.apache.tools.ant.types.DataType;
  
  /**
   *  Requests the creation of an IDE project file.  Experimental.
--- 17,32 ----
  package net.sf.antcontrib.cpptasks.ide;
  
  import net.sf.antcontrib.cpptasks.CCTask;
  import net.sf.antcontrib.cpptasks.CUtil;
  import net.sf.antcontrib.cpptasks.TargetInfo;
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.Project;
  import org.apache.tools.ant.types.DataType;
  
+ import java.io.File;
+ import java.lang.reflect.Method;
+ import java.util.Hashtable;
+ import java.util.List;
+ 
  /**
   *  Requests the creation of an IDE project file.  Experimental.
***************
*** 118,121 ****
--- 117,124 ----
     * </tr>
     * <tr>
+    * <td>msvc8</td>
+    * <td>Microsoft Visual C++ 2005</td>
+    * </tr>
+    * <tr>
     * <td>xcode</td>
     * <td>Apple Xcode</td>

Index: ProjectWriterEnum.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProjectWriterEnum.java	13 Jul 2004 04:31:04 -0000	1.2
--- ProjectWriterEnum.java	7 Apr 2006 04:20:55 -0000	1.3
***************
*** 1,5 ****
  /*
   *
!  * Copyright 2004 The Ant-Contrib project
   *
   * Licensed under the Apache License, Version 2.0 (the "License"); you may not
--- 1,5 ----
  /*
   *
!  * Copyright 2004-2006 The Ant-Contrib project
   *
   * Licensed under the Apache License, Version 2.0 (the "License"); you may not
***************
*** 17,25 ****
  package net.sf.antcontrib.cpptasks.ide;
  
- import org.apache.tools.ant.types.EnumeratedAttribute;
  import net.sf.antcontrib.cpptasks.apple.XcodeProjectWriter;
  import net.sf.antcontrib.cpptasks.borland.CBuilderXProjectWriter;
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioProjectWriter;
  import net.sf.antcontrib.cpptasks.devstudio.VisualStudioNETProjectWriter;
  
  /**
--- 17,25 ----
  package net.sf.antcontrib.cpptasks.ide;
  
  import net.sf.antcontrib.cpptasks.apple.XcodeProjectWriter;
  import net.sf.antcontrib.cpptasks.borland.CBuilderXProjectWriter;
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioProjectWriter;
  import net.sf.antcontrib.cpptasks.devstudio.VisualStudioNETProjectWriter;
+ import org.apache.tools.ant.types.EnumeratedAttribute;
  
  /**
***************
*** 48,51 ****
--- 48,55 ----
   * </tr>
   * <tr>
+  * <td>msvc8</td>
+  * <td>Microsoft Visual C++ 2005</td>
+  * </tr>
+  * <tr>
   * <td>xcode</td>
   * <td>Apple Xcode</td>
***************
*** 63,67 ****
    private static String[] values = new String[] {
        "cbuilderx", "msvc5",
!       "msvc6", "msvc7", "msvc71", "xcode"};
  
    /**
--- 67,71 ----
    private static String[] values = new String[] {
        "cbuilderx", "msvc5",
!       "msvc6", "msvc7", "msvc71", "msvc8", "xcode"};
  
    /**
***************
*** 71,76 ****
        new CBuilderXProjectWriter(), new DevStudioProjectWriter("5.00"),
        new DevStudioProjectWriter("6.00"),
!       new VisualStudioNETProjectWriter("7.00"),
!       new VisualStudioNETProjectWriter("7.10"),
        new XcodeProjectWriter()};
  
--- 75,81 ----
        new CBuilderXProjectWriter(), new DevStudioProjectWriter("5.00"),
        new DevStudioProjectWriter("6.00"),
!       new VisualStudioNETProjectWriter("7.00", "TRUE", "FALSE"),
!       new VisualStudioNETProjectWriter("7.10", "TRUE", "FALSE"),
!       new VisualStudioNETProjectWriter("8.00", "true", "false"),
        new XcodeProjectWriter()};
  
***************
*** 93,94 ****
--- 98,100 ----
    }
  }
+