changeset 20:10cb71666d5e

more fixes in generated srcsrv
author Evgeniy.Koshkin
date Fri, 02 Aug 2013 17:58:51 +0400
parents c038e1a8c8a5
children d7e0f085b4ea
files agent/src/jetbrains/buildServer/symbols/SrcSrvStreamProvider.java agent/src/jetbrains/buildServer/symbols/SymbolsIndexer.java
diffstat 2 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/agent/src/jetbrains/buildServer/symbols/SrcSrvStreamProvider.java	Fri Aug 02 00:00:17 2013 +0400
+++ b/agent/src/jetbrains/buildServer/symbols/SrcSrvStreamProvider.java	Fri Aug 02 17:58:51 2013 +0400
@@ -26,7 +26,7 @@
  */
 public class SrcSrvStreamProvider {
 
-  private static final String myRestApiUrl = "http://localhost:8111/bs/guestAuth/app/rest";
+  private static final String myRestApiUrl = "http://UNIT-519.Labs.IntelliJ.Net:8111/bs/guestAuth/app/rest";
   private long myBuildId;
   private File mySourcesRootDirectory;
 
@@ -37,20 +37,22 @@
 
   public void dumpStreamToFile(File targetFile, Collection<File> sourceFiles) throws IOException {
     final FileWriter fileWriter = new FileWriter(targetFile.getPath(), true);
+
     try {
-      fileWriter.write("SRCSRV: ini ------------------------------------------------\r\n");
-      fileWriter.write(String.format("VERSION=%d\n", 1));
-      fileWriter.write("SRCSRV: variables ------------------------------------------\r\n");
+      fileWriter.write("SRCSRV: ini ------------------------------------------------\n");
+      fileWriter.write(String.format("VERSION=%d\n", 2));
+      fileWriter.write("VERCTRL=http\n");
+      fileWriter.write("SRCSRV: variables ------------------------------------------\n");
+      fileWriter.write("SRCSRVVERCTRL=http\n");
+      fileWriter.write("SRCSRVCMD=cmd.exe\n");
       fileWriter.write("SRCSRVTRG=%http_extract_target%\n");
-      fileWriter.write("SRCSRVCMD=");
-      fileWriter.write(String.format("HTTP_EXTRACT_TARGET=%s/builds/id:%d/sources/files", myRestApiUrl, myBuildId) + "/%var2%\r\n");
-      fileWriter.write("SRCSRV: source files ------------------------------------------\r\n");
+      fileWriter.write(String.format("HTTP_EXTRACT_TARGET=%s/builds/id:%d/sources/files", myRestApiUrl, myBuildId) + "/%var2%\n");
+      fileWriter.write("SRCSRV: source files ------------------------------------------\n");
       String sourcesRootDirectoryPath = mySourcesRootDirectory.getCanonicalPath();
       for(File sourceFile : sourceFiles){
         final String sourceFileCanonical = sourceFile.getCanonicalPath();
-        fileWriter.write(String.format("%s*%s\r\n", sourceFileCanonical, sourceFileCanonical.substring(sourcesRootDirectoryPath.length() + 1).replace(File.separator, "/")));
+        fileWriter.write(String.format("%s*%s\n", sourceFileCanonical, sourceFileCanonical.substring(sourcesRootDirectoryPath.length() + 1).replace(File.separator, "/")));
       }
-
       fileWriter.write("SRCSRV: end ------------------------------------------------");
     }
     finally {
--- a/agent/src/jetbrains/buildServer/symbols/SymbolsIndexer.java	Fri Aug 02 00:00:17 2013 +0400
+++ b/agent/src/jetbrains/buildServer/symbols/SymbolsIndexer.java	Fri Aug 02 17:58:51 2013 +0400
@@ -84,8 +84,9 @@
       return;
     }
     LOG.debug(SymbolsConstants.BUILD_FEATURE_TYPE + " build feature enabled. Searching for suitable files.");
-    Collection<File> pdbFiles = getArtifactPathsByFileExtension(artifacts, PDB_FILE_EXTENSION);
-    final PdbFilePatcher pdbFilePatcher = new PdbFilePatcher(myBuild.getBuildTempDirectory(), new SrcSrvStreamProvider(myBuild.getBuildId(), myBuild.getCheckoutDirectory()));
+    final Collection<File> pdbFiles = getArtifactPathsByFileExtension(artifacts, PDB_FILE_EXTENSION);
+    final SrcSrvStreamProvider srcSrvStreamProvider = new SrcSrvStreamProvider(myBuild.getBuildId(), myBuild.getCheckoutDirectory());
+    final PdbFilePatcher pdbFilePatcher = new PdbFilePatcher(myBuild.getBuildTempDirectory(), srcSrvStreamProvider);
     for(File pdbFile : pdbFiles){
       try {
         buildLogger.message("Indexing sources appeared in file " + pdbFile.getAbsolutePath());