From 4ea8160dc1106cd7eb33c922a650b3f741ba9009 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Wed, 21 Jul 2004 20:28:44 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3917 --- win_build/boinc_setup_auto.vdproj | 88 +++++++---- .../boinc_setup_commit/boinc_setup_commit.cpp | 31 ++++ .../boinc_setup_commit.vcproj | 142 ++++++++++++++++++ 3 files changed, 230 insertions(+), 31 deletions(-) create mode 100644 win_build/boinc_setup_commit/boinc_setup_commit.cpp create mode 100644 win_build/boinc_setup_commit/boinc_setup_commit.vcproj diff --git a/win_build/boinc_setup_auto.vdproj b/win_build/boinc_setup_auto.vdproj index 9e602abbde..5399792015 100644 --- a/win_build/boinc_setup_auto.vdproj +++ b/win_build/boinc_setup_auto.vdproj @@ -39,6 +39,12 @@ } "Entry" { + "MsmKey" = "8:_5EF32FF56D264B918E11E1064E31199E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7B671C455D8347B698695707C290F708" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -63,12 +69,6 @@ } "Entry" { - "MsmKey" = "8:_97A7AD16DFD045E3A3015C2579915181" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A552AF70FD084FE78F2ADA18198A4CDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -91,6 +91,12 @@ "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_D5166C9FF47DDEB30AE92C39F16E9333" + "OwnerKey" = "8:_88712CCE679D49F9BE808A32135E52E0" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -203,6 +209,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_5EF32FF56D264B918E11E1064E31199E" + { + "SourcePath" = "8:account_lhcathome.cern.ch.xml" + "TargetName" = "8:account_lhcathome.cern.ch.xml" + "Tag" = "8:" + "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{A582A373-4685-4296-BEFE-614B80A702C3}:_7B671C455D8347B698695707C290F708" { "SourcePath" = "8:readme.txt" @@ -243,26 +269,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_97A7AD16DFD045E3A3015C2579915181" - { - "SourcePath" = "8:account_pcolrent20_8080_sixtrack.xml" - "TargetName" = "8:account_pcolrent20_8080_sixtrack.xml" - "Tag" = "8:" - "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{A582A373-4685-4296-BEFE-614B80A702C3}:_B8065E246F8C4326947F7E4DEBBB224F" { "SourcePath" = "8:..\\client\\win\\res\\icon.ico" @@ -303,6 +309,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_D5166C9FF47DDEB30AE92C39F16E9333" + { + "SourcePath" = "8:comdlg32.dll" + "TargetName" = "8:comdlg32.dll" + "Tag" = "8:" + "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } } "FileType" { @@ -392,7 +418,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:BOINC" "ProductCode" = "8:{30BA0563-FA85-413A-ABCF-E5F46E9EB78A}" - "PackageCode" = "8:{CB79496D-4C81-4746-90DD-61A57CC4F8B9}" + "PackageCode" = "8:{12A58FC1-2BC1-458E-A72D-1C0E915852F0}" "UpgradeCode" = "8:{53BBF90F-DA7D-48DA-BF22-619A4BCC28C0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -675,7 +701,7 @@ { "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_1FFCCA8E0373435F86B1A2E7CE2F819F" { - "SourcePath" = "8:Build\\Release\\boinc_cli.exe" + "SourcePath" = "8:Build\\Debug\\boinc_cli.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" @@ -703,7 +729,7 @@ } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8495CFB944E845DF862F02FB34E9F0EF" { - "SourcePath" = "8:Build\\Release\\boinc.dll" + "SourcePath" = "8:Build\\Debug\\boinc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" @@ -731,7 +757,7 @@ } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_88712CCE679D49F9BE808A32135E52E0" { - "SourcePath" = "8:Build\\Release\\boinc_gui.exe" + "SourcePath" = "8:Build\\Debug\\boinc_gui.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_0E7B9DE0EE844F94A2FA0AB7FC76EB80" @@ -787,7 +813,7 @@ } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AE3740F93D234A7FBE4AD2B8FDBA3E8A" { - "SourcePath" = "8:Build\\Release\\boinc.scr" + "SourcePath" = "8:Build\\Debug\\boinc.scr" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1FA0300676FE425ABDB68E797730A45C" diff --git a/win_build/boinc_setup_commit/boinc_setup_commit.cpp b/win_build/boinc_setup_commit/boinc_setup_commit.cpp new file mode 100644 index 0000000000..011ec3c311 --- /dev/null +++ b/win_build/boinc_setup_commit/boinc_setup_commit.cpp @@ -0,0 +1,31 @@ +// boinc_setup_commit.cpp : Defines the entry point for the application. +// + +#include +#include + +int APIENTRY WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + // execute the boinc as a new process and don't wait for it to finish. + + STARTUPINFO si; + PROCESS_INFORMATION pi; + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + + std::string boincDir = lpCmdLine; + std::string boincExePath = boincDir + "\\boinc_gui.exe"; + char commandLine[] = "boinc_gui.exe -min"; + + CreateProcess(boincExePath.c_str(), commandLine, NULL, NULL, FALSE, 0, NULL, boincDir.c_str(), &si, &pi); + // Close process and thread handles. + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + + // Don't wait for process to exit! That's the whole point. + return 0; +} diff --git a/win_build/boinc_setup_commit/boinc_setup_commit.vcproj b/win_build/boinc_setup_commit/boinc_setup_commit.vcproj new file mode 100644 index 0000000000..4d973a53a6 --- /dev/null +++ b/win_build/boinc_setup_commit/boinc_setup_commit.vcproj @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +