From 0e99e41056feab92f23c5c827bfed8a104fdcbdf Mon Sep 17 00:00:00 2001 From: boris Date: Fri, 23 Jan 2004 16:34:13 +0000 Subject: ChangeLogTag: Fri Jan 23 10:36:27 2004 Boris Kolpackov --- TAO/CIAO/CCF/CCF/CCF.sln | 106 +- TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj | 631 +++---- .../CCF/CodeGenerationKit/CodeGenerationKit.vcproj | 313 ++-- .../CCF/CompilerElements/CompilerElements.vcproj | 311 ++-- TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj | 1913 ++++++++++---------- TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj | 859 ++++----- TAO/CIAO/CCF/Documentation/Build.html | 74 +- TAO/CIAO/ChangeLog | 16 + 8 files changed, 2151 insertions(+), 2072 deletions(-) diff --git a/TAO/CIAO/CCF/CCF/CCF.sln b/TAO/CIAO/CCF/CCF/CCF.sln index fea101ce13f..5522cf4f605 100644 --- a/TAO/CIAO/CCF/CCF/CCF.sln +++ b/TAO/CIAO/CCF/CCF/CCF.sln @@ -1,53 +1,53 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompilerElements", "CompilerElements\CompilerElements.vcproj", "{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeGenerationKit", "CodeGenerationKit\CodeGenerationKit.vcproj", "{5F0B01BD-722F-4958-8E02-680588866D7C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL2", "IDL2\IDL2.vcproj", "{78A62970-330F-4FF1-9B0E-74F689A4EA4F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL3", "IDL3\IDL3.vcproj", "{108D07F1-6364-4B51-87DB-AED8BBE6396A}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDL", "CIDL\CIDL.vcproj", "{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.ActiveCfg = Debug|Win32 - {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.Build.0 = Debug|Win32 - {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.ActiveCfg = Release|Win32 - {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.Build.0 = Release|Win32 - {5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.ActiveCfg = Debug|Win32 - {5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.Build.0 = Debug|Win32 - {5F0B01BD-722F-4958-8E02-680588866D7C}.Release.ActiveCfg = Release|Win32 - {5F0B01BD-722F-4958-8E02-680588866D7C}.Release.Build.0 = Release|Win32 - {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.ActiveCfg = Debug|Win32 - {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.Build.0 = Debug|Win32 - {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.ActiveCfg = Release|Win32 - {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.Build.0 = Release|Win32 - {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.ActiveCfg = Debug|Win32 - {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.Build.0 = Debug|Win32 - {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.ActiveCfg = Release|Win32 - {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.Build.0 = Release|Win32 - {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.ActiveCfg = Debug|Win32 - {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.Build.0 = Debug|Win32 - {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.ActiveCfg = Release|Win32 - {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompilerElements", "CompilerElements\CompilerElements.vcproj", "{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeGenerationKit", "CodeGenerationKit\CodeGenerationKit.vcproj", "{5F0B01BD-722F-4958-8E02-680588866D7C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL2", "IDL2\IDL2.vcproj", "{78A62970-330F-4FF1-9B0E-74F689A4EA4F}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL3", "IDL3\IDL3.vcproj", "{108D07F1-6364-4B51-87DB-AED8BBE6396A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDL", "CIDL\CIDL.vcproj", "{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.ActiveCfg = Debug|Win32 + {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.Build.0 = Debug|Win32 + {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.ActiveCfg = Release|Win32 + {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.Build.0 = Release|Win32 + {5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.ActiveCfg = Debug|Win32 + {5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.Build.0 = Debug|Win32 + {5F0B01BD-722F-4958-8E02-680588866D7C}.Release.ActiveCfg = Release|Win32 + {5F0B01BD-722F-4958-8E02-680588866D7C}.Release.Build.0 = Release|Win32 + {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.ActiveCfg = Debug|Win32 + {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.Build.0 = Debug|Win32 + {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.ActiveCfg = Release|Win32 + {78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.Build.0 = Release|Win32 + {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.ActiveCfg = Debug|Win32 + {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.Build.0 = Debug|Win32 + {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.ActiveCfg = Release|Win32 + {108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.Build.0 = Release|Win32 + {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.ActiveCfg = Debug|Win32 + {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.Build.0 = Debug|Win32 + {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.ActiveCfg = Release|Win32 + {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj b/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj index 6c2fb06fa76..a5d6caec219 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj +++ b/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj @@ -1,315 +1,316 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj index ef8acbb50d4..0b040d11776 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj @@ -1,156 +1,157 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.vcproj b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.vcproj index 15c68909a33..a497bf26b3b 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.vcproj +++ b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.vcproj @@ -1,155 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj index 8b0d7c39970..2a05aa3714e 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj +++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj @@ -1,956 +1,957 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj b/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj index 2c9d6f0dcdd..2392df0eee4 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj +++ b/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj @@ -1,429 +1,430 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html index 2dcdfb2c3c4..c311bf951b8 100644 --- a/TAO/CIAO/CCF/Documentation/Build.html +++ b/TAO/CIAO/CCF/Documentation/Build.html @@ -43,6 +43,11 @@ cvs-id : $Id$ padding : .4em 0em 0em 0em; } + ol.multiline li { + padding-top : 0.6em; + padding-bottom : 0.6em; + } + @@ -142,6 +147,7 @@ $ make -f Makefile.alt +

Other GNU/Linux or UNIX Distributions

Make

@@ -248,6 +254,10 @@ uninitialized.

$ cd CCF/CCF
 $ make -f Makefile.alt
+ + + +

Windows

C++

@@ -256,7 +266,7 @@ VC++ 6 nor VC++ 7.0 is supported.

Boost Libraries

In order to build CCF you will need the following libraries from -Boost distribution: +the Boost distribution:

  1. regex
    2. @@ -264,9 +274,56 @@ VC++ 6 nor VC++ 7.0 is supported.

  2. spirit parser framework
+

Below is the list of step-by-step instructions for building boost. As +an example, I assume that the installation directory is D:\lib. +

+ +
    + +
  1. Download the latest boost source distribution from the +boost web site. +At the time of writing, the latest version was 1.30.2 +thus the file you download would be boost-1.30.2.zip. After +downloading unzip this file in D:\lib so that you get +D:\lib\boost-1.30.2.
    2. + + +
  2. Download the latest pre-built + +boost-jam. At the time of writing, the latest version was +3.1.7 thus the file you download would be +bjam-3.1.7-ntx86.zip. Unzip this file in D:\lib so +that you get D:\lib\bin.ntx86\bjam.exe.
    3. + +
  3. Open a command prompt and cd D:\lib\boost-1.30.2. Then +issue the following command. + +
    ..\bin.ntx86\bjam.exe "-sTOOLS=vc7.1"
+
    +
    4. + +
  4. Create a directory called lib in +D:\lib\boost-1.30.2.
    5. + +
  5. Copy D:\lib\boost-1.30.2\libs\filesystem\build\bin\libboost_filesystem.lib\vc7.1\debug\runtime-link-dynamic\libboost_filesystem.lib +to D:\lib\boost-1.30.2\lib\libboost_filesystem_debug.lib.
    +(Don't ask me who came up with this directory structure ;-) +
    6. + +
  6. Copy D:\lib\boost-1.30.2\libs\regex\build\bin\libboost_regex.lib\vc7.1\debug\runtime-link-dynamic\libboost_regex.lib +to D:\lib\boost-1.30.2\lib\libboost_regex_debug.lib. +
    7. + +
  7. Add D:\lib\boost-1.30.2 to your VC7.1 include directory +search list (Go to Tools -> Options -> Projects -> VC++ Directories -> Include Files). +Add D:\lib\boost-1.30.2\lib to your VC7.1 library directory +search list.
    8. + +
+

Please refer to the Boost Building -Instructions for details.

+Instructions if you have any questions.

Utility Library

@@ -274,14 +331,15 @@ Instructions for details.

Another prerequisite for CCF is Utility Library. You don't need to build anything in this library. Just unpack -it to some convenient place.

+it to some convenient place and add it to your VC7.1 include directory search +list. For example if you unpacked Utility-1.2.2.tar.bz2 in +D:\lib then add D:\lib\Utility-1.2.2 to your +search list.

+

Building CCF

-

-In order to build CCF with VC7.1 you will need to add Boost/Utility -include and library paths to your search path. After having that done -you can open VC7.1 solution file in CCF/CCF/ and proceed -as usual.

+

Now you are ready to build CCF libraries. Just open VC7.1 solution file +in CCF\CCF\ and proceed as usual.

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 14c90539451..84b628d6463 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,19 @@ +Fri Jan 23 10:36:27 2004 Boris Kolpackov + + * CCF/CCF/CCF.sln: + * CCF/CCF/CIDL/CIDL.vcproj: + * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: + * CCF/CCF/CompilerElements/CompilerElements.vcproj: + * CCF/CCF/IDL2/IDL2.vcproj: + * CCF/CCF/IDL3/IDL3.vcproj: + + Updated projects to compile with boost out-of-the-box. + + * CCF/Documentation/Build.html: + + Added step-by-step instructions for building CCF on + Windows. Thanks to Tao Lu for helping me with this. + Thu Jan 22 23:38:32 2004 Tao Lu * examples/OEP/Display/descriptors/DualDisplay.cad: -- cgit v1.2.1