[Ant-contrib-cvs] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/devstudio DevStudioCompatibleLinker.java,1.11,1.12 DevStudioMIDLCompiler.java,1.19,1.20 DevStudioResourceCompiler.java,1.18,1.19

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

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

Modified Files:
	DevStudioCompatibleLinker.java DevStudioMIDLCompiler.java 
	DevStudioResourceCompiler.java 
Log Message:
versioninfo support for msvc and bcc (bug 941119)

Index: DevStudioCompatibleLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DevStudioCompatibleLinker.java	22 Apr 2004 09:06:53 -0000	1.11
--- DevStudioCompatibleLinker.java	11 May 2004 04:50:11 -0000	1.12
***************
*** 17,26 ****
--- 17,31 ----
  package net.sf.antcontrib.cpptasks.devstudio;
  import java.io.File;
+ import java.io.IOException;
  import java.util.Vector;
  
  import net.sf.antcontrib.cpptasks.CUtil;
+ import net.sf.antcontrib.cpptasks.TargetMatcher;
+ import net.sf.antcontrib.cpptasks.VersionInfo;
  import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
  import net.sf.antcontrib.cpptasks.compiler.LinkType;
+ import net.sf.antcontrib.cpptasks.platforms.WindowsPlatform;
  import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+ 
  /**
   * Abstract base class for linkers that try to mimic the command line arguments
***************
*** 119,121 ****
--- 124,146 ----
          return false;
      }
+     
+     /**
+      * Adds source or object files to the bidded fileset to
+      * support version information.
+      * 
+      * @param versionInfo version information
+      * @param linkType link type
+      * @param isDebug true if debug build
+      * @param executableName name of generated executable
+      * @param objDir directory for generated files
+      * @param matcher bidded fileset
+      */
+ 	public void addVersionFiles(final VersionInfo versionInfo, 
+ 			final LinkType linkType,
+ 			final File outputFile,
+ 			final boolean isDebug,
+ 			final File objDir, 
+ 			final TargetMatcher matcher) throws IOException {
+ 		WindowsPlatform.addVersionFiles(versionInfo, linkType, outputFile, isDebug, objDir, matcher);
+ 	}
  }

Index: DevStudioMIDLCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DevStudioMIDLCompiler.java	5 May 2004 03:50:46 -0000	1.19
--- DevStudioMIDLCompiler.java	11 May 2004 04:50:11 -0000	1.20
***************
*** 86,90 ****
                  return "/tlb";
              case 1 :
!                 return new File(outputDir, getOutputFileNames(filename)[0])
                          .getAbsolutePath();
          }
--- 86,90 ----
                  return "/tlb";
              case 1 :
!                 return new File(outputDir, getOutputFileNames(filename, null)[0])
                          .getAbsolutePath();
          }

Index: DevStudioResourceCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DevStudioResourceCompiler.java	5 May 2004 03:50:46 -0000	1.18
--- DevStudioResourceCompiler.java	11 May 2004 04:50:11 -0000	1.19
***************
*** 89,93 ****
              int index) {
          if (index == 0) {
!             String outputFileName = getOutputFileNames(filename)[0];
              String fullOutputName = new File(outputDir, outputFileName)
                      .toString();
--- 89,93 ----
              int index) {
          if (index == 0) {
!             String outputFileName = getOutputFileNames(filename, null)[0];
              String fullOutputName = new File(outputDir, outputFileName)
                      .toString();
***************
*** 114,116 ****
--- 114,119 ----
          DevStudioProcessor.getUndefineSwitch(buffer, define);
      }
+     public String getIdentifier() {
+     	return "Microsoft (R) Windows (R) Resource Compiler";
+     }
  }