From aaa7636dd3f4145ffda6c4842297b1f70999ecb1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Jun 2009 20:55:49 +0100 Subject: [PATCH] Windows port of v0.6 --- msvc9/Lander/Lander.suo | Bin 47054 -> 49664 bytes msvc9/Lander/Setup/Setup.vdproj | 48 +++++++++++++++++++++----------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/msvc9/Lander/Lander.suo b/msvc9/Lander/Lander.suo index f804d68662c11a1eba32238d9c4a066c9abdfa40..d88d6aa1f4fb09a352219478889dba60a4d3e1f3 100644 GIT binary patch delta 2687 zcmeHIdrVtp6#u^4doQItiaZKcV2sxa2;`1r@D+&_&Ax+YG{7#k=?=hid2ujg7WBy#wM_Q21Q!c zEUJT1@;xrEhS)f8^SLk*ZWGjK(RlpAFTy!KPhQn7a%$~e0n`lFBkPzAMxyFP8iKZP zPe_y-a;%YHG#h7Q&Qluc(dukM4En?>(nxGQRA@_Q<9I4?s0{(CH^~7YeY3$f_`JhUa%%qCTGLJ&$@6vvTdo^m}z9#46T!dzJkje<>S zAHX52S`|qMl;=E$884*w!rYdVpx%9m>Y=py7}dbH883rWb(jXjor8s?q z%rjyFYY=MwJ@Lp%u= zW|%Qgz-)A#%W9DCFL^@+hf~Wq^C_350?ug=3yV!)W0=cYB3?qyL14|YK(jr~+|eAw zJrD~GH952$o~?Nk63ub4#X62HHj9v)WB`X%C$HBUxlA_tFJXccNQ`&k4PO3Zyia-g z&j_^CeME6fQuLR-x@GUp;#L^%w41Yk_9}nEd(F#V_1>(BzVipuVYZap$o!3T=N>0_ z1}c=%CGcWufm~)A;B+jSsdY$ENNh|faY>`W3@!o53X_s4hymA*m266T0#5g;75L<< zk1VUU4Uz(qk5<;dyEl%K2HdX!Bn5^4b_{n?iGW*s4v5njHBDfA@4T=LSws~#eWbBo zBt<9|GEw*exgPmestw&kVlO7|)KU zG*6jvK$Dt;F!|_11RDD`%a(mv)G(=9qZ$_XHm3|L3yLVsWIL*yn`VU%fg7#gz}adM z##;CK9VFjqEeYU>rncALv%f=~kK0`xuaxY-4(F4D_$%`A3kr*jgv1bkf33VSoIzb( zmCBZFR~q^YChCFxUA5rWcVmFs-p$WEPjrPLByonDwvTqG9|qN*Sq^Yuy^#t zb7%S~Nd0ah9UbzS1GhwAbfAHnm;kE-l6VqL$1%;5HEhSqohUMuay-QZQU+|DT!dVM z4lW*Oc+eC0oquR)hZf;{Uj*n!8{lh)#(%_ak3AX~VqkM*!ITuwp32F?rSKmmK){u7 z&-YryG9OF#Zye?NiAuWN-*NCE;JXVceE-y|xIp2)2Eo!;wn-$EeE_bo|GogqkWGVi z)X(1y447+G5%7Ye*?&;9LxHT3cIZp|CWyY${C{R;xG(_hw@zM|m839`2Bq2Qg$&Ro gW40Lo5pZtGL*(WqanN$A}c>mz8fDpL!4<``6V*mgE delta 2638 zcmYk8dr(wW9LMjuyZ5rZmp3Sn4SBD;Uka$Jk}Qybpom7I4WW}XX+xpQBx_51d$J`#|__%dt-_?`C1l_%qT;@|s45}syjJK1+Vip$Ks#GhX z(0p{QKhR8flmIiolx9)OWGeS9)7+M0LY2bc6{34}_|;K)Tn>%7F{&ljV zpy}&%3aV2u%A}v(8V?#)1vi7ezQH3HIxa^P(e2P0RrsS@ptoCCEgduG(sQ!X zOj^h(rt&NH2)gGO!ui(|bYZiPT%u5YWtM26?Uf%;Z+NuksB#IVRqB))Xkl_Oa?YaN zuP%}^cBA{NU=P>}c>8(VUjuw-_Zg)uXid%0?vrSq0)yZ*I0J^jFyIZm0KNjFfH!Ik zoCjY69_}K_Z@{-k`!dS!!1v$^_yPO~egZ#(Uw{db`VA$zuLEBD9l|xhgZ_c?hEe|$ zX_M~ijtKUl7_AjDEwor2CSh{=q_HX2e#*|#uZ7NzEC0-O8 zZxs7+J07ql1J*c_e6ZLu0c#w6jwsusU`kt}EBe>e$Jh+AZMA8RC+tE#V4|^3J597) z#D%X?XG@bIX%j8Q!gRotK<7I%XzjYUy9Ea1ykmIJ6rchhU;)0s5BP%s5D0=mFtCCU z5DLOTIEVm|APPi-7%&6O1hF6v#DfH26ZkXm2r7wS7DxigAO)m?G>{H5fE~;RnIH>f zgB*|x@<2W)0EOWGC(G=@)A}ZrZJ0qZ&o)l4xM1Lfr>$J!q{-vZD%VjvL|fac6+Q|D z`i*uIH5E5nTMaqmW~;Z+Ocdl=U!}}NwTOMhJ-WSqqn=}0>xNj_)9ilN{j~73mn%8& zDTdE%A?StndQr;$G~Vu3zr>Sf6SRfhwIbzvI&dsCY&Rk9)UADJI;_rxxVOM)!S6lx4 gg6ZB`|B;I6oGchP-RpJ-(v@-xo!GynclS{G|7giV%>V!Z diff --git a/msvc9/Lander/Setup/Setup.vdproj b/msvc9/Lander/Setup/Setup.vdproj index 52d6e8f..48871f5 100644 --- a/msvc9/Lander/Setup/Setup.vdproj +++ b/msvc9/Lander/Setup/Setup.vdproj @@ -51,8 +51,8 @@ } "Entry" { - "MsmKey" = "8:_1A07C8E0F3D04EF68E7F01C72695C90F" - "OwnerKey" = "8:_680ACE5E04564F879300338362ADCECC" + "MsmKey" = "8:_152F3159A539455A83FAB40658D55301" + "OwnerKey" = "8:_B913560B3B4D436D9140C23C2B8DB8BD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -93,12 +93,6 @@ } "Entry" { - "MsmKey" = "8:_4087DD32A1B2418BB1A441FAE4B50A9A" - "OwnerKey" = "8:_1A07C8E0F3D04EF68E7F01C72695C90F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_46B7C398CCEF4243A9099EFC201B7115" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -273,6 +267,12 @@ } "Entry" { + "MsmKey" = "8:_B913560B3B4D436D9140C23C2B8DB8BD" + "OwnerKey" = "8:_680ACE5E04564F879300338362ADCECC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_BBFF91ECBA424C969C61D0275B71F8E2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -415,6 +415,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -431,6 +439,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -1772,14 +1788,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Lunar Lander" - "ProductCode" = "8:{43F5B507-E751-45D2-B2FC-78638EE0D93D}" - "PackageCode" = "8:{268A322D-D30B-4F85-B95F-99DACD7D872F}" + "ProductCode" = "8:{9BC64C6C-E48A-459B-A6B0-296497F09617}" + "PackageCode" = "8:{834EFF7F-D198-465B-A8BB-8E950814B069}" "UpgradeCode" = "8:{3DC812F5-F4D2-49A0-AB55-936BF77D1F97}" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" + "ProductVersion" = "8:0.6.0" "Manufacturer" = "8:doof.me.uk" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -2396,11 +2412,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1A07C8E0F3D04EF68E7F01C72695C90F" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_152F3159A539455A83FAB40658D55301" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" "Properties" { } @@ -2410,11 +2426,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4087DD32A1B2418BB1A441FAE4B50A9A" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B913560B3B4D436D9140C23C2B8DB8BD" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" "Properties" { } -- 2.39.2