comparison agent/src/jetbrains/buildServer/symbols/SymbolsIndexer.java @ 11:5fb218a7e574

dropped 'dumpBinariesSign' command - is not used
author Evgeniy.Koshkin
date Thu, 25 Jul 2013 19:11:53 +0400
parents 74f725356087
children 662a0be55de7
comparison
equal deleted inserted replaced
10:a9e69fd3914d 11:5fb218a7e574
29 public static final String EXE_FILE_EXTENSION = "exe"; 29 public static final String EXE_FILE_EXTENSION = "exe";
30 public static final String DLL_FILE_EXTENSION = "dll"; 30 public static final String DLL_FILE_EXTENSION = "dll";
31 31
32 public static final String SYMBOLS_EXE = "JetBrains.CommandLine.Symbols.exe"; 32 public static final String SYMBOLS_EXE = "JetBrains.CommandLine.Symbols.exe";
33 public static final String DUMP_SYMBOL_SIGN_CMD = "dumpSymbolSign"; 33 public static final String DUMP_SYMBOL_SIGN_CMD = "dumpSymbolSign";
34 public static final String DUMP_BIN_SIGN_CMD = "dumpBinSign";
35 34
36 @NotNull private final ArtifactsWatcher myArtifactsWatcher; 35 @NotNull private final ArtifactsWatcher myArtifactsWatcher;
37 @NotNull private final File myNativeToolPath; 36 @NotNull private final File myNativeToolPath;
38 @Nullable private AgentRunningBuild myBuild; 37 @Nullable private AgentRunningBuild myBuild;
39 @Nullable private Collection<File> myBinariesToProcess; 38 @Nullable private Collection<File> myBinariesToProcess;
63 final File targetDir = myBuild.getBuildTempDirectory(); 62 final File targetDir = myBuild.getBuildTempDirectory();
64 try { 63 try {
65 final File symbolSignaturesFile = dumpSymbolSignatures(mySymbolsToProcess, targetDir, myBuild.getBuildLogger()); 64 final File symbolSignaturesFile = dumpSymbolSignatures(mySymbolsToProcess, targetDir, myBuild.getBuildLogger());
66 if(symbolSignaturesFile.exists()){ 65 if(symbolSignaturesFile.exists()){
67 myArtifactsWatcher.addNewArtifactsPath(symbolSignaturesFile + "=>" + ".teamcity/symbols"); 66 myArtifactsWatcher.addNewArtifactsPath(symbolSignaturesFile + "=>" + ".teamcity/symbols");
68 }
69 final File binariesSignaturesFile = dumpBinarySignatures(myBinariesToProcess, targetDir, myBuild.getBuildLogger());
70 if(binariesSignaturesFile.exists()){
71 myArtifactsWatcher.addNewArtifactsPath(binariesSignaturesFile + "=>" + ".teamcity/symbols");
72 } 67 }
73 } catch (IOException e) { 68 } catch (IOException e) {
74 LOG.error("Error while dumping symbols/binaries signatures.", e); 69 LOG.error("Error while dumping symbols/binaries signatures.", e);
75 myBuild.getBuildLogger().error("Error while dumping symbols/binaries signatures."); 70 myBuild.getBuildLogger().error("Error while dumping symbols/binaries signatures.");
76 myBuild.getBuildLogger().exception(e); 71 myBuild.getBuildLogger().exception(e);
115 final File tempFile = FileUtil.createTempFile(targetDir, "symbol-signatures-", ".xml", false); 110 final File tempFile = FileUtil.createTempFile(targetDir, "symbol-signatures-", ".xml", false);
116 runTool(DUMP_SYMBOL_SIGN_CMD, files, tempFile, buildLogger); 111 runTool(DUMP_SYMBOL_SIGN_CMD, files, tempFile, buildLogger);
117 return tempFile; 112 return tempFile;
118 } 113 }
119 114
120 private File dumpBinarySignatures(Collection<File> files, File targetDir, BuildProgressLogger buildLogger) throws IOException {
121 final File tempFile = FileUtil.createTempFile(targetDir, "binary-signatures-", ".xml", false);
122 runTool(DUMP_BIN_SIGN_CMD, files, tempFile, buildLogger);
123 return tempFile;
124 }
125
126 private void runTool(String cmd, Collection<File> files, File output, BuildProgressLogger buildLogger){ 115 private void runTool(String cmd, Collection<File> files, File output, BuildProgressLogger buildLogger){
127 final GeneralCommandLine commandLine = new GeneralCommandLine(); 116 final GeneralCommandLine commandLine = new GeneralCommandLine();
128 commandLine.setExePath(myNativeToolPath.getPath()); 117 commandLine.setExePath(myNativeToolPath.getPath());
129 commandLine.addParameter(cmd); 118 commandLine.addParameter(cmd);
130 commandLine.addParameter(String.format("/o=\"%s\"", output.getPath())); 119 commandLine.addParameter(String.format("/o=\"%s\"", output.getPath()));