From b62585c0d4dec9b1cec86f808b3d8b0eddd0437c Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 18 Jun 2009 14:07:58 +0000 Subject: correction bug sur limite d'argument dans une expression reguliere PCRE --- Ivy/InstIvyDev/InstIvyDev.vdproj | 157 +++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 80 deletions(-) (limited to 'Ivy/InstIvyDev/InstIvyDev.vdproj') diff --git a/Ivy/InstIvyDev/InstIvyDev.vdproj b/Ivy/InstIvyDev/InstIvyDev.vdproj index 25df386..930587c 100644 --- a/Ivy/InstIvyDev/InstIvyDev.vdproj +++ b/Ivy/InstIvyDev/InstIvyDev.vdproj @@ -15,68 +15,68 @@ { "Entry" { - "MsmKey" = "8:_0881ABF5280948D5AA93B02FECFC3956" - "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A" + "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_34B995BB34324AD4A1FFA79365EDDA41" + "OwnerKey" = "8:_C943180E14D2401283428900C39E38A6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A" + "MsmKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6C5F1DCD58734C9D953B306F435ED006" - "OwnerKey" = "8:_7B9C5BFD7A8B4F36A616771B210FF5C8" + "MsmKey" = "8:_46277ABBD7FF4829BC70CD9150B7547C" + "OwnerKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6FB50FA4D8F60743C6DAA4C31583C68C" - "OwnerKey" = "8:_BFED66BE7DFC4FC5B625527D0526B5A5" + "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7B9C5BFD7A8B4F36A616771B210FF5C8" - "OwnerKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700" + "MsmKey" = "8:_6FB50FA4D8F60743C6DAA4C31583C68C" + "OwnerKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7B9C5BFD7A8B4F36A616771B210FF5C8" - "OwnerKey" = "8:_BFED66BE7DFC4FC5B625527D0526B5A5" + "MsmKey" = "8:_B656C8E7B4C5444BB7CAA2BB82B22DEB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7B9C5BFD7A8B4F36A616771B210FF5C8" - "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A" + "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5" + "OwnerKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AB55CBB0776C4E9E90F5CB636E7D660B" - "OwnerKey" = "8:_0881ABF5280948D5AA93B02FECFC3956" + "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5" + "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B656C8E7B4C5444BB7CAA2BB82B22DEB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5" + "OwnerKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BFED66BE7DFC4FC5B625527D0526B5A5" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C943180E14D2401283428900C39E38A6" + "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A" "MsmSig" = "8:_UNDEFINED" } } @@ -114,7 +114,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\..\\..\\Install\\InstIvyDev.msi" + "OutputFilename" = "8:Release\\InstIvyDev.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -279,25 +279,26 @@ "MsiBootstrapper" { "LangId" = "3:1036" + "RequiresElevation" = "11:FALSE" } "Product" { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:InstIvyDev" - "ProductCode" = "8:{54EEC85D-F868-49E0-A71C-54409C92E02F}" - "PackageCode" = "8:{4A4A8B44-7D84-4AEB-98DA-766B603AD502}" + "ProductCode" = "8:{D651E6A4-ED73-447B-A2D9-4081D13E27DC}" + "PackageCode" = "8:{81856041-B01B-4760-982C-9B1B8626ED92}" "UpgradeCode" = "8:{B61AA283-78E2-443D-A093-4D5D6C0B779A}" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" - "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" + "InstallAllUsers" = "11:TRUE" + "ProductVersion" = "8:1.0.1" "Manufacturer" = "8:SDER PII" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.tls.cena.fr/products/ivy" "Title" = "8:InstIvyDev" "Subject" = "8:Ivy" - "ARPCONTACT" = "8:SDER PII" + "ARPCONTACT" = "8:DTI/R&D" "Keywords" = "8:Ivy" "ARPCOMMENTS" = "8:Ivy Sources and Lib " "ARPURLINFOABOUT" = "8:" @@ -417,7 +418,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BDEB1035C12E4BFEB8737D924C6F4156" { "Sequence" = "3:100" - "DisplayName" = "8:Finished" + "DisplayName" = "8:Terminé" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" @@ -454,7 +455,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BA05984C1F294731B5ED66914BD89A5C" { "Sequence" = "3:100" - "DisplayName" = "8:Progress" + "DisplayName" = "8:Progression" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdProgressDlg.wid" @@ -498,7 +499,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9F7D27549F654B418F380589DA56C3ED" { "Sequence" = "3:100" - "DisplayName" = "8:Progress" + "DisplayName" = "8:Progression" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminProgressDlg.wid" @@ -542,7 +543,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_97A4AE594BB347ECAD98AAFC6FD3B0FB" { "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" + "DisplayName" = "8:Dossier d'installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdFolderDlg.wid" @@ -577,7 +578,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E3B1F5B6B5FE4CE6B369C0374CA9AA75" { "Sequence" = "3:100" - "DisplayName" = "8:Welcome" + "DisplayName" = "8:Bienvenue" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdWelcomeDlg.wid" @@ -625,7 +626,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_EA128F65E9D44AE1B2E071C21B8C0010" { "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" + "DisplayName" = "8:Confirmer l'installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdConfirmDlg.wid" @@ -662,7 +663,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0EE17FA1A76D4B8C86D0CA3BC7089F16" { "Sequence" = "3:100" - "DisplayName" = "8:Welcome" + "DisplayName" = "8:Bienvenue" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" @@ -710,7 +711,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B8FA44662FAF40B4A23F14BBE7115F3C" { "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" + "DisplayName" = "8:Confirmer l'installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" @@ -732,7 +733,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F1C7DEE7DB5C4556ADD1217E3B254EC3" { "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" + "DisplayName" = "8:Dossier d'installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminFolderDlg.wid" @@ -763,7 +764,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_83F73B2D8F7E44DA9567C4497FA978AB" { "Sequence" = "3:100" - "DisplayName" = "8:Finished" + "DisplayName" = "8:Terminé" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdFinishedDlg.wid" @@ -800,11 +801,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0881ABF5280948D5AA93B02FECFC3956" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_34B995BB34324AD4A1FFA79365EDDA41" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_MFC_x86.msm" + "SourcePath" = "8:microsoft_vc90_mfc_x86.msm" "Properties" { } @@ -814,11 +815,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6C5F1DCD58734C9D953B306F435ED006" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_46277ABBD7FF4829BC70CD9150B7547C" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" "Properties" { } @@ -828,11 +829,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7B9C5BFD7A8B4F36A616771B210FF5C8" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C0D675730DD44E9DBDA0BAC5EEC423A5" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" "Properties" { } @@ -842,11 +843,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB55CBB0776C4E9E90F5CB636E7D660B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C943180E14D2401283428900C39E38A6" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86.msm" "Properties" { } @@ -859,12 +860,12 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0DBE25F652264D9F92A27A1581D093E3" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_32C90C9C8FC242AE9C65DA1C92DA2700" { - "SourcePath" = "8:" + "SourcePath" = "8:..\\..\\release\\pcre.dll" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_9CFE50635C5443E68113471C7E3235C3" + "Folder" = "8:_BE1B10BDB24D49EA8562F4B0A6596F21" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -880,22 +881,19 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:SourceFiles" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { - "ExcludeFilter" = "8:*.vcproj" - "ExcludeFilter" = "8:*.res" - "ExcludeFilter" = "8:*.h" } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_10C831C856C745B8862A1DA57473BE41" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3B5C053C16CE42B2810E6471B5EBFDBD" { - "SourcePath" = "8:" + "SourcePath" = "8:..\\..\\release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_64AFC2E36B5346C08FF007A580F68304" + "Folder" = "8:_97BD9053CEE5430F9BC907C244C522C0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -911,23 +909,19 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:SourceFiles" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{9818D652-CC05-463E-880D-AFCA2C7BFABE}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { - "ExcludeFilter" = "8:*.vcproj" - "ExcludeFilter" = "8:*.cxx" - "ExcludeFilter" = "8:*.res" - "ExcludeFilter" = "8:*.cpp" } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_32C90C9C8FC242AE9C65DA1C92DA2700" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3EE353CD5A944D589E7FD68F71A9F409" { - "SourcePath" = "8:..\\..\\release\\pcre.dll" + "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_BE1B10BDB24D49EA8562F4B0A6596F21" + "Folder" = "8:_823268F0927E471C9AC8D4518AB6C2F5" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -943,19 +937,19 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "OutputGroupCanonicalName" = "8:SourceFiles" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3EE353CD5A944D589E7FD68F71A9F409" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_44B9BA74E174411E9586E6DF852B0200" { "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_823268F0927E471C9AC8D4518AB6C2F5" + "Folder" = "8:_9CFE50635C5443E68113471C7E3235C3" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -972,15 +966,18 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:SourceFiles" - "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + "OutputProjectGuid" = "8:{9818D652-CC05-463E-880D-AFCA2C7BFABE}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { + "ExcludeFilter" = "8:*.vcproj" + "ExcludeFilter" = "8:*.h" + "ExcludeFilter" = "8:*.res" } } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_587183B52DD64752997FFA522BC57D0A" { - "SourcePath" = "8:c:\\users\\fcolin\\program files\\release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BE1B10BDB24D49EA8562F4B0A6596F21" @@ -1006,12 +1003,12 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BFED66BE7DFC4FC5B625527D0526B5A5" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E7DCAA3C0EA549F38D4107D3A78F9585" { - "SourcePath" = "8:..\\..\\release\\Ivy.dll" + "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_BE1B10BDB24D49EA8562F4B0A6596F21" + "Folder" = "8:_64AFC2E36B5346C08FF007A580F68304" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1027,16 +1024,16 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputGroupCanonicalName" = "8:SourceFiles" + "OutputProjectGuid" = "8:{9818D652-CC05-463E-880D-AFCA2C7BFABE}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { + "ExcludeFilter" = "8:*.vcproj" + "ExcludeFilter" = "8:*.c" + "ExcludeFilter" = "8:*.cxx" } } } - "VJSharpPlugin" - { - } } } -- cgit v1.1