diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2023-01-27 21:20:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 21:20:24 -0600 |
| commit | 55ac3ab87f2141a7d4b16bb14b63595970cb0fa6 (patch) | |
| tree | 5a3e7bd6aa495c70133120fc3d755653bdf0cd95 | |
| parent | b8102149a637b7422ad4a57f4c89eb070cc7ccb3 (diff) | |
| parent | a5899346500c333a54baabac446ee730526fa981 (diff) | |
| download | MPC-55ac3ab87f2141a7d4b16bb14b63595970cb0fa6.tar.gz | |
Merge pull request #172 from DOCGroup/modernization
Modernization of html documentation (and rpm script)
25 files changed, 598 insertions, 513 deletions
| Binary files differ diff --git a/docs/README b/docs/README index d52a77a8..46d296b4 100644 --- a/docs/README +++ b/docs/README @@ -3,8 +3,7 @@ .:: 3/13/2002 ::. The Makefile, Project and Workspace Creator. -Designed by Justin Michel (michel_j@ociweb.com) and Chad Elliott. -Implemented by Chad Elliott (elliott_c@ociweb.com). +Designed by Justin Michel and Chad Elliott. A single tool (MPC) can be used to generate tool specific input (i.e., Makefile, dsp, vcproj, etc.) The generator takes platform and building diff --git a/docs/html/CDT6.html b/docs/html/CDT6.html index 2a632741..226d47f2 100644 --- a/docs/html/CDT6.html +++ b/docs/html/CDT6.html @@ -59,149 +59,156 @@ VM heap size is insufficient for building projects the size of ACE/TAO/CIAO. A minimum of 768Mb or more is suggested. This can be done on the command line launch of eclipse, or in the - <code>eclipse.ini</code> file.</li> + <em class="Code">eclipse.ini</em> file.</li> </ul> </div> <div> <h3 class="Head2">Usage</h3> - For every <code>project <var>myprojname</var> { }</code> in mpc files, the CDT6 project type + <p class="Body"> + For every <em class="Code">project <var>myprojname</var> { }</em> in mpc files, the CDT6 project type generates a corresponding "eclipse project" directory of the form - <samp>cdt_<var>myprojname</var></samp>. The CDT6 Project Type + <em class="Code">cdt_<var>myprojname</var></em>. The CDT6 Project Type uses Eclipse's <em>linked resource</em> feature to work around Eclipse's usual requirement that source files reside inside the Eclipse project directory. However, the linked resource feature also comes with restrictions; see <a href="#fullpath">the note</a> for details. - - <h4>Generic workflow</h4> + </p> + <h4 class="Head5">Generic workflow</h4> + <p class="Body"> Presuming .mpc files already exist: + </p> <ol> - <li>Generate projects using <samp>-type cdt6</samp>.</li> - <li>Import projects into an Eclipse workspace.</li> + <li><p class="Body">Generate projects using <em class="Code">-type cdt6</em>.</p></li> + <li><p class="Body">Import projects into an Eclipse workspace.</p></li> </ol> - <h4>Workflow for building ACE/TAO</h4> + <h4 class="Head5">Workflow for building ACE/TAO</h4> <ol> - <li>Check out a copy of ACE/TAO.</li> + <li><p class="Body">Check out a copy of ACE/TAO.</p></li> - <li>Configure ACE/TAO for your target(s) by setting up - <samp>config.h</samp>. + <li><p class="Body">Configure ACE/TAO for your target(s) by setting up + <em class="Code">config.h</em>.</p> </li> - <li>Set up environment variables (<var>ACE_ROOT</var>, + <li><p class="Body">Set up environment variables (<var>ACE_ROOT</var>, <var>TAO_ROOT</var>, etc.), <var>PATH</var>, - <var>LD_LIBRARY_PATH</var> (or similar), etc. + <var>LD_LIBRARY_PATH</var> (or similar), etc.</p> </li> - <li>Verify settings in <samp>global.features</samp> and, if changes + <li><p class="Body">Verify settings in <em class="Code">global.features</em> and, if changes are necessary, make appropriate changes in - <samp>default.features</samp>. + <em class="Code">default.features</em>.</p> </li> - <li>Generate projects using <samp>-type cdt6</samp> insuring the - use of <samp>mwc.pl</samp> from within ACE, e.g., - <blockquote><pre> -$ cd $TAO_ROOT -$ mwc.pl -type cdt6 TAO_ACE.mwc -</pre></blockquote> - <samp>mwc.pl</samp> will churn for awhile. + <li><p class="Body">Generate projects using <em class="Code">-type cdt6</em> insuring the + use of <em class="Code">mwc.pl</em> from within ACE, e.g.,</p> + <blockquote> +<p class="Code">$ cd $TAO_ROOT</p> +<p class="Code">$ mwc.pl -type cdt6 TAO_ACE.mwc</p> +</blockquote> + <p class="Body"><em class="Code">mwc.pl</em> will churn for awhile.</p> </li> - <li><em>Suggestion:</em> Verify that <strong>Project->Build + <li><p class="Body"><em>Suggestion:</em> Verify that <strong>Project->Build Automatically</strong> is unchecked (has no checkmark to its immediate left). If this is left on, then the build will start as - soon as the import in the next step begins, and it will build everything.</li> + soon as the import in the next step begins, and it will build everything.</p></li> - <li>From within Eclipse (preferably an otherwise-empty workspace) select - <strong>File->Import...</strong> and perform the following actions: + <li><p class="Body">From within Eclipse (preferably an otherwise-empty workspace) select + <strong>File->Import...</strong> and perform the following actions:</p> <ol type="a"> - <li>Choose <strong>General->Existing Projects Into - Workspace</strong> and click <strong>Next</strong></li> - <li>In "Select Root Directory:" text field, enter the full path + <li><p class="Body">Choose <strong>General->Existing Projects Into + Workspace</strong> and click <strong>Next</strong></p></li> + <li><p class="Body">In "Select Root Directory:" text field, enter the full path to the directory <em>above</em> ACE, TAO, etc. (you can also use the "Browse" feature to select the directory from the GUI). For example, if you checked everything out into - <samp>/home/joedeveloper/acetao</samp> and ACE and TAO are in a + <em class="Code">/home/joedeveloper/acetao</em> and ACE and TAO are in a peer layout under that directory, you would enter - <samp>/home/joedeveloper/acetao</samp> in the text field. - </li> - <li>Eclipse will scan all the subdirectories looking for existing + <em class="Code">/home/joedeveloper/acetao</em> in the text field. + </p></li> + <li><p class="Body">Eclipse will scan all the subdirectories looking for existing projects; this can take a few minutes for something as large as TAO or CIAO. <strong>NOTE:</strong> If you have previously run MPC to generate CDT projects with one workspace - (<samp>.mwc</samp> file) and then ran it later with a different + (<em class="Code">.mwc</em> file) and then ran it later with a different workspace without removing the projects from the first generation, Eclipse will still find those projects for import. See <a href="#remove_projects">the note on removing generated - projects</a> for information on how to do that.</li> + projects</a> for information on how to do that.</p></li> - <li><strong>Be sure that the checkbox next to <em>Copy projects + <li><p class="Body"><strong>Be sure that the checkbox next to <em>Copy projects into workspace</em> is <em>UN</em>checked.</strong> Copying projects into the workspace unnecessarily duplicates files, plus we have found that Eclipse can get confused with file paths sometimes (though - sometimes it will work).</li> + sometimes it will work).</p></li> - <li>Feel free to use <em>Working Sets</em> or not. You may also + <li><p class="Body">Feel free to use <em>Working Sets</em> or not. You may also choose to import a subset of the discovered projects by manipulating them in the list, however, experience suggests that the list is ignorant of dependency interactions between projects, so you must manage that manually (<em>i.e.</em>, you could import a project, but not projects upon which the first depends, and - that first project would then fail to build).</li> + that first project would then fail to build).</p></li> - <li>Click <strong>Finish</strong> to proceed with the import.</li> + <li><p class="Body">Click <strong>Finish</strong> to proceed with the import.</p></li> </ol> + <p class="Body"> Eclipse will now start populating the <em>Projects</em> pane with projects. If you didn't uncheck <strong>Build Automatically</strong>, then builds will start. Regardless, the - C++ indexer will run in the background across the source of all projects.</li> + C++ indexer will run in the background across the source of all projects.</p></li> </ol> - <h4>Building A Project</h4> + <h4 class="Head5">Building A Project</h4> + <p class="Body"> To build a project or set of projects, select the project (or projects) in the <em>Project</em> pane, then select <strong>Project->Build Project</strong>. Eclipse will evaluate <em>ALL</em> dependencies automatically, though not necessarily quickly. - <p> + </p> + <p class="Body"> <em>Hint:</em> a good choice to get all of ACE/TAO built is to choose the <em>Naming Service</em> project. - + </p> </div> <div> <h3 class="Head2">Multiple Platforms</h3> + <p class="Body"> Just as a project created within CDT can be set up to support multiple platforms, so too can projects generated via MPC. To the extent possible, the platforms are represented in generated projects in the same way as they are in "native" projects (though there will be some differences). - - <h4>Generating Projects with Multiple Platform Support</h4> - <p> - Platforms are named in a list called <samp>platforms</samp> in the + </p> + <h4 class="Head5">Generating Projects with Multiple Platform Support</h4> + <p class="Body"> + Platforms are named in a list called <em class="Code">platforms</em> in the CDT6 template (much like other MPC templates). The list defaults to - the platform on which <samp>mwc.pl</samp> is run. To generate for + the platform on which <em class="Code">mwc.pl</em> is run. To generate for another platforms, or for additional platforms, you must provide - <samp>platforms</samp> with the list of platforms to generate. + <em class="Code">platforms</em> with the list of platforms to generate. </p> - <p> + <p class="Body"> Generate projects using a similar incantation to the default (from - above) using <samp>-type cdt6</samp> and <samp>-value_template - platform="<platform_list>"</samp>, insuring the - use of <samp>mwc.pl</samp> from within ACE, e.g., - <blockquote><pre> -$ cd $TAO_ROOT -$ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc -</pre></blockquote> + above) using <em class="Code">-type cdt6</em> and <em class="Code">-value_template + platform="<platform_list>"</em>, insuring the + use of <em class="Code">mwc.pl</em> from within ACE, e.g., + <blockquote> +<p class="Code">$ cd $TAO_ROOT</p> +<p class="Code">$ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc</p> +</blockquote> </p> - <p> + <p class="Body"> Platforms are defined as scopes in <tt>templates/cdt6platforms.mpt</tt>. </p> - <h4>Cross-Compilation</h4> - <p> + <h4 class="Head5">Cross-Compilation</h4> + <p class="Body"> Cross-compilation is handled the same as a platform; the target is the platform. If you want to generate for cross-compilation, the cross-compiler information must be defined in a scope (typically @@ -210,46 +217,47 @@ $ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc the target, follow <a href="#addplatform">the instructions for adding a new platform.</a> </p> - <p> - In the example given above, <samp>cellppu</samp> is the name of the + <p class="Body"> + In the example given above, <em class="Code">cellppu</em> is the name of the platform for cross-compilation. </p> - <h4>Adding a New Platform<a name="addplatform"></a></h4> + <h4 class="Head5">Adding a New Platform<a name="addplatform"></a></h4> + <p class="Body"> To add a new platform, particularly one for cross-compilation, it's probably easiest to start from an existing scope, e.g., - <samp>cellppu</samp>. For cross-compilation where the cross-compiler + <em class="Code">cellppu</em>. For cross-compilation where the cross-compiler toolchain is GNU Compiler-based, you will need to provide the names of the various executables in the toolchain in the values - <samp>as</samp>, <samp>ar</samp>, <samp>cc</samp>, and - <samp>cxx</samp>. And, optionally, <samp>ccld</samp> and/or - <samp>cxxld</samp> if the linker used for linking C and C++ + <em class="Code">as</em>, <em class="Code">ar</em>, <em class="Code">cc</em>, and + <em class="Code">cxx</em>. And, optionally, <em class="Code">ccld</em> and/or + <em class="Code">cxxld</em> if the linker used for linking C and C++ executables, respectively, is different from the respective compiler. CDT expects these to be in the path. - + </p> </div> <div> <h3 class="Head2">Notes</h3> <ol> - <li> + <li><p class="Body"> There is no generated workspace. Eclipse's concept of workspace is very different from MPC's, and there is no way to generate a workspace. Eclipse's workspace concept doesn't permit sharing among machines or developers or even checking a workspace into version control. - </li> + </p></li> - <li>The Eclipse "workspace" and MPC project + source must not be in the + <li><p class="Body">The Eclipse "workspace" and MPC project + source must not be in the same directory hierarchy. For example, if you chose to have Eclipse store its workspace in - <samp>/home/joedeveloper/workspace</samp>, you may not put your + <em class="Code">/home/joedeveloper/workspace</em>, you may not put your MPC project+source under that directory. However, putting the - MPC project+source under <samp>/home/joedeveloper/acetao</samp> + MPC project+source under <em class="Code">/home/joedeveloper/acetao</em> or similar, <em>i.e.</em>, as a <em>peer</em> to the workspace directory, is fine. - </li> + </p></li> - <li><a name="fullpath"></a>CDT6 uses Eclipse's <em>linked + <li><p class="Body"><a name="fullpath"></a>CDT6 uses Eclipse's <em>linked resource</em> feature to work around the usual requirement that all source code reside in Eclipse project directories. These act similar to Unix symbolic links. While convenient so that a @@ -257,30 +265,26 @@ $ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc layout, it comes at a price: the target of the link must be specified as a full path. The consequence of this restriction is that, once the CDT6 projects get generated, the source should - not move in the filesystem.</li> + not move in the filesystem.</p></li> - <li><a name="remove_projects"></a>MPC's CDT Project Generator - creates directories named <samp>cdt_*</samp> for projects, similar + <li><p class="Body"><a name="remove_projects"></a>MPC's CDT Project Generator + creates directories named <em class="Code">cdt_*</em> for projects, similar to how the GNUACE generator generates makefiles of the form - <samp>GNUmakefile.*</samp>. To remove all CDT projects from a - directory hierarchy, on Linux you can use a command such as: -<pre> - $ find . -name 'cdt_*' -print | xargs rm -rf -</pre> + <em class="Code">GNUmakefile.*</em>. To remove all CDT projects from a + directory hierarchy, on Linux you can use a command such as:</p> +<blockquote> +<p class="Code">$ find . -name 'cdt_*' -print | xargs rm -rf</p> +</blockquote> </li> - <li>Perfect hash generation using the IDL compiler is not + <li><p class="Body">Perfect hash generation using the IDL compiler is not currently working because the IDL compiler cannot find the - <samp>gperf</samp> executable. This may be a <code>PATH</code> + <em class="Code">gperf</em> executable. This may be a <em class="Code">PATH</em> issue, "installation" issue, or an mpc file dependency issue. The - IDL compiler works but does not generate perfect hash lookups.</li> + IDL compiler works but does not generate perfect hash lookups.</p></li> </ol> </div> </div> - -<hr> -<address></address> -<!-- hhmts start --> Last modified: Thu Jul 22 11:14:15 CDT 2010 <!-- hhmts end --> </body> </html> diff --git a/docs/html/MakeProjectCreator.css b/docs/html/MakeProjectCreator.css index df10d52a..099561ac 100644 --- a/docs/html/MakeProjectCreator.css +++ b/docs/html/MakeProjectCreator.css @@ -1,3 +1,8 @@ +@import "https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"; +@import "https://fonts.googleapis.com/css?family=Roboto%20Mono:300,400,500,600,700"; +TABLE {border-collapse:collapse;border-spacing:0;display:table;border:1px solid #000} +TR:nth-child(odd) {background-color:#eee} + A.link { color: blue; text-decoration: underline; @@ -25,7 +30,7 @@ LI.Appendix-name { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Appendix-number { display: block; @@ -42,7 +47,7 @@ LI.Appendix-number { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.AuthorBook { display: block; @@ -59,7 +64,7 @@ P.AuthorBook { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Body { display: block; @@ -76,7 +81,7 @@ LI.Body { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.BodyNoLead { display: block; @@ -93,7 +98,7 @@ LI.BodyNoLead { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Body { display: block; @@ -110,7 +115,7 @@ P.Body { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.BodyNoLead { display: block; @@ -127,7 +132,7 @@ P.BodyNoLead { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Bullet1 { display: block; @@ -144,7 +149,7 @@ LI.Bullet1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Bullet2 { display: block; @@ -161,7 +166,7 @@ LI.Bullet2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Bulleted { display: block; @@ -178,7 +183,7 @@ LI.Bulleted { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.BulletNoLead1 { display: block; @@ -195,7 +200,7 @@ LI.BulletNoLead1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.BulletNoLead2 { display: block; @@ -212,7 +217,7 @@ LI.BulletNoLead2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Callout { display: block; @@ -229,7 +234,7 @@ P.Callout { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.CellBody { display: block; @@ -246,7 +251,7 @@ P.CellBody { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.CellHeading { display: block; @@ -263,7 +268,7 @@ P.CellHeading { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.ChapterNum, H2.ChapterNum, H3.ChapterNum, H4.ChapterNum, H5.ChapterNum, H6.ChapterNum { display: block; @@ -280,7 +285,7 @@ H1.ChapterNum, H2.ChapterNum, H3.ChapterNum, H4.ChapterNum, H5.ChapterNum, H6.Ch text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.Code { display: block; @@ -297,7 +302,7 @@ P.Code { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.Code-Line2 { display: block; @@ -314,7 +319,7 @@ P.Code-Line2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.Code-Line3 { display: block; @@ -331,7 +336,7 @@ P.Code-Line3 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.Code-Line4 { display: block; @@ -348,7 +353,7 @@ P.Code-Line4 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.Code-Line5 { display: block; @@ -365,7 +370,7 @@ P.Code-Line5 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.CodeLarge { display: block; @@ -382,7 +387,7 @@ P.CodeLarge { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.CodeWide { display: block; @@ -399,7 +404,7 @@ P.CodeWide { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.Copyright { display: block; @@ -416,7 +421,7 @@ P.Copyright { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.EditingNote { display: block; @@ -433,7 +438,7 @@ LI.EditingNote { text-decoration: underline ; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.FigTitle, H2.FigTitle, H3.FigTitle, H4.FigTitle, H5.FigTitle, H6.FigTitle { display: block; @@ -450,7 +455,7 @@ H1.FigTitle, H2.FigTitle, H3.FigTitle, H4.FigTitle, H5.FigTitle, H6.FigTitle { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.Footnote { display: block; @@ -467,7 +472,7 @@ P.Footnote { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.Head1, H2.Head1, H3.Head1, H4.Head1, H5.Head1, H6.Head1 { display: block; @@ -484,7 +489,7 @@ H1.Head1, H2.Head1, H3.Head1, H4.Head1, H5.Head1, H6.Head1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Head2, H2.Head2, H3.Head2, H4.Head2, H5.Head2, H6.Head2 { display: block; @@ -501,7 +506,7 @@ H1.Head2, H2.Head2, H3.Head2, H4.Head2, H5.Head2, H6.Head2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Head3, H2.Head3, H3.Head3, H4.Head3, H5.Head3, H6.Head3 { display: block; @@ -518,7 +523,7 @@ H1.Head3, H2.Head3, H3.Head3, H4.Head3, H5.Head3, H6.Head3 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Head4, H2.Head4, H3.Head4, H4.Head4, H5.Head4, H6.Head4 { display: block; @@ -535,7 +540,7 @@ H1.Head4, H2.Head4, H3.Head4, H4.Head4, H5.Head4, H6.Head4 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Head4-nonum { display: block; @@ -552,7 +557,7 @@ LI.Head4-nonum { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Head5, H2.Head5, H3.Head5, H4.Head5, H5.Head5, H6.Head5 { display: block; @@ -569,7 +574,7 @@ H1.Head5, H2.Head5, H3.Head5, H4.Head5, H5.Head5, H6.Head5 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Head5-special { display: block; @@ -586,7 +591,7 @@ LI.Head5-special { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Head6, H2.Head6, H3.Head6, H4.Head6, H5.Head6, H6.Head6 { display: block; @@ -603,7 +608,7 @@ H1.Head6, H2.Head6, H3.Head6, H4.Head6, H5.Head6, H6.Head6 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.Heading1, H2.Heading1, H3.Heading1, H4.Heading1, H5.Heading1, H6.Heading1 { display: block; @@ -620,7 +625,7 @@ H1.Heading1, H2.Heading1, H3.Heading1, H4.Heading1, H5.Heading1, H6.Heading1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.Heading2, H2.Heading2, H3.Heading2, H4.Heading2, H5.Heading2, H6.Heading2 { display: block; @@ -637,7 +642,7 @@ H1.Heading2, H2.Heading2, H3.Heading2, H4.Heading2, H5.Heading2, H6.Heading2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.HeadingRunIn { display: block; @@ -654,7 +659,7 @@ P.HeadingRunIn { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.IlloCaption { display: block; @@ -671,7 +676,7 @@ LI.IlloCaption { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.IlloCaptionApp { display: block; @@ -688,7 +693,7 @@ LI.IlloCaptionApp { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Indent1 { display: block; @@ -705,7 +710,7 @@ P.Indent1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Indent2 { display: block; @@ -722,7 +727,7 @@ P.Indent2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Indented { display: block; @@ -739,7 +744,7 @@ P.Indented { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.IndexTitle { display: block; @@ -756,7 +761,7 @@ LI.IndexTitle { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.Mapping-Table-Cell { display: block; @@ -773,7 +778,7 @@ P.Mapping-Table-Cell { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Mapping-Table-Title { display: block; @@ -790,7 +795,7 @@ P.Mapping-Table-Title { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.NoteBody { display: block; @@ -807,7 +812,7 @@ LI.NoteBody { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.NoteSpecial { display: block; @@ -824,7 +829,7 @@ LI.NoteSpecial { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.NoteSpecial2 { display: block; @@ -841,7 +846,7 @@ LI.NoteSpecial2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Numbered { display: block; @@ -858,7 +863,7 @@ LI.Numbered { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Numbered1 { display: block; @@ -875,7 +880,7 @@ LI.Numbered1 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Numbered2 { display: block; @@ -892,7 +897,7 @@ LI.Numbered2 { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.NumberedTableTitle, H2.NumberedTableTitle, H3.NumberedTableTitle, H4.NumberedTableTitle, H5.NumberedTableTitle, H6.NumberedTableTitle { display: block; @@ -909,7 +914,7 @@ H1.NumberedTableTitle, H2.NumberedTableTitle, H3.NumberedTableTitle, H4.Numbered text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.OptionHeader { display: block; @@ -926,7 +931,7 @@ LI.OptionHeader { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.ParmBody { display: block; @@ -943,7 +948,7 @@ LI.ParmBody { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Part-Name { display: block; @@ -960,7 +965,7 @@ LI.Part-Name { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.Part-No { display: block; @@ -977,7 +982,7 @@ LI.Part-No { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.PublisherBook { display: block; @@ -994,7 +999,7 @@ P.PublisherBook { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.RuningH-F { display: block; @@ -1011,7 +1016,7 @@ P.RuningH-F { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Section-name { display: block; @@ -1028,7 +1033,7 @@ LI.Section-name { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.Section-number { display: block; @@ -1045,7 +1050,7 @@ LI.Section-number { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.SideDescription, H2.SideDescription, H3.SideDescription, H4.SideDescription, H5.SideDescription, H6.SideDescription { display: block; @@ -1062,7 +1067,7 @@ H1.SideDescription, H2.SideDescription, H3.SideDescription, H4.SideDescription, text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideExample, H2.SideExample, H3.SideExample, H4.SideExample, H5.SideExample, H6.SideExample { display: block; @@ -1079,7 +1084,7 @@ H1.SideExample, H2.SideExample, H3.SideExample, H4.SideExample, H5.SideExample, text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideException, H2.SideException, H3.SideException, H4.SideException, H5.SideException, H6.SideException { display: block; @@ -1096,7 +1101,7 @@ H1.SideException, H2.SideException, H3.SideException, H4.SideException, H5.SideE text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideImpact, H2.SideImpact, H3.SideImpact, H4.SideImpact, H5.SideImpact, H6.SideImpact { display: block; @@ -1113,7 +1118,7 @@ H1.SideImpact, H2.SideImpact, H3.SideImpact, H4.SideImpact, H5.SideImpact, H6.Si text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideLine, H2.SideLine, H3.SideLine, H4.SideLine, H5.SideLine, H6.SideLine { display: block; @@ -1130,7 +1135,7 @@ H1.SideLine, H2.SideLine, H3.SideLine, H4.SideLine, H5.SideLine, H6.SideLine { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideLocCodeAUnits, H2.SideLocCodeAUnits, H3.SideLocCodeAUnits, H4.SideLocCodeAUnits, H5.SideLocCodeAUnits, H6.SideLocCodeAUnits { display: block; @@ -1147,7 +1152,7 @@ H1.SideLocCodeAUnits, H2.SideLocCodeAUnits, H3.SideLocCodeAUnits, H4.SideLocCode text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideLocCodeUnits, H2.SideLocCodeUnits, H3.SideLocCodeUnits, H4.SideLocCodeUnits, H5.SideLocCodeUnits, H6.SideLocCodeUnits { display: block; @@ -1164,7 +1169,7 @@ H1.SideLocCodeUnits, H2.SideLocCodeUnits, H3.SideLocCodeUnits, H4.SideLocCodeUni text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideNote, H2.SideNote, H3.SideNote, H4.SideNote, H5.SideNote, H6.SideNote { display: block; @@ -1181,7 +1186,7 @@ H1.SideNote, H2.SideNote, H3.SideNote, H4.SideNote, H5.SideNote, H6.SideNote { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideParameters, H2.SideParameters, H3.SideParameters, H4.SideParameters, H5.SideParameters, H6.SideParameters { display: block; @@ -1198,7 +1203,7 @@ H1.SideParameters, H2.SideParameters, H3.SideParameters, H4.SideParameters, H5.S text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideReturn, H2.SideReturn, H3.SideReturn, H4.SideReturn, H5.SideReturn, H6.SideReturn { display: block; @@ -1215,7 +1220,7 @@ H1.SideReturn, H2.SideReturn, H3.SideReturn, H4.SideReturn, H5.SideReturn, H6.Si text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideSeeAlso, H2.SideSeeAlso, H3.SideSeeAlso, H4.SideSeeAlso, H5.SideSeeAlso, H6.SideSeeAlso { display: block; @@ -1232,7 +1237,7 @@ H1.SideSeeAlso, H2.SideSeeAlso, H3.SideSeeAlso, H4.SideSeeAlso, H5.SideSeeAlso, text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideSynopsis, H2.SideSynopsis, H3.SideSynopsis, H4.SideSynopsis, H5.SideSynopsis, H6.SideSynopsis { display: block; @@ -1249,7 +1254,7 @@ H1.SideSynopsis, H2.SideSynopsis, H3.SideSynopsis, H4.SideSynopsis, H5.SideSynop text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } H1.SideUsage, H2.SideUsage, H3.SideUsage, H4.SideUsage, H5.SideUsage, H6.SideUsage { display: block; @@ -1266,7 +1271,7 @@ H1.SideUsage, H2.SideUsage, H3.SideUsage, H4.SideUsage, H5.SideUsage, H6.SideUsa text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.TableFootnote { display: block; @@ -1283,7 +1288,7 @@ P.TableFootnote { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.TableTitle { display: block; @@ -1300,7 +1305,7 @@ LI.TableTitle { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Tbl-Body { display: block; @@ -1317,7 +1322,7 @@ P.Tbl-Body { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.Tbl-Heading { display: block; @@ -1334,7 +1339,7 @@ P.Tbl-Heading { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.Tbl-SideHeading { display: block; @@ -1351,7 +1356,7 @@ P.Tbl-SideHeading { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.Tbl-Subhead { display: block; @@ -1368,7 +1373,7 @@ P.Tbl-Subhead { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.TblCaption { display: block; @@ -1385,7 +1390,7 @@ LI.TblCaption { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.TblCaptionApp { display: block; @@ -1402,7 +1407,7 @@ LI.TblCaptionApp { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.TblCode { display: block; @@ -1419,7 +1424,7 @@ P.TblCode { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } P.TblFootnote { display: block; @@ -1436,7 +1441,7 @@ P.TblFootnote { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } H1.Title, H2.Title, H3.Title, H4.Title, H5.Title, H6.Title { display: block; @@ -1453,7 +1458,7 @@ H1.Title, H2.Title, H3.Title, H4.Title, H5.Title, H6.Title { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.TitleBook { display: block; @@ -1470,7 +1475,7 @@ P.TitleBook { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.TopLine { display: block; @@ -1487,7 +1492,7 @@ LI.TopLine { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.zHead-rightside { display: block; @@ -1504,7 +1509,7 @@ P.zHead-rightside { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } LI.zNumberAppendix { display: block; @@ -1521,7 +1526,7 @@ LI.zNumberAppendix { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } LI.zNumberSection { display: block; @@ -1538,7 +1543,7 @@ LI.zNumberSection { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.zRunningFooter { display: block; @@ -1555,7 +1560,7 @@ P.zRunningFooter { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } P.zRunningHeader { display: block; @@ -1572,7 +1577,7 @@ P.zRunningHeader { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } P.zSlugline { display: block; @@ -1589,7 +1594,7 @@ P.zSlugline { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } EM.Bold { font-weight: Bold; @@ -1602,7 +1607,7 @@ EM.BoldCode { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } EM.Code { font-size: 11.000000pt; @@ -1612,7 +1617,7 @@ EM.Code { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } EM.CodeOption { font-size: 11.000000pt; @@ -1622,7 +1627,7 @@ EM.CodeOption { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } EM.Dialog-Box-Title { font-size: 11.000000pt; @@ -1632,7 +1637,7 @@ EM.Dialog-Box-Title { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial Narrow"; + font-family: "Poppins"; } EM.Emphasis { font-style: Oblique; @@ -1663,7 +1668,7 @@ EM.TableCode { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } EM.Underline { text-decoration: underline ; @@ -1676,7 +1681,7 @@ EM.URL { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Courier New"; + font-family: "Roboto Mono"; } EM.zAuto-Format { font-size: 10.000000pt; @@ -1685,7 +1690,7 @@ EM.zAuto-Format { color: #000000; text-decoration: none; vertical-align: baseline; - font-family: "Arial"; + font-family: "Poppins"; } EM.zAuto-FormatGray { font-size: 10.000000pt; @@ -1695,7 +1700,7 @@ EM.zAuto-FormatGray { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } EM.zBulletGray { font-size: 10.000000pt; @@ -1705,7 +1710,7 @@ EM.zBulletGray { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } EM.zBulletHyphen { font-size: 11.000000pt; @@ -1714,7 +1719,7 @@ EM.zBulletHyphen { color: #000000; text-decoration: none; vertical-align: baseline; - font-family: "Arial"; + font-family: "Poppins"; } EM.zCaptionNumberFormat { font-size: 9.500000pt; @@ -1724,7 +1729,7 @@ EM.zCaptionNumberFormat { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Arial"; + font-family: "Poppins"; } EM.zPageNumber { font-size: 9.000000pt; @@ -1734,7 +1739,7 @@ EM.zPageNumber { text-decoration: none; vertical-align: baseline; text-transform: none; - font-family: "Times New Roman"; + font-family: "Poppins"; } EM.zWhite { font-size: 4.000000pt; @@ -1743,7 +1748,7 @@ EM.zWhite { color: #ffffff; text-decoration: none; vertical-align: baseline; - font-family: "Times New Roman"; + font-family: "Poppins"; } img.floating { float: right; @@ -1751,6 +1756,6 @@ img.floating { } pre.codeexample { font-size: 8.0 pt; - font-family: "courier new"; + font-family: "Roboto Mono"; margin-left: 24 pt; } diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html index 69fc32c2..74d223a6 100644 --- a/docs/html/MakeProjectCreator.html +++ b/docs/html/MakeProjectCreator.html @@ -99,7 +99,7 @@ <p class="Tbl-Body"> </p> <div> - <img src="images/mpc.gif" alt= + <img src="images/mpc.png" alt= "Generating projects with mpc.pl"> </div> </td> @@ -137,7 +137,7 @@ <p class="Tbl-Body"> </p> <div> - <img src="images/mwc.gif" alt= + <img src="images/mwc.png" alt= "Generating workspaces with mwc.pl"> </div> </td> @@ -2393,6 +2393,25 @@ class="Code">specific</em> clause. <td rowspan="1" colspan="1"> <p class="Tbl-Body"> <em class= + "TableCode">buildflags</em> + </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> + This keyword can only be used as a source component + scoped setting (ie. inside the scope of + Source_Files). It specifies additional build flags + that will be passed to the compiler as the source + files are being compiled. + </p> + </td> + </tr> + + <tr> + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> + <em class= "TableCode">custom_only</em> </p> </td> @@ -3907,6 +3926,102 @@ class="Code">specific</em> clause. <tr> <td rowspan="1" colspan="1"> <p class="Tbl-Body"> + <em class="TableCode">vc14</em> + </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + </tr> + + <tr> + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> + <em class="TableCode">vs2017</em> + </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + </tr> + + <tr> + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> + <em class="TableCode">vs2019</em> + </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + </tr> + + <tr> + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> + <em class="TableCode">vs2022</em> + </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> </p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + + <td rowspan="1" colspan="1"> + <p class="Tbl-Body">Yes</p> + </td> + </tr> + + <tr> + <td rowspan="1" colspan="1"> + <p class="Tbl-Body"> <em class="TableCode">wix</em> </p> </td> @@ -4017,7 +4132,9 @@ class="Code">specific</em> clause. <p class="Code"> Define_Custom(MOC) {</p> - <p class="Code"> automatic = 0</p> + <p class="Code"> automatic_in = 0</p> + + <p class="Code"> automatic_out = 0</p> <p class="Code"> command = @@ -4933,23 +5050,25 @@ class="Code">specific</em> clause. <p class="Code"> Define_Custom(Quogen) {</p> - <p class="Code"> automatic = 0</p> + <p class="Code"> automatic_in = 0</p> + + <p class="Code"> automatic_out = 0</p> - <p class="Code"> command = perl quogen.pl</p> + <p class="Code"> command = perl quogen.pl</p> <p class="Code"> - commandflags = --debuglevel=1 + commandflags = --debuglevel=1 --language=c++ \ </p> <p class="Code"> - --kernel_language=c++ + --kernel_language=c++ </p> - <p class="Code"> inputext = .prp</p> + <p class="Code"> inputext = .prp</p> <p class="Code"> - keyword quogenflags = + keyword quogenflags = commandflags </p> @@ -6280,14 +6399,24 @@ class="Code">specific</em> clause. <p class="Code">bzip2 = 0</p> + <p class="Code">erlang = 0</p> + <p class="Code">java = 0</p> <p class="Code">mfc = 0</p> + <p class="Code">libpng = 0</p> + + <p class="Code">openssl11 = 0</p> + <p class="Code">python = 0</p> <p class="Code">qt = 0</p> + <p class="Code">qt4 = 0</p> + + <p class="Code">qt5 = 0</p> + <p class="Code">rpc = 0</p> <p class="Code">swig_java = 0</p> @@ -6304,7 +6433,13 @@ class="Code">specific</em> clause. <p class="Code">uses_wchar = 0</p> - <p class="Code">xalan = 0</p> + <p class="Code">wireshark_any = 0</p> + + <p class="Code">wireshark = 0</p> + + <p class="Code">wireshark_cmake = 0</p> + + <p class="Code">xalanc = 0</p> <p class="Code">xerces = 0</p> @@ -8192,7 +8327,7 @@ class="Code">specific</em> clause. <p class="Code"> Usage: document_template.pl <template> - [<html output> [language]] + [<outputfile> [language]] </p> <p class="Code"> </p> @@ -8208,14 +8343,25 @@ class="Code">specific</em> clause. </p> <p class="Code"> - html output - This defaults to the name of the + outputfile - This defaults to the name of the template file with the .mpd </p> <p class="Code"> extension replaced with - .html. + '.html' If <outputfile> ends in '.txt', + </p> + + <p class="Code"> + + the output is in text + format similar to what is found in + </p> + + <p class="Code"> + + .../docs/templates. </p> <p class="Code"> diff --git a/docs/html/RpmSpec.html b/docs/html/RpmSpec.html index f930b0be..19539649 100644 --- a/docs/html/RpmSpec.html +++ b/docs/html/RpmSpec.html @@ -18,17 +18,17 @@ <h3 class="Head2">Background/Abstract</h3> <ul> <li class="body">The <em>RpmSpec Type</em> generates - <samp>.spec</samp> files suitable for use by the <samp><a - href="http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch-rpmbuild.html">rpmbuild</a></samp> + <em class="Code">.spec</em> files suitable for use by the <em class="Code"><a + href="http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch-rpmbuild.html">rpmbuild</a></em> utility to build and package. It additionally creates a Bourne shell script that automates creation of source tarball and proper - dependency-order building/packaging of <samp>.spec</samp> files. + dependency-order building/packaging of <em class="Code">.spec</em> files. </li> <li class="body">The RpmSpec type refines the existing <em>aggregated workspace</em> MPC concept, as well as introduces - the ability to have <samp>specific</samp> clauses inside - workspace declarations (<samp>.mwc</samp> files). Consequently, + the ability to have <em class="Code">specific</em> clauses inside + workspace declarations (<em class="Code">.mwc</em> files). Consequently, workspace files utilizing these new features are not backwards-compatible with prior releases of MPC.</li> @@ -59,141 +59,145 @@ <div> <h3 class="Head2">Usage</h3> + <p class="Body"> The RpmSpec type refines an existing concept in MPC known as <em><a href="MakeProjectCreator.html#AggregatedWorkspace">aggregate workspaces</a></em> to define package scopes. When - <code>mwc.pl</code> is run on a top-level workspace with - <code>-type rpmspec</code>, each aggregated workspace is presumed + <em class="Code">mwc.pl</em> is run on a top-level workspace with + <em class="Code">-type rpmspec</em>, each aggregated workspace is presumed to define the scope of a package that will become an RPM. Inter-project dependencies that exist between any projects known to the top-level workspace automatically turn into inter-package dependencies in RPMs. - - <h4>Generic workflow</h4> + </p> + <h4 class="Head5">Generic workflow</h4> <div align="center"> - <img src="rpmworkflow.png" alt="rpm workflow"/> + <img src="images/rpmworkflow.png" alt="rpm workflow"/> <h6 align="center">Figure: RPM Workflow</h6> </div> - Presuming <code>.mwc</code> files already exist, and that + <p class="Body"> + Presuming <em class="Code">.mwc</em> files already exist, and that inter-project dependencies are complete and well-formed (i.e., - contain sufficient <samp>after</samp> statements to insure proper + contain sufficient <em class="Code">after</em> statements to insure proper build ordering): + </p> <ol> - <li>Use the command <samp>mwc.pl -type rpmspec <em>top-level-workspace.mwc</em></samp> to generate - <code>.spec</code> files and <samp>*_rpm.sh</samp> builder script.</li> + <li><p class="Body">Use the command <em class="Code">mwc.pl -type rpmspec <em>top-level-workspace.mwc</em></em> to generate + <em class="Code">.spec</em> files and <em class="Code">*_rpm.sh</em> builder script.</p></li> - <li>Run the <code><em>top-level-workspace</em>_rpm.sh</code> - script to build/package.</li> + <li><p class="Body">Run the <em class="Code"><em>top-level-workspace</em>_rpm.sh</em> + script to build/package.</p></li> </ol> </div> <div> <h3 class="Head2">Adapting/Writing Projects for Packaging</h3> - <h4><a name="mwcnotes"></a>Creating Workspaces</h4> - <p>The RpmSpec type uses <a + <h4 class="Head5"><a name="mwcnotes"></a>Creating Workspaces</h4> + <p class="Body">The RpmSpec type uses <a href="MakeProjectCreator.html#AggregatedWorkspace">aggregate workspaces</a> to define the scope of a package. In other words, - defining a package involves writing a <samp>.mwc</samp> file that + defining a package involves writing a <em class="Code">.mwc</em> file that includes all the projects that should go into that package. - An additional <samp>.mwc</samp> file must be written for each + An additional <em class="Code">.mwc</em> file must be written for each additional package. Finally, these <em>package</em> workspaces get aggregated into a workspace. - <p>RPM packages require extra information not needed by "normal" + <p class="Body">RPM packages require extra information not needed by "normal" MPC projects or workspaces. This information is defined in a - <samp>specific</samp> clause in the workspace for the - <samp>rpmspec</samp> type, e.g., - - <pre class="codeexample"> -// top-level workspace -workspace { - specific (rpmspec) { - rpm_version = 1.0 - rpm_release = 1 - } - package1.mwc - package2.mwc -} -</pre> - Details on the variables allowed in the <samp>specific</samp> + <em class="Code">specific</em> clause in the workspace for the + <em class="Code">rpmspec</em> type, e.g., + + <blockquote> +<p class="Code">// top-level workspace</p> +<p class="Code">workspace {</p> +<p class="Code"> specific (rpmspec) {</p> +<p class="Code"> rpm_version = 1.0</p> +<p class="Code"> rpm_release = 1</p> +<p class="Code"> }</p> +<p class="Code"> package1.mwc</p> +<p class="Code"> package2.mwc</p> +<p class="Code">}</p> + </blockquote> + <p class="Body"> + Details on the variables allowed in the <em class="Code">specific</em> clause can be found in the <a href="../templates/rpmspec.txt"> - <samp>$MPC_ROOT/docs/templates/rpmspec.txt</samp></a> file. + <em class="Code">$MPC_ROOT/docs/templates/rpmspec.txt</em></a> file. + </p> - <p>If you use workspaces as a part of + <p class="Body">If you use workspaces as a part of building right now, you may wish to write additional workspace files specifically for packaging via RPM. - <h4><a name="installready"></a>Making Projects + <h4 class="Head5"><a name="installready"></a>Making Projects <em>Install-Ready</em></h4> - + <p class="Body"> MPC-assisted packaging requires some attention from the developer in order to yield its full potential. What this means is that in order for a project to avail itself to be packaged, it must take care to insure that any collateral (such as files) that it needs to end up in the package get installed via MPC's <em>install</em> feature. Note that this feature is currently only implemented within the - <samp>gnuace</samp> project type. - - Typically, this involves inheriting from the <samp>install</samp> + <em class="Code">gnuace</em> project type. + </p> + <p class="Body"> + Typically, this involves inheriting from the <em class="Code">install</em> base project in order to enable auto-generation of installation rules in the makefiles. MPC defaults to making educated guesses as - to what files should be installed (e.g., for an <samp>exe</samp> + to what files should be installed (e.g., for an <em class="Code">exe</em> project, it figures that the executable should be installed), but a developer can augment or replace MPC's guesses using - <samp>Install*_Files</samp> groupings. See the documentation on - the <samp>gnuace</samp> installation feature for details. + <em class="Code">Install*_Files</em> groupings. See the documentation on + the <em class="Code">gnuace</em> installation feature for details. + </p> </div> </div> <div> <h3 class="Head2">Notes</h3> - <h4><a name="rpmnotes"></a>Notes on Generated RPMs</h4> + <h4 class="Head5"><a name="rpmnotes"></a>Notes on Generated RPMs</h4> <ol> - <li>RPMs are relocatable using the <code>--prefix</code> or - <code>--relocate</code> options to <code>rpm</code>.</li> - <li>The RpmSpec type has no control over where the RPM system performs + <li><p class="Body">RPMs are relocatable using the <em class="Code">--prefix</em> or + <em class="Code">--relocate</em> options to <em class="Code">rpm</em>.</p></li> + <li><p class="Body">The RpmSpec type has no control over where the RPM system performs it's "work" (building, staging, packaging, etc.). In the - past, this was often <samp>/usr/src/redhat</samp>, though your - system may be configured differently.<br/><samp>rpmbuild</samp> + past, this was often <em class="Code">/usr/src/redhat</em>, though your + system may be configured differently.<br/><em class="Code">rpmbuild</em> holds this directory in its <em>_topdir</em> configuration variable. To see the value of <em>_topdir</em> on - your system, execute the following command:<br/> - <pre class="codeexample"> -<b>$ rpmbuild --showrc | grep '_topdir[^}]'</b> --14: _topdir %{getenv:HOME}/rpmbuild -</pre> + your system, execute the following command:</p> + <blockquote> +<p class="Code"><b>$ rpmbuild --showrc | grep '_topdir[^}]'</b></p> +<p class="Code">-14: _topdir %{getenv:HOME}/rpmbuild</p> +</blockquote> </li> - <li>Binary RPMs land in <samp><em>_topdir</em>/RPMS</samp>.</li> - <li>Source RPMs land in <samp><em>_topdir</em>/SRPMS</samp>.</li> + <li><p class="Body">Binary RPMs land in <em class="Code"><em>_topdir</em>/RPMS</em>.</p></li> + <li><p class="Body">Source RPMs land in <em class="Code"><em>_topdir</em>/SRPMS</em>.</p></li> </ol> - <h4><a name="scriptnotes"></a>Notes on Generated Script</h4> + <h4 class="Head5"><a name="scriptnotes"></a>Notes on Generated Script</h4> <ol> - <li>The script takes one optional argument + <li><p class="Body">The script takes one optional argument indicating the architecture for which it should create packages. The script makes no attempt to "find" a toolchain for that architecture, instead presuming that whatever toolchain is needed can be found in the PATH or is specified in the - <code>.spec</code> file.</li> + <em class="Code">.spec</em> file.</p></li> - <li>The script performs a build/install activity for each package. + <li><p class="Body">The script performs a build/install activity for each package. Installation is not into the running system, but rather into a "fake" area. Installation is necessary to satisfy inter-package - dependency requirements.<br/>The location of the "fake" area - defaults to <samp>/tmp/mpcrpm</samp> but can be changed by setting the - <samp><%rpm_mpc_temp%></samp> in a workspace - <samp>specific</samp> clause, typically in the top-level - workspace.</li> + dependency requirements.</p><p class="Body">The location of the "fake" area + defaults to <em class="Code">/tmp/mpcrpm</em> but can be changed by setting the + <em class="Code"><%rpm_mpc_temp%></em> in a workspace + <em class="Code">specific</em> clause, typically in the top-level + workspace.<p></li> </ol> </div> - -<hr> -<!-- hhmts start --> Last modified: Fri Jan 14 09:09:04 CST 2011 <!-- hhmts end --> </body> </html> diff --git a/docs/html/WB26.html b/docs/html/WB26.html index b2b05d36..9dcdbbd3 100644 --- a/docs/html/WB26.html +++ b/docs/html/WB26.html @@ -15,99 +15,100 @@ <h1 class="Head1">WB26 Project Type documentation</h1> <div> -<p> +<p class="Body"> Starting with ACE/TAO x.6.3 it is possible to generate project files for the WindRiver Workbench version 2.6 (VxWorks 6.4). We have validated the MPC support for the ACE lib, TAO libs and the TAO tests. </p> -<p>With VxWorks we have to do a cross build. The first step is to setup a host +<p class="Body">With VxWorks we have to do a cross build. The first step is to setup a host build, from this host build we use the gperf and TAO_IDL tools in the cross build. </p> -<p>The Workbench is using eclipse as framework and then has several +<p class="Body">The Workbench is using eclipse as framework and then has several WindRiver specific extensions. Part of the generation done by MPC is then specifically for the WindRiver tools, part is for the eclipse environment. The Workbench uses the fixed project filenames -<code>.project</code>, <code>.wrproject</code>, and <code>.wrmakefile</code>. -In the <code>.project</code> file the files in the project are listed, -in the <code>.wrproject</code> the compiler and linker flags are -defined, and in the <code>.wrmakefile</code> the custom build rules +<em class="Code">.project</em>, <em class="Code">.wrproject</em>, and <em class="Code">.wrmakefile</em>. +In the <em class="Code">.project</em> file the files in the project are listed, +in the <em class="Code">.wrproject</em> the compiler and linker flags are +defined, and in the <em class="Code">.wrmakefile</em> the custom build rules are defined, like triggering the IDL compiler.</p> -<p>By default the files are generated in the same directory as the MPC file. +<p class="Body">By default the files are generated in the same directory as the MPC file. When you have multiple projects in one directory you have to add -<code>-make_coexistence</code> to the invocation of <code>mwc.pl</code> +<em class="Code">-make_coexistence</em> to the invocation of <em class="Code">mwc.pl</em> Then for each project a new subdirectory will be created to -store the files the workbench needs. If you run <code>mwc.pl -make_coexistence</code> from the +store the files the workbench needs. If you run <em class="Code">mwc.pl -make_coexistence</em> from the ACE_wrappers directory you will get a lot of subdirectories in your tree. </p> +<p class="Body"> By default we generate for the flexible build support, when you want to use -standard build use <code>-value_template standard_build=1</code>. +standard build use <em class="Code">-value_template standard_build=1</em>. </p> -<p> +<p class="Body"> To get a project with all dependencies create a new workspace file, f.e. vxworks.mwc -<pre> -workspace(vxworks) { - ace - TAO/tao - TAO/tests/Hello -} -</pre> +<blockquote> +<p class="Code">workspace(vxworks) {</p> +<p class="Code"> ace</p> +<p class="Code"> TAO/tao</p> +<p class="Code"> TAO/tests/Hello</p> +<p class="Code">}</p> +</blockquote> </p> -<p> +<p class="Body"> You should generate the project files from a VxWorks development shell or should have executed the wrenv script. With x.6.4 or newer you do execute: -<pre> -set ACE_ROOT=your_path -cd %ACE_ROOT% -perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -make_coexistence -</pre> +<blockquote> +<p class="Code">set ACE_ROOT=your_path</p> +<p class="Code">cd %ACE_ROOT%</p> +<p class="Code">perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -make_coexistence</p> +</blockquote> </p> -<p> +<p class="Body"> After you have generated the project files you have to import them into your current Workbench workspace with the following steps -<itemize> -<item>Open the workbench</item> -<item>Select File, Import, General, Existing Projects into Workspace</item> -<item>Select your ACE_ROOT directory and let the Workbench search for projects</item> -<item>Select now the projects you want to import in the Projects list and select Finish</item> -<item>After importing close the workbench</item> -<item>Copy the prefs file to its location, see below</item> -<item>Start the workbench again</item> -</itemize> +<ul> +<li><p class="Body">Open the workbench</p></li> +<li><p class="Body">Select File, Import, General, Existing Projects into Workspace</p></li> +<li><p class="Body">Select your ACE_ROOT directory and let the Workbench search for projects</p></li> +<li><p class="Body">Select now the projects you want to import in the Projects list and select Finish</p></li> +<li><p class="Body">After importing close the workbench</p></li> +<li><p class="Body">Copy the prefs file to its location, see below</p></li> +<li><p class="Body">Start the workbench again</p></li> +</ul> </p> -<p>The build order of the projects is stored in an eclipse file that -is generated as workspace by the <code>wb26</code> generator. After +<p class="Body">The build order of the projects is stored in an eclipse file that +is generated as workspace by the <em class="Code">wb26</em> generator. After you have imported the projects into the Workbench close it and then -copy the generated <code>org.eclipse.core.resources.prefs</code> file to -the <code>.metadata\.plugins\org.eclipse.core.runtime\.settings</code> +copy the generated <em class="Code">org.eclipse.core.resources.prefs</em> file to +the <em class="Code">.metadata\.plugins\org.eclipse.core.runtime\.settings</em> directory of the Workbench and then restart the workbench again. Do note that the build order can only be generated for the projects that are listed in the MPC workspace. The other option is to use subprojects to which -you can enable with <code>-value_template enable_subprojects=1</code>. There is a bug +you can enable with <em class="Code">-value_template enable_subprojects=1</em>. There is a bug in Workbench 2.6/3.0 related to the build order, it is ignored if you use -<code>wrws_update</code> to build the workspace from the commandline.</p> -<p>When compiling TAO you need to have tao_idl and gperf available. You can copy tao_idl and +<em class="Code">wrws_update</em> to build the workspace from the commandline.</p> +<p class="Body">When compiling TAO you need to have tao_idl and gperf available. You can copy tao_idl and gperf manually to the ACE_wrappers\bin directory of your target build or you can specify an alternative tao_idl when generating the workspace like below. -<pre> -perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -value_template tao_idl=$(HOST_TAO_IDL) -perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -value_template tao_idl=c:\tmp\tao_idl -</pre> +<blockquote> +<p class="Code">perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -value_template tao_idl=$(HOST_TAO_IDL)</p> +<p class="Code">perl %ACE_ROOT%\bin\mwc.pl vxworks.mwc -type wb26 -value_template tao_idl=c:\tmp\tao_idl</p> +</blockquote> </p> -<p>When using the <code>-expand_vars</code> by default only the environment variables which match -the wildcard <code>*_ROOT</code> are expanded. If you want to get other environment variables expanded (like <code>WIND_BASE</code>) -you can specify these through the <code>-relative</code> argument or use a file that you specify with <code> --relative_file</code>. For example you can use the following relative_file which expands the environment variables +<p class="Body">When using the <em class="Code">-expand_vars</em> by default only the environment variables which match +the wildcard <em class="Code">*_ROOT</em> are expanded. If you want to get other environment variables expanded (like <em class="Code">WIND_BASE</em>) +you can specify these through the <em class="Code">-relative</em> argument or use a file that you specify with <em class="Code"> +-relative_file</em>. For example you can use the following relative_file which expands the environment variables listed. -<pre> -*_ROOT -TAO_ROOT, $ACE_ROOT/TAO -CIAO_ROOT, $TAO_ROOT/CIAO -*_BASE -</pre> +<blockquote> +<p class="Code">*_ROOT</p> +<p class="Code">TAO_ROOT, $ACE_ROOT/TAO</p> +<p class="Code">CIAO_ROOT, $TAO_ROOT/CIAO</p> +<p class="Code">*_BASE</p> +</blockquote> </p> -<p> +<p class="Body"> We do have some limitations at this moment because of restrictions in MPC or the Workbench. We are working on resolving the MPC restrictions, the Workbench restrictions have been reported to WindRiver and are already converted to enhancement requests. It is important to get these enhancement requests implemented by @@ -115,14 +116,15 @@ WindRiver. As user you can have impact on the importancy of these enhancement re for WindRiver and ask WindRiver to implement these enhancement requests. Pleas let us know that you have done this so that we can inform our local WindRiver contacts. We also have a large list of POSIX enhancement requests, if you are interested in more POSIX compliance contact us to get this list. -<itemize> -<item>You need to close the workbench when generating the project files. The WB doesn't detect that the .project/.wrproject/org.eclipse.core.resources.prefs files got changed on disk (WIND00116553)</item> -<item>You need to import, close, and then change the build order file (WIND00116553)</item> -<item>When using includes/recursive_includes do not use . as path, but an environment variable which can be expanded to a full path (combined WB/MPC restriction)</item> -<item>We need to generate full paths in the .project file because WB doesn't support relative files like ../MyHeader.h (WIND00116641)</item> -<item>There is no dependency between the IDL file and the resulting *C.{h,cpp,inl} and *S.{h,cpp,inl} files. This is because the IDL compiler -can't be integrated a real build tool because a custom clean step can't be defined (WIND00117037)</item> -</itemize> +</p> +<ul> +<li><p class="Body">You need to close the workbench when generating the project files. The WB doesn't detect that the .project/.wrproject/org.eclipse.core.resources.prefs files got changed on disk (WIND00116553)</p></li> +<li><p class="Body">You need to import, close, and then change the build order file (WIND00116553)</p></li> +<li><p class="Body">When using includes/recursive_includes do not use . as path, but an environment variable which can be expanded to a full path (combined WB/MPC restriction)</p></li> +<li><p class="Body">We need to generate full paths in the .project file because WB doesn't support relative files like ../MyHeader.h (WIND00116641)</p></li> +<li><p class="Body">There is no dependency between the IDL file and the resulting *C.{h,cpp,inl} and *S.{h,cpp,inl} files. This is because the IDL compiler +can't be integrated as a real build tool because a custom clean step can't be defined (WIND00117037)</p></li> +</ul> </p> </div> diff --git a/docs/html/WB30.html b/docs/html/WB30.html index dcac2bc6..174e721d 100644 --- a/docs/html/WB30.html +++ b/docs/html/WB30.html @@ -16,7 +16,7 @@ <div> <h3 class="Head2">Background/Abstract</h3> - <li class="body">The <em>WB30 Project Type</em> generates project files + <li class="Body">The <em>WB30 Project Type</em> generates project files utilizable by Wind River Workbench, version 3.0. Workbench is built on the Eclipse platform and inherits many of its features. In this document, "eclipse" is used at times to describe features common to @@ -25,83 +25,94 @@ files. These workbench projects can then be imported into a user's workspace and built using the workbench "managed flexible build".</li> - <li class="body">MPC's WB30 Project Type currently supports Linux + <li class="Body">MPC's WB30 Project Type currently supports Linux and Windows as both host and target platforms. It can be extended to support other platforms as well.</li> </div> <div> <h3 class="Head2">Usage</h3> - For every <code>project <var>myprojname</var> { }</code> in mpc files, the + <p class="Body"> + For every <em class="Code">project <var>myprojname</var> { }</em> in mpc files, the WB30 project type generates a corresponding "workbench project" directory of the form - <samp>wb_<var>myprojname</var></samp>. The WB30 Project Type + <em class="Code">wb_<var>myprojname</var></em>. The WB30 Project Type uses Eclipse's <em>linked resource</em> feature to work around Eclipse's usual requirement that source files reside inside the Eclipse project directory. However, the linked resource feature also comes with restrictions; see <a href="#fullpath">the note</a> for details. + </p> + <h4 class="Head5">Generic workflow</h4> + <p class="Body">Presuming .mpc files already exist:</p> - <h4>Generic workflow</h4> - Presuming .mpc files already exist: <ol> - <li>Generate projects using <samp>-type wb30</samp>.</li> - <li>Import projects into a Workbench workspace. From within Workbench + <li><p class="BodyNoLead">Generate projects using <em class="Code">-type wb30</em>.</p></li> + <li><p class="BodyNoLead">Import projects into a Workbench workspace. From within Workbench (preferably an otherwise-empty workspace) select <strong>File->Import...</strong> and perform the following actions: <ol type="a"> - <li>Choose <strong>General->Existing Projects Into - Workspace</strong> and click <strong>Next</strong></li> - <li>In "Select Root Directory:" text field, enter the full path - to the MPC workspace.</li> - <li>Workbench will scan all the subdirectories looking for existing - projects.</li> - <li><strong>Be sure that the checkbox next to <em>Copy projects + <li><p class="Body">Choose <strong>General->Existing Projects Into + Workspace</strong> and click <strong>Next</strong></p></li> + <li><p class="Body">In "Select Root Directory:" text field, enter the full path + to the MPC workspace.</p></li> + <li><p class="Body">Workbench will scan all the subdirectories looking for existing + projects.</p></li> + <li><p class="Body"> + <strong>Be sure that the checkbox next to <em>Copy projects into workspace</em> is <em>UN</em>checked.</strong> Copying projects into the workspace unnecessarily duplicates files, plus we have found that Workbench can get confused with file - paths sometimes (though sometimes it will work).</li> - <li>Click <strong>Finish</strong> to proceed with the import.</li> + paths sometimes (though sometimes it will work).</p></li> + <li><p class="Body">Click <strong>Finish</strong> to proceed with the import.</p></li> </ol> + </p> </ol> - <h4>Building A Project</h4> + <h4 class="Head5">Building A Project</h4> + <p class="Body"> To build a project or set of projects, select the project (or projects) in the <em>Project</em> pane, then select <strong>Project->Build Project</strong>. - + </p> </div> <div> <h3 class="Head2">Platforms and Buildspecs</h3> + <p class="Body"> The default platform for WB30 is called "Native" and corresponds to creating a project in Workbench using File -> New -> Native Application Project. Although this method doesn't have (in workbench) any direct support for building shared libraries, MPC does generate projects that pass the correct compiler and linker flags to create shared (dynamic) libraries. Selecting static or shared libraries with WB30 works the same as with any other MPC - project type.<p/> + project type.</p> + <p class="Body"> The alternative platform, "VxWorks" can be selected by passing the option - <code>-value_template platform=VxWorks</code> on the mwc.pl command line. + <em class="Code">-value_template platform=VxWorks</em> on the mwc.pl command line. Currently the VxWorks support is inherited from the existing - <code>-type wb26</code> template, so it may need some more work before it is + <em class="Code">-type wb26</em> template, so it may need some more work before it is production-ready. Note that the wb26 template supported only DKM projects for - VxWorks (Downloadable Kernel Modules).<p/> + VxWorks (Downloadable Kernel Modules).</p> + <p class="Body"> Each platform includes a list of supported buildspecs, and a single default buildspec. For the "Native" platform, the list of supported buildspecs is: + </p> <ul> - <li>Linux_gnu_native_3.x_4.x</li> - <li>Windows_gnu_native_3.x_4.x</li> + <li><p class="Body">Linux_gnu_native_3.x_4.x</p></li> + <li><p class="Body">Windows_gnu_native_3.x_4.x</p></li> </ul> + <p class="Body"> Users can select the list of buildspecs by passing the option - <code>-value_template buildspecs=<specs></code> on the mwc.pl command + <em class="Code">-value_template buildspecs=<specs></em> on the mwc.pl command line, where <specs> is replaced by the buildspec value or values. Multiple values are separated by spaces (with the entire specs string enclosed in quotes). Similarly, the default buildspec can be selected with - <code>-value_template default_buildspec=<spec></code>.<p/> + <em class="Code">-value_template default_buildspec=<spec></em>.</p> + <p class="Body"> New buildspecs (or even platforms) can be added by either editing the file - <code>$MPC_ROOT/templates/wb30dll.mpt</code> (if the modification will be + <em class="Code">$MPC_ROOT/templates/wb30dll.mpt</em> (if the modification will be submitted back to the public MPC repository), or creating a file named - <code>user_wb30dll.mpt</code> anywhere on the MPC -include search path. + <em class="Code">user_wb30dll.mpt</em> anywhere on the MPC -include search path. Within either of these files, create a scope for the platform/buildspec and use assignment statements within that scope to set the various template variables. The existing buildspecs serve as the best examples.</p> @@ -113,26 +124,30 @@ <h3 class="Head2">Notes</h3> <ol> <li> + <p class="Body"> MPC doesn't directly generate Workbench workspaces, because they depend on an unknown binary file format that it can't generate. Instead of generating files that can be loaded as a Workbench workspace, MPC generates two files representing the workspace: + </p> <ol> - <li>wb30projects.lst</li> - <li>org.eclipse.core.resources.prefs</li> + <li><p class="Body">wb30projects.lst</p></li> + <li><p class="Body">org.eclipse.core.resources.prefs</p></li> </ol> + <p class="Body"> wb30projects.lst contains comment lines (starting with #) followed by one line per project, listing the full path to the .project file.<br/> org.eclipse.core.resources.prefs also begins with comment lines (starting with #) followed by the contents of one of the files from Eclipse's workspace format, specifically: - <code>.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs</code> + <em class="Code">.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs</em> Unfortunately, this file alone is not enough to actually constitute a workspace because Eclipse uses other binary files in this .settings directory. + </p> </li> - <li><a name="fullpath"></a>WB30 uses Eclipse's <em>linked resource</em> + <li><p class="Body"><a name="fullpath"></a>WB30 uses Eclipse's <em>linked resource</em> feature to work around the usual requirement that all source code reside in Workbench project directories. These act similar to symbolic links. While convenient so that a @@ -140,15 +155,15 @@ layout, it comes at a price: the target of the link must be specified as a full path. The consequence of this restriction is that, once the WB30 projects get generated, the source directory can - not move in the filesystem without re-generating the projects.</li> + not move in the filesystem without re-generating the projects.</p></li> - <li><a name="remove_projects"></a>MPC's WB30 Project Generator - creates directories named <samp>wb_*</samp> for projects. + <li><p class="Body"><a name="remove_projects"></a>MPC's WB30 Project Generator + creates directories named <em class="Code">wb_*</em> for projects. To remove all WB30 projects from a - directory hierarchy, on Linux you can use a command such as: -<pre> - $ find . -name 'wb_*' -type d | xargs rm -rf -</pre> + directory hierarchy, on Linux you can use a command such as:</p> +<blockquote> +<p class="Code">$ find . -name 'wb_*' -type d | xargs rm -rf</p> +</blockquote> </li> </ol> diff --git a/docs/html/images/OCILOGO_bw_book.eps b/docs/html/images/OCILOGO_bw_book.eps Binary files differdeleted file mode 100644 index 708fd10a..00000000 --- a/docs/html/images/OCILOGO_bw_book.eps +++ /dev/null diff --git a/docs/html/images/mpc.dot b/docs/html/images/mpc.dot new file mode 100644 index 00000000..46ee462e --- /dev/null +++ b/docs/html/images/mpc.dot @@ -0,0 +1,20 @@ +// dot mpc.dot -Tpng -o mpc.png +digraph project { + rankdir=LR; + splines="ortho"; + + mpcfile [shape="cylinder" height="1" label="MPC\nFile"]; + tfile [shape="cylinder" height="1" label="Template\nFile"]; + tifile [shape="cylinder" height="1" label="Template\nInput File"]; + + p [shape="point" width="0"]; + + mpc [shape="box" height="1" style="rounded" label="Make Project\nCreator"]; + out [shape="box" height="1" label="Project File\n(Makefile, vcxproj, etc.)"]; + + // Send all three into the point with no arrowhead + {mpcfile, tfile, tifile} -> p [dir="none"]; + + // Go from the point to the rest + p -> mpc -> out; +} diff --git a/docs/html/images/mpc.fig b/docs/html/images/mpc.fig deleted file mode 100644 index 34053cba..00000000 --- a/docs/html/images/mpc.fig +++ /dev/null @@ -1,74 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 150 150 6075 5400 -6 150 150 6075 5400 -6 150 150 6075 5400 -6 4200 2550 4875 2850 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 - 4200 2700 4650 2700 4650 2850 4875 2700 4650 2550 4650 2700 --6 -6 1350 2550 2325 2850 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 - 1350 2700 2100 2700 2100 2850 2325 2700 2100 2550 2100 2700 --6 -6 4875 1875 6075 3525 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4875 1875 6075 1875 6075 3525 4875 3525 4875 1875 -4 0 0 50 0 0 16 0.0000 4 225 930 4950 3225 dsp, etc.)\001 -4 0 0 50 0 0 16 0.0000 4 225 735 4950 3000 vcproj,\001 -4 0 0 50 0 0 16 0.0000 4 210 1035 4950 2775 (Makefile,\001 -4 0 0 50 0 0 16 0.0000 4 165 390 5250 2400 File\001 -4 0 0 50 0 0 16 0.0000 4 225 690 5100 2175 Project\001 --6 -6 2325 2025 4200 3300 -2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 - 4200 3300 4200 2025 2325 2025 2325 3300 4200 3300 -4 0 0 50 0 0 16 0.0000 4 225 1305 2625 2625 Make Project\001 -4 0 0 50 0 0 16 0.0000 4 165 750 2850 2850 Creator\001 --6 -6 150 3825 1350 5400 -5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 4050.000 150 5175 750 5325 1350 5175 -1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 3937 600 112 150 3825 1350 4050 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 150 3975 150 5175 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 1350 3975 1350 5175 -4 0 0 50 0 0 16 0.0000 4 225 930 300 4500 Template\001 -4 0 0 50 0 0 16 0.0000 4 225 960 300 4725 Input File\001 --6 -6 150 1950 1350 3525 -5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 2175.000 150 3300 750 3450 1350 3300 -1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 2062 600 112 150 1950 1350 2175 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 150 2100 150 3300 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 1350 2100 1350 3300 -4 0 0 50 0 0 16 0.0000 4 225 930 300 2625 Template\001 -4 0 0 50 0 0 16 0.0000 4 165 390 525 2850 File\001 --6 -6 150 150 1350 1725 -5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 375.000 150 1500 750 1650 1350 1500 -1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 262 600 112 150 150 1350 375 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 150 300 150 1500 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 1350 300 1350 1500 -4 0 0 50 0 0 16 0.0000 4 165 390 525 1125 File\001 -4 0 0 50 0 0 16 0.0000 4 165 525 450 900 MPC\001 --6 -6 1350 900 1650 4575 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 4 - 1350 900 1650 900 1650 4575 1350 4575 --6 --6 --6 --6 -4 0 0 50 0 0 12 0.0000 4 15 135 450 2925 \001 -4 0 0 50 0 0 12 0.0000 4 15 45 5025 2775 \001 diff --git a/docs/html/images/mpc.gif b/docs/html/images/mpc.gif Binary files differdeleted file mode 100644 index a2b78e70..00000000 --- a/docs/html/images/mpc.gif +++ /dev/null diff --git a/docs/html/images/mpc.png b/docs/html/images/mpc.png Binary files differnew file mode 100644 index 00000000..fdb061ef --- /dev/null +++ b/docs/html/images/mpc.png diff --git a/docs/html/images/mpc_mtiff.eps b/docs/html/images/mpc_mtiff.eps Binary files differdeleted file mode 100644 index 925cdb68..00000000 --- a/docs/html/images/mpc_mtiff.eps +++ /dev/null diff --git a/docs/html/images/mwc.dot b/docs/html/images/mwc.dot new file mode 100644 index 00000000..da7af55c --- /dev/null +++ b/docs/html/images/mwc.dot @@ -0,0 +1,10 @@ +// dot mwc.dot -Tpng -o mwc.png +digraph workspace { + rankdir=LR; + + mwcfile [shape="cylinder" height="1" label="MWC\nFile"]; + mwc [shape="box" height="1" style="rounded" label="Make Workspace\nCreator"]; + out [shape="box" height="1" label="Workspace File\n(Makefile, sln, etc.)"]; + + mwcfile -> mwc -> out; +} diff --git a/docs/html/images/mwc.fig b/docs/html/images/mwc.fig deleted file mode 100644 index af204e93..00000000 --- a/docs/html/images/mwc.fig +++ /dev/null @@ -1,46 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 225 225 6375 1875 -6 1425 900 2025 1200 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 - 1425 1050 1800 1050 1800 1200 2025 1050 1800 900 1800 1050 --6 -6 4275 900 4875 1200 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 - 4275 1050 4650 1050 4650 1200 4875 1050 4650 900 4650 1050 --6 -6 225 300 1425 1875 -6 225 300 1425 1875 -5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 825.000 525.000 225 1650 825 1800 1425 1650 -1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 825 412 600 112 225 300 1425 525 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 1425 450 1425 1650 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 - 225 450 225 1650 --6 -4 0 0 50 0 0 16 0.0000 4 165 390 600 1275 File\001 -4 0 0 50 0 0 16 0.0000 4 165 630 450 1050 MWC\001 --6 -6 2025 375 4275 1650 -2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 - 4275 1650 4275 375 2025 375 2025 1650 4275 1650 -4 0 0 50 0 0 16 0.0000 4 165 750 2775 1200 Creator\001 -4 0 0 50 0 0 16 0.0000 4 225 1710 2325 975 Make Workspace\001 --6 -6 4875 225 6375 1875 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4875 225 6375 225 6375 1875 4875 1875 4875 225 -4 0 0 50 0 0 16 0.0000 4 225 1095 5025 600 Workspace\001 -4 0 0 50 0 0 16 0.0000 4 165 390 5400 825 File\001 -4 0 0 50 0 0 16 0.0000 4 210 1035 5100 1125 (Makefile,\001 -4 0 0 50 0 0 16 0.0000 4 180 915 5100 1425 dsw, sln,\001 -4 0 0 50 0 0 16 0.0000 4 210 480 5100 1650 etc.)\001 --6 --6 diff --git a/docs/html/images/mwc.gif b/docs/html/images/mwc.gif Binary files differdeleted file mode 100644 index 79f3a6c4..00000000 --- a/docs/html/images/mwc.gif +++ /dev/null diff --git a/docs/html/images/mwc.png b/docs/html/images/mwc.png Binary files differnew file mode 100644 index 00000000..e0f1ed29 --- /dev/null +++ b/docs/html/images/mwc.png diff --git a/docs/html/images/mwc_mtiff.eps b/docs/html/images/mwc_mtiff.eps Binary files differdeleted file mode 100644 index 44002530..00000000 --- a/docs/html/images/mwc_mtiff.eps +++ /dev/null diff --git a/docs/html/rpmworkflow.dot b/docs/html/images/rpmworkflow.dot index 25fc7006..25fc7006 100644 --- a/docs/html/rpmworkflow.dot +++ b/docs/html/images/rpmworkflow.dot diff --git a/docs/html/rpmworkflow.png b/docs/html/images/rpmworkflow.png Binary files differindex 3a2de95a..3a2de95a 100644 --- a/docs/html/rpmworkflow.png +++ b/docs/html/images/rpmworkflow.png diff --git a/prj_install.pl b/prj_install.pl index 4d7d4002..b9755806 100755 --- a/prj_install.pl +++ b/prj_install.pl @@ -339,7 +339,7 @@ sub usageAndExit { my $base = basename($0); my $spc = ' ' x (length($base) + 8); print STDERR "$base v$version\n", - "Usage: $base [-a tag1[,tagN]] [-b tag=dir] [-d dir]", + "Usage: $base [-a tag1[,tagN]] [-b tag=dir] [-d dir] ", ($hasSymlink ? '[-l] ' : ''), "[-o tag=dir]\n", $spc, "[-s tag1[,tagN]] [-x tag1[,tagN]] [-v] [-k] [-i]\n", $spc, "[install directory] [$insext files or directories]\n\n", diff --git a/rpm/MPC.templ b/rpm/MPC.templ index cbb6b3d3..beb66cac 100644 --- a/rpm/MPC.templ +++ b/rpm/MPC.templ @@ -6,7 +6,7 @@ License: Open Software License Group: Software Development BuildRoot: /tmp/mpc Source: %{name}-%{version}.tar.bz2 -URL: http://www.ociweb.com/products/mpc +URL: https://objectcomputing.com/products/open-source-products/mpc Vendor: Object Computing, Inc. Packager: PACKAGER buildarch: noarch diff --git a/rpm/buildrpm.sh b/rpm/buildrpm.sh index 0afee9f1..182ab11b 100755 --- a/rpm/buildrpm.sh +++ b/rpm/buildrpm.sh @@ -104,7 +104,7 @@ sed "s/VERSION/$VERSION/; s/PACKAGER/$PACKAGER/; s!FINALDIR!$FDIR!" $loc/rpm/MPC ## Make a copy of the original MPC source to the new directory mkdir -p $MDIR/$FDIR cd $loc -tar --exclude=.svn -cf - . | (cd $WDIR/$MDIR/$FDIR; tar -xf -) +tar --exclude=.git\* -cf - . | (cd $WDIR/$MDIR/$FDIR; tar -xf -) ## Create the build source tar.bz2 cd $WDIR diff --git a/templates/nmake.mpd b/templates/nmake.mpd index 7615caad..1751ad2d 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -75,7 +75,7 @@ DEPEND : @echo No suitable dependency generator could be found. @echo One comes with MPC, just set the MPC_ROOT environment variable @echo to the full path of MPC. You can download MPC from - @echo http://www.ociweb.com/products/mpc/down.html + @echo https://github.com/DOCGroup/MPC !ELSE <%if(source_files || pch_source)%> $(DEPGEN)<%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines platform_defines macros)%> -D<%define%><%endfor%><%if(unicode)%> -DUNICODE -D_UNICODE<%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%> -D<%staticflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(uniq(source_files))%> "<%source_file%>"<%endfor%><%if(pch_source)%> "<%pch_source%>"<%endif%> |
