Menu
▾
▴
[Vapor-cvs] vapor/make/win32/installx64 installVapor64.vbs, 1.1, 1.2 installx64.vdproj, 1.5, 1.6 uninstallVapor64.vbs, 1.1, 1.2
|
From: Alan N. <ala...@us...> - 2013-05-24 20:43:15
|
Update of /cvsroot/vapor/vapor/make/win32/installx64 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6834/make/win32/installx64 Modified Files: installVapor64.vbs installx64.vdproj uninstallVapor64.vbs Log Message: windows 64 bit installer changes Index: installVapor64.vbs =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/installVapor64.vbs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installVapor64.vbs 25 Feb 2013 21:40:27 -0000 1.1 --- installVapor64.vbs 24 May 2013 20:43:11 -0000 1.2 *************** *** 17,24 **** vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporshare = vaporhome & "\share" ! vaporbin = vaporhome & "\bin" ! pythonhome = vaporhome & "\lib\python2.7" set shell = CreateObject("wscript.shell") --- 17,24 ---- vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporshare = vaporhome & "share" ! vaporbin = vaporhome & "bin" ! pythonhome = vaporhome & "lib\python2.7" set shell = CreateObject("wscript.shell") Index: installx64.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/installx64.vdproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** installx64.vdproj 22 May 2013 16:40:04 -0000 1.5 --- installx64.vdproj 24 May 2013 20:43:11 -0000 1.6 *************** *** 1738,1741 **** --- 1738,1747 ---- "Entry" { + "MsmKey" = "8:_1D1DF222EE9048FBA11BD220DBBBE1EF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1D32C16C1D224AEE8981ADC90DF1C2E1" "OwnerKey" = "8:_UNDEFINED" *************** *** 6604,6745 **** "Entry" { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0147C8B653E5457D96D9D0337D30DF62" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_FDA356D9B41F47C2B1C9C8A98F0551FD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E79D40AABBD44DCA9277EC80150D6DA6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E35D24EDF5754A3E9049C5F43603B9EA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E09396421FEF4ABCB18F6F4D21E31D66" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_D6E7294A50984795A231ED9BDFBB9A16" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_C70709A645C84B96B7373237C41C67A9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_BEFB9652EBE94E7EA14CF8A7982B8030" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_BA218974A26D405B8781E3228BCD4878" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B90087F044BA475C93CFA73F989D1004" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B17F4D39CB3B49858357A54FF24C8126" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B03034576D3846D083779B6C97F452EB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_A959AF6F77684C23BD4704200EFF7E64" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_A74814D5AF6B438DA3C01EBD55FB14E4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_8E4D2972ACC844138FBEC2FBAFB4A629" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_6F86F3B76DE2499BA72CFCD3F95409CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_548C787106A8467CA5C6A9A61F081C2A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_328FD80F6E564155946A92F6ADAC5FCC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_17FD01BE47A74BC5B6E29EDFF231D207" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0CAB6645FD21421E85C1AB5FBC29BF64" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0937ACF405824FB6854FBD4A879AFB2F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_03715B5A9B4C48FD8D89B534F67269D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_016286A7A8D946DF8C63A666EE031B4B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7439F2BDFE3F4F2AA6C6D7079F8568C1" "OwnerKey" = "8:_UNDEFINED" --- 6610,6613 ---- *************** *** 9550,9559 **** "Entry" { - "MsmKey" = "8:_A237A1A012124404BC7362EABB3B3EF4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A2735E8A0F0B47C18C28B7F29F4BC664" "OwnerKey" = "8:_UNDEFINED" --- 9418,9421 ---- *************** *** 13312,13315 **** --- 13174,13315 ---- "Entry" { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0147C8B653E5457D96D9D0337D30DF62" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_FDA356D9B41F47C2B1C9C8A98F0551FD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E79D40AABBD44DCA9277EC80150D6DA6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E35D24EDF5754A3E9049C5F43603B9EA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E09396421FEF4ABCB18F6F4D21E31D66" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_D6E7294A50984795A231ED9BDFBB9A16" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_C70709A645C84B96B7373237C41C67A9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_BEFB9652EBE94E7EA14CF8A7982B8030" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_BA218974A26D405B8781E3228BCD4878" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B90087F044BA475C93CFA73F989D1004" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B17F4D39CB3B49858357A54FF24C8126" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B03034576D3846D083779B6C97F452EB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_A959AF6F77684C23BD4704200EFF7E64" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_A74814D5AF6B438DA3C01EBD55FB14E4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_8E4D2972ACC844138FBEC2FBAFB4A629" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_6F86F3B76DE2499BA72CFCD3F95409CA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_548C787106A8467CA5C6A9A61F081C2A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_328FD80F6E564155946A92F6ADAC5FCC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_17FD01BE47A74BC5B6E29EDFF231D207" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0CAB6645FD21421E85C1AB5FBC29BF64" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0937ACF405824FB6854FBD4A879AFB2F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_03715B5A9B4C48FD8D89B534F67269D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_016286A7A8D946DF8C63A666EE031B4B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DBE68E7AF95443A7AD91621159AD0B69" "OwnerKey" = "8:_UNDEFINED" *************** *** 21137,21140 **** --- 21137,21160 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1D1DF222EE9048FBA11BD220DBBBE1EF" + { + "SourcePath" = "8:..\\..\\..\\scripts\\vdfcp.pl" + "TargetName" = "8:vdfcp.pl" + "Tag" = "8:" + "Folder" = "8:_B4C7BDF9C0004C2E8011C05734A38F12" + "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:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1D32C16C1D224AEE8981ADC90DF1C2E1" { *************** *** 46437,46460 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A237A1A012124404BC7362EABB3B3EF4" - { - "SourcePath" = "8:..\\..\\..\\scripts\\vdfcp" - "TargetName" = "8:vdfcp" - "Tag" = "8:" - "Folder" = "8:_B4C7BDF9C0004C2E8011C05734A38F12" - "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:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2735E8A0F0B47C18C28B7F29F4BC664" { --- 46457,46460 ---- *************** *** 67247,67251 **** "ProductName" = "8:VAPOR" "ProductCode" = "8:{39315C4D-F4AA-441E-AE2B-2CC06FEB7F27}" ! "PackageCode" = "8:{4666CC9C-72BE-4835-A265-F66C77924623}" "UpgradeCode" = "8:{90D1C324-DDA2-4EC4-8710-412094C25649}" "AspNetVersion" = "8:4.0.30319.0" --- 67247,67251 ---- "ProductName" = "8:VAPOR" "ProductCode" = "8:{39315C4D-F4AA-441E-AE2B-2CC06FEB7F27}" ! "PackageCode" = "8:{A4938060-8BA3-4233-B7E4-62A6B811E82D}" "UpgradeCode" = "8:{90D1C324-DDA2-4EC4-8710-412094C25649}" "AspNetVersion" = "8:4.0.30319.0" *************** *** 67773,67777 **** "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_74378C047AC04B53910A2E832F2F3AD0" { "UseDynamicProperties" = "11:TRUE" --- 67773,67777 ---- "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DBD2C17F0059407CB1ED013135FC190E" { "UseDynamicProperties" = "11:TRUE" Index: uninstallVapor64.vbs =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/uninstallVapor64.vbs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** uninstallVapor64.vbs 25 Feb 2013 21:40:28 -0000 1.1 --- uninstallVapor64.vbs 24 May 2013 20:43:12 -0000 1.2 *************** *** 14,21 **** vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporbin = vaporhome & "\bin;" ! vaporshare = vaporhome & "\share" ! vaporidl = vaporhome & "\bin" ! vaporidl2 = vaporhome & "\bin;" vaporpythonhome = vaporhome & "\lib\python2.6" --- 14,21 ---- vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporbin = vaporhome & "bin;" ! vaporshare = vaporhome & "share" ! vaporidl = vaporhome & "bin" ! vaporidl2 = vaporhome & "bin;" vaporpythonhome = vaporhome & "\lib\python2.6" *************** *** 39,43 **** end if ! ' Find VAPOR_HOME\bin; in the path pathvar = sysEnv("path") posn = inStr(pathvar,vaporbin) --- 39,43 ---- end if ! ' Find VAPOR_HOME\bin in the path pathvar = sysEnv("path") posn = inStr(pathvar,vaporbin) *************** *** 64,70 **** Else posn = inStr(idlpath, vaporidl) ! if posn = 0 Then ! MsgBox("Unable to remove VAPOR from IDL_DLM_PATH") ! Else idlpath = Replace(idlpath, vaporidl, "") if idlpath = "" Then --- 64,68 ---- Else posn = inStr(idlpath, vaporidl) ! if posn <> 0 Then idlpath = Replace(idlpath, vaporidl, "") if idlpath = "" Then |