From fd522ad90af91f8384313fd5463156f7e823a652 Mon Sep 17 00:00:00 2001 From: fcolin Date: Fri, 2 Oct 2009 10:51:32 +0000 Subject: update with pcre --- comIvy/Expression.h | 4 +- comIvy/Install/Install.vdproj | 171 +++++++++++++++-------- comIvy/comIvy.sln | 78 +++++++---- comIvy/comIvy.vcproj | 315 ++++++++++++++++++++++++++---------------- comIvy/comIvyPS.vcproj | 187 ++++++++++++++++--------- 5 files changed, 490 insertions(+), 265 deletions(-) diff --git a/comIvy/Expression.h b/comIvy/Expression.h index 454973f..fc25cff 100644 --- a/comIvy/Expression.h +++ b/comIvy/Expression.h @@ -35,8 +35,8 @@ __interface _IExpressionEvents [ coclass, - threading("apartment"), - event_source("com"), + threading(apartment), + event_source(com), vi_progid("comIvy.Expression"), progid("comIvy.Expression.1"), version(2.0), diff --git a/comIvy/Install/Install.vdproj b/comIvy/Install/Install.vdproj index 3e8e41d..bfe86f3 100644 --- a/comIvy/Install/Install.vdproj +++ b/comIvy/Install/Install.vdproj @@ -1,7 +1,7 @@ "DeployProject" { -"VSVersion" = "3:701" -"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" "ProjectName" = "8:Install" "LanguageId" = "3:1036" @@ -15,30 +15,36 @@ { "Entry" { - "MsmKey" = "8:_1447414B7EE3459CA5494709C46A8C05" - "OwnerKey" = "8:_AA0E03B004294FB6A2A650251AC616A3" + "MsmKey" = "8:_27F17B751A964BDE8F3159581E02F955" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1447414B7EE3459CA5494709C46A8C05" - "OwnerKey" = "8:_EC70CEDC42CD4B468A8008C772D58DAC" + "MsmKey" = "8:_44F8D6C08CA84D7985859E93F3B892F4" + "OwnerKey" = "8:_27F17B751A964BDE8F3159581E02F955" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7E2EA4631FEA4004B5A496488E91D91B" + "MsmKey" = "8:_44F8D6C08CA84D7985859E93F3B892F4" "OwnerKey" = "8:_AA0E03B004294FB6A2A650251AC616A3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7E2EA4631FEA4004B5A496488E91D91B" + "MsmKey" = "8:_44F8D6C08CA84D7985859E93F3B892F4" "OwnerKey" = "8:_EC70CEDC42CD4B468A8008C772D58DAC" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_4E004153194741C3814A614D9971C19B" + "OwnerKey" = "8:_44F8D6C08CA84D7985859E93F3B892F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_AA0E03B004294FB6A2A650251AC616A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -73,13 +79,21 @@ "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" { "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\..\\..\\Install\\comIvy.msi" + "OutputFilename" = "8:Release\\comIvy.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -89,6 +103,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:1" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -108,12 +130,9 @@ { } } - "Feature" - { - } "File" { - "{A582A373-4685-4296-BEFE-614B80A702C3}:_C8EF717B27B6D2E2D7204347C28D8409" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C8EF717B27B6D2E2D7204347C28D8409" { "SourcePath" = "8:WSOCK32.dll" "TargetName" = "8:WSOCK32.dll" @@ -139,7 +158,7 @@ } "Folder" { - "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_19810136D0DB43A685CAD4C802A4C6F2" + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_19810136D0DB43A685CAD4C802A4C6F2" { "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" @@ -151,7 +170,7 @@ { } } - "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_38A31FB9AF9F412FA1B0013890A1409B" + "{1525181F-901A-416C-8A58-119130FE478E}:_38A31FB9AF9F412FA1B0013890A1409B" { "Name" = "8:#1916" "AlwaysCreate" = "11:FALSE" @@ -162,7 +181,7 @@ { } } - "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_52F5EEA72A1B4C9C8AC0B6F81D1416CA" + "{1525181F-901A-416C-8A58-119130FE478E}:_52F5EEA72A1B4C9C8AC0B6F81D1416CA" { "Name" = "8:#1919" "AlwaysCreate" = "11:FALSE" @@ -183,24 +202,26 @@ "MsiBootstrapper" { "LangId" = "3:1036" + "RequiresElevation" = "11:FALSE" } "Product" { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:comIvy" - "ProductCode" = "8:{C6AA7F33-7453-417E-ADDC-E7A0E16F6956}" - "PackageCode" = "8:{4122B08A-1DDF-42F0-9DFE-F26C2393CE24}" + "ProductCode" = "8:{4467C40F-B2CD-49C2-8CE9-90674E01045F}" + "PackageCode" = "8:{78AB836F-B140-4C07-BF3E-BB236190AA3D}" "UpgradeCode" = "8:{38FA115C-CED5-491F-AF2D-C26B035D114D}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" - "ProductVersion" = "8:1.3.0" - "Manufacturer" = "8:CENA PII" + "InstallAllUsers" = "11:FALSE" + "ProductVersion" = "8:1.4.0" + "Manufacturer" = "8:DTI R&D PII" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:comIvy" "Subject" = "8:" - "ARPCONTACT" = "8:CENA PII" + "ARPCONTACT" = "8:DTI R&D PII" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" @@ -208,6 +229,10 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:0" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" } "Registry" { @@ -215,7 +240,7 @@ { "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_94E029251E7745D292C6F991E78944EC" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_94E029251E7745D292C6F991E78944EC" { "Name" = "8:Software" "Condition" = "8:" @@ -224,7 +249,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_48CC9D9713AB423A8FF43D456E0447A8" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_48CC9D9713AB423A8FF43D456E0447A8" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -249,7 +274,7 @@ { "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_0CDA7D268F7D447388353BCAD2358159" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_0CDA7D268F7D447388353BCAD2358159" { "Name" = "8:Software" "Condition" = "8:" @@ -258,7 +283,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_1ABFED03E2A24757B1CAE8A241A5B014" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_1ABFED03E2A24757B1CAE8A241A5B014" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -306,14 +331,14 @@ } "UserInterface" { - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_1BA8C5FDBAFD4DB8BAA6ED42191DB909" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_1BA8C5FDBAFD4DB8BAA6ED42191DB909" { "Name" = "8:#1900" "Sequence" = "3:2" "Attributes" = "3:1" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_054EA78743CF4633B1A590B0610DF4D5" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_054EA78743CF4633B1A590B0610DF4D5" { "Sequence" = "3:100" "DisplayName" = "8:Bienvenue" @@ -361,7 +386,7 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_90B1541F45A8487E8DB27D2B9742AD09" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_90B1541F45A8487E8DB27D2B9742AD09" { "Sequence" = "3:200" "DisplayName" = "8:Dossier d'installation" @@ -383,7 +408,7 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_C358D9E56AD443708F0925EA916C0641" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C358D9E56AD443708F0925EA916C0641" { "Sequence" = "3:300" "DisplayName" = "8:Confirmer l'installation" @@ -407,20 +432,20 @@ } } } - "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_1FCE16B262EA46AA8E2FDB8F2086DE2F" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_1FCE16B262EA46AA8E2FDB8F2086DE2F" { "UseDynamicProperties" = "11:FALSE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdBasicDialogs.wim" } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_22B46AE500B84B259DF8A2BBB11CE72E" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_22B46AE500B84B259DF8A2BBB11CE72E" { "Name" = "8:#1900" "Sequence" = "3:1" "Attributes" = "3:1" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_0F1D0B77257042B6B5782D9033DF747F" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0F1D0B77257042B6B5782D9033DF747F" { "Sequence" = "3:200" "DisplayName" = "8:Dossier d'installation" @@ -440,9 +465,22 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_11E69662A4174EB6B6241635312405BC" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_11E69662A4174EB6B6241635312405BC" { "Sequence" = "3:300" "DisplayName" = "8:Confirmer l'installation" @@ -464,7 +502,7 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A87D64CB1DC74CAC8B8061737E765F23" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A87D64CB1DC74CAC8B8061737E765F23" { "Sequence" = "3:100" "DisplayName" = "8:Bienvenue" @@ -514,20 +552,20 @@ } } } - "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_38290358274C4AD88B59BAAD647D2907" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_38290358274C4AD88B59BAAD647D2907" { "UseDynamicProperties" = "11:FALSE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdUserInterface.wim" } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_763FB10ACF6844EB825C0E4978A64536" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_763FB10ACF6844EB825C0E4978A64536" { "Name" = "8:#1901" "Sequence" = "3:1" "Attributes" = "3:2" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_276D2F8D972D49ADA8C0E9C065443139" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_276D2F8D972D49ADA8C0E9C065443139" { "Sequence" = "3:100" "DisplayName" = "8:Progression" @@ -564,14 +602,14 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_C60BDA3F34144C85BDF151453191612D" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C60BDA3F34144C85BDF151453191612D" { "Name" = "8:#1902" "Sequence" = "3:1" "Attributes" = "3:3" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_8F8705761D294D4B8923ED848878D08A" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8F8705761D294D4B8923ED848878D08A" { "Sequence" = "3:100" "DisplayName" = "8:Terminé" @@ -608,14 +646,14 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_E1DF3A2398E34A0D9AFA1E9297BC9634" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E1DF3A2398E34A0D9AFA1E9297BC9634" { "Name" = "8:#1902" "Sequence" = "3:2" "Attributes" = "3:3" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_62F1AE7FFD414ABEA6A8474C91623DE5" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_62F1AE7FFD414ABEA6A8474C91623DE5" { "Sequence" = "3:100" "DisplayName" = "8:Terminé" @@ -639,14 +677,14 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F0A3B0E4FFC2432B8563A348C36A8034" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_F0A3B0E4FFC2432B8563A348C36A8034" { "Name" = "8:#1901" "Sequence" = "3:2" "Attributes" = "3:2" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_7705C265BD034CACAD7651043EDC7F82" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7705C265BD034CACAD7651043EDC7F82" { "Sequence" = "3:100" "DisplayName" = "8:Progression" @@ -686,11 +724,11 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_1447414B7EE3459CA5494709C46A8C05" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_44F8D6C08CA84D7985859E93F3B892F4" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" "Properties" { } @@ -700,11 +738,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_7E2EA4631FEA4004B5A496488E91D91B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4E004153194741C3814A614D9971C19B" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" "Properties" { } @@ -717,7 +755,35 @@ } "ProjectOutput" { - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EF66E5AAAE140E89865D76773CCD4D6" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_27F17B751A964BDE8F3159581E02F955" + { + "SourcePath" = "8:..\\Release\\pcre.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_19810136D0DB43A685CAD4C802A4C6F2" + "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:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4EF66E5AAAE140E89865D76773CCD4D6" { "SourcePath" = "8:" "TargetName" = "8:" @@ -745,7 +811,7 @@ { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AA0E03B004294FB6A2A650251AC616A3" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AA0E03B004294FB6A2A650251AC616A3" { "SourcePath" = "8:..\\Release\\comIvy.dll" "TargetName" = "8:" @@ -773,9 +839,9 @@ { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EC70CEDC42CD4B468A8008C772D58DAC" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EC70CEDC42CD4B468A8008C772D58DAC" { - "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll" + "SourcePath" = "8:..\\Release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_19810136D0DB43A685CAD4C802A4C6F2" @@ -802,8 +868,5 @@ } } } - "VJSharpPlugin" - { - } } } diff --git a/comIvy/comIvy.sln b/comIvy/comIvy.sln index c7ca002..cbc2330 100644 --- a/comIvy/comIvy.sln +++ b/comIvy/comIvy.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comIvy", "comIvy.vcproj", "{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}" ProjectSection(ProjectDependencies) = postProject {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE} @@ -10,22 +11,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comIvyPS", "comIvyPS.vcproj EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "Install\Install.vdproj", "{37BC8B64-48B5-4A9E-945C-225AA6BB591C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\..\pcre\pcre.vcproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" EndProject Global GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 5 + SccNumberOfProjects = 6 SccProjectName0 = \u0022$/Bus\u0022,\u0020ZOBAAAAA SccLocalPath0 = .. SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe CanCheckoutShared = false SccProjectFilePathRelativizedFromConnection0 = comIvy\\ - SolutionUniqueID = {0D33DAE6-8F43-4549-9070-01A6DB7794D4} SccProjectUniqueName1 = ..\\Ivy\\Ivy.vcproj SccProjectName1 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA SccLocalPath1 = ..\\Ivy @@ -42,28 +40,54 @@ Global SccLocalPath4 = .. CanCheckoutShared = false SccProjectFilePathRelativizedFromConnection4 = comIvy\\Install\\ + SccProjectUniqueName5 = ..\\..\\..\\pcre\\pcre.vcproj + SccProjectName5 = \u0022$/pcre\u0022,\u0020KSHAAAAA + SccLocalPath5 = ..\\..\\..\\pcre + CanCheckoutShared = false EndGlobalSection - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug.ActiveCfg = Debug|Win32 - {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug.Build.0 = Debug|Win32 - {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release.ActiveCfg = Release|Win32 - {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release.Build.0 = Release|Win32 - {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Debug.ActiveCfg = Debug|Win32 - {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Release.ActiveCfg = Release|Win32 - {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug.ActiveCfg = Debug|Win32 - {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug.Build.0 = Debug|Win32 - {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release.ActiveCfg = Release|Win32 - {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release.Build.0 = Release|Win32 - {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Debug.ActiveCfg = Debug - {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release.ActiveCfg = Release - {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release.Build.0 = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug|Win32.ActiveCfg = Debug|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug|Win32.Build.0 = Debug|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug|x64.ActiveCfg = Debug|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug|x64.Build.0 = Debug|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release|Win32.ActiveCfg = Release|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release|Win32.Build.0 = Release|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release|x64.ActiveCfg = Release|Win32 + {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Release|x64.Build.0 = Release|Win32 + {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Debug|Win32.ActiveCfg = Debug|Win32 + {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Debug|x64.ActiveCfg = Debug|Win32 + {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Release|Win32.ActiveCfg = Release|Win32 + {2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.Release|x64.ActiveCfg = Release|Win32 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.ActiveCfg = Debug|Win32 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.Build.0 = Debug|Win32 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.ActiveCfg = Debug|x64 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.Build.0 = Debug|x64 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.ActiveCfg = Release|Win32 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.Build.0 = Release|Win32 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.ActiveCfg = Release|x64 + {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.Build.0 = Release|x64 + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Debug|Win32.ActiveCfg = Debug + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Debug|x64.ActiveCfg = Debug + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release|Win32.ActiveCfg = Release + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release|Win32.Build.0 = Release + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release|x64.ActiveCfg = Release + {37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release|x64.Build.0 = Release + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.ActiveCfg = Debug|Win32 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.Build.0 = Debug|Win32 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.ActiveCfg = Debug|x64 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.Build.0 = Debug|x64 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.ActiveCfg = Release|Win32 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.Build.0 = Release|Win32 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.ActiveCfg = Release|x64 + {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.Build.0 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/comIvy/comIvy.vcproj b/comIvy/comIvy.vcproj index 9a4564b..d725277 100644 --- a/comIvy/comIvy.vcproj +++ b/comIvy/comIvy.vcproj @@ -1,245 +1,322 @@ + Keyword="AtlProj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Description="" + CommandLine=" " + Outputs="" + /> + Name="VCXMLDataGeneratorTool" + /> + + ProxyFileName="comIvy_p.c" + /> - + Name="VCCLCompilerTool" + AdditionalOptions="" + Optimization="0" + AdditionalIncludeDirectories=""C:\Users\fcolin\Documents\Projects Visual Studio\pcre-7.9";..\Ivy" + PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + WarningLevel="3" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories="$(IntDir)" + /> + + + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> - - - + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + Description="" + CommandLine="" + /> + RelativePathToProject="..\Ivy\Ivy.vcproj" + /> + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="Bus.cpp" + > + RelativePath="comIvy.cpp" + > + RelativePath="Expression.cpp" + > + RelativePath="stdafx.cpp" + > + Name="Debug|Win32" + > + UsePrecompiledHeader="1" + /> + Name="Release|Win32" + > + UsePrecompiledHeader="1" + /> + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="Bus.h" + > + RelativePath="Expression.h" + > + RelativePath="Resource.h" + > + RelativePath="stdafx.h" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + RelativePath="comIvy.rc" + > + RelativePath="comIvy.rgs" + > + DeploymentContent="true" + > + RelativePath="ReadMe.txt" + > + DeploymentContent="true" + > diff --git a/comIvy/comIvyPS.vcproj b/comIvy/comIvyPS.vcproj index ed45cc0..6996354 100644 --- a/comIvy/comIvyPS.vcproj +++ b/comIvy/comIvyPS.vcproj @@ -1,109 +1,164 @@ + Keyword="AtlPSProj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + > + + + + + + RuntimeLibrary="3" + /> + + + Name="VCPreLinkEventTool" + /> + ModuleDefinitionFile="comIvyPS.def" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + + + + + Name="VCFxCopTool" + /> + + CommandLine="regsvr32 /s /c "$(TargetPath)"" + /> + + + CommandLine="if exist dlldata.c goto :END Erreur d'écho : MIDL ne peut pas générer DLLDATA.C si le projet principal ne contient pas au moins une interface. Exit 1 :END " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> - - - - - + Name="VCMIDLTool" + /> + RuntimeLibrary="2" + /> + + Name="VCResourceCompilerTool" + /> + + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + Name="VCALinkTool" + /> - + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - + Name="VCPostBuildEventTool" + Description="Inscription en cours" + CommandLine="regsvr32 /s /c "$(TargetPath)"" + /> @@ -111,22 +166,28 @@ Exit 1 + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="comIvyps.def" + > + SourceControlFiles="false" + > + RelativePath="_comIvy_i.c" + > + RelativePath="_comIvy_p.c" + > + RelativePath="dlldata.c" + > -- cgit v1.1