Commits

Anonymous committed 2f94489

BugFix: Added some mixing dlls from 7z to deployment folder.

Comments (0)

Files changed (4)

BlueGo.suo

Binary file modified.
         private void bootstrapBoost_1_52_0_x64(string destinationFolder)
         {
             Process p = new Process();
-            ProcessStartInfo info = null;
 
             eCompiler compilerType = DetermineSelectedCompiler();
-            if (compilerType == eCompiler.VS2012)
-                info = new ProcessStartInfo("cmd.exe", @"%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" amd64");
-            if (compilerType == eCompiler.VS2010)
-                info = new ProcessStartInfo("cmd.exe", @"%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"" amd64");
+            ProcessStartInfo info = new ProcessStartInfo("cmd.exe", @"%comspec% /k """ + Compiler.GetCompilerPath(compilerType) + @"\VC\vcvarsall.bat"" amd64");
 
             info.RedirectStandardInput = true;
             info.UseShellExecute = false;
         private void buildBoost_1_52_0_x64(string destinationFolder)
         {
             Process p = new Process();
-            ProcessStartInfo info = null;
 
             eCompiler compilerType = DetermineSelectedCompiler();
-            if (compilerType == eCompiler.VS2012)
-                info = new ProcessStartInfo("cmd.exe", @"%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" amd64");
-            if (compilerType == eCompiler.VS2010)
-                info = new ProcessStartInfo("cmd.exe", @"%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"" amd64");
+            ProcessStartInfo info = new ProcessStartInfo("cmd.exe", @"%comspec% /k """ + Compiler.GetCompilerPath(compilerType) + @"\VC\vcvarsall.bat"" amd64");
+
 
             info.RedirectStandardInput = true;
             info.UseShellExecute = false;
 
                     File.Copy(destinationFolder + extractFolderName + @"\tools\build\v2" + "\\b2.exe", destinationFolder + extractFolderName + "\\b2.exe");
                     sw.WriteLine("cd " + destinationFolder + extractFolderName);
-                    sw.WriteLine(@".\b2 -j" + Math.Max(2, coreCount) + " toolset=msvc --build-type=complete stage");
+
+                    if(compilerType == eCompiler.VS2012)
+                        sw.WriteLine(@".\b2 -j" + Math.Max(2, coreCount) + " toolset=msvc --build-type=complete stage");
+                    else
+                        sw.WriteLine(@".\b2 -j" + Math.Max(2, coreCount) + " toolset=msvc-10.0 --build-type=complete stage");
                 }
             }
 

deploy/BlueGo0.0.6/7-zip.dll

Binary file added.

deploy/BlueGo0.0.6/7z.dll

Binary file added.