Skip to content

Commit

Permalink
Merge pull request #3945 from gforney/development
Browse files Browse the repository at this point in the history 
update build bundle web pages

Former-commit-id: 1598db491b9a05b653bdda0efa5a1e313f102c7d [formerly ca54fc47c16957a353afde9d6a1b994f9cef82ce]
Former-commit-id: 44963931f53be96f91ed5d36507c7dd58fa52efd
Former-commit-id: 68b123f
  • Loading branch information
@gforney
gforney authored Jun 13, 2016
2 parents b571c58 + 216d187 commit bf0ba30
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 27 deletions.
46 changes: 33 additions & 13 deletions FDS_Compilation/build_fds.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@
</script>
</HEAD>
<BODY BGCOLOR="#FFFFFF" >
<a href="../Utilities/build_bundle.html"><font size=5>Bundle</font></a> -
<font size=5>FDS</font> -
<a href="../SMV/build_smokeview.html"><font size=5>Smokeview</font></a> -
<a href="../SMV/build_guides.html"><font size=5>Guides</font></a> -
<a href="../Utilities/build_bundle.html"><font size=5>Bundle</font></a>
<a href="../SMV/build_guides.html"><font size=5>Guides</font></a>

<hr size="1">

<h3>Preliminaries</h3>

<ul>
<h3>Bundle Steps - FDS</h3>
<ol>
<li>Update <a href="../SMV/scripts/Update_repos_gitlatest.bat">repos</a>
<li>Edit <a href="Scripts/EDIT_setup.bat">config file</a>
</ul>
<li><a href="Scripts/EDIT_setup.bat">Update FDS version string</a> in configuration file
<li>Build FDS on all three platforms
<li>Build Teset MPI Utility
</ol>


<h3>FDS</h3>
<p><table border=on>
Expand All @@ -40,18 +42,12 @@ <h3>FDS</h3>

<tr align="center">
<td>
<button onclick="build_fds('windows debug')">debug</button><br>
<button onclick="build_fds('windows dev')">dev</button><br>
<button onclick="build_fds('windows release')">release</button>
</td>
<td>
<button onclick="build_fds('linux debug')">debug</button><br>
<button onclick="build_fds('linux dev')">dev</button><br>
<button onclick="build_fds('linux release')">release</button>
</td>
<td>
<button onclick="build_fds('osx debug')">debug</button><br>
<button onclick="build_fds('osx dev')">dev</button><br>
<button onclick="build_fds('osx release')">release</button>
</td>
</tr>
Expand All @@ -68,8 +64,32 @@ <h3>Test MPI Utility
</tr>
</table>

<p><hr>

<h3>Other</h3>
<p>Steps below not needed for bundle
<p><table border=on>

<tr><th>Windows</th><th>Linux</th><th>OSX</th></tr>


<tr align="center">
<td>
<button onclick="build_fds('windows debug')">debug</button><br>
<button onclick="build_fds('windows dev')">dev</button><br>
</td>
<td>
<button onclick="build_fds('linux debug')">debug</button><br>
<button onclick="build_fds('linux dev')">dev</button><br>
</td>
<td>
<button onclick="build_fds('osx debug')">debug</button><br>
<button onclick="build_fds('osx dev')">dev</button><br><button onclick="build_fds('osx release')">release</button>
</td>
</tr>

</table>

<ul>
<li><a href="Scripts/EDIT_build_fds.bat">Edit</a> this page
<li><a href="../FDS_Compilation/getting_started.html">FDS/Smokeview build page checklist</a>
Expand Down
29 changes: 15 additions & 14 deletions Utilities/build_bundle.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,25 @@
</script>
</HEAD>
<BODY BGCOLOR="#FFFFFF" >
<font size=5>Bundle</font> -
<a href="../FDS_Compilation/build_fds.html"><font size=5>FDS</font></a> -
<a href="../SMV/build_smokeview.html"><font size=5>Smokeview</font></a> -
<a href="../SMV/build_guides.html"><font size=5>Guides</font></a> -
<font size=5>Bundle</font>
<a href="../SMV/build_guides.html"><font size=5>Guides</font></a>
<hr>

<h3>Checklist</h3>
<ul>
<li>Edit <a href="../SMV/scripts/EDIT_setup.bat">config file</a>
<li><a href="../SMV/scripts/Update_repos_gitlatest.bat">Update FDS-SMV</a> on all three platforms
<li>Build
<a href="../FDS_Compilation/build_fds.html">FDS</a>,
<a href="../SMV/build_smokeview.html">Smokeview and utilities</a>
<li>Update and commit release notes for FDS and Smokeview
<li><a href="Scripts/CONV_fds_release.bat">Convert</a> FDS wiki to html, then commit
<li><a href="../SMV/build_guides.html">Copy FDS guides</a> from Linux firebot to ~/FDS_Guides on all three platforms
<li><a href="../SMV/build_guides.html">Copy Smokeview guides</a> from Linux firebot to ~/FDS_Guides on all three platforms
</ul>
<h3>Bundle Steps</h3>

<ol>
<li><a href="../SMV/scripts/Update_repos_gitlatest.bat">Update all repositories</a>
<li>Edit <a href="../SMV/scripts/EDIT_setup.bat">configuration file</a> labeling the bundle name (version string for both FDS and Smokeview)
<li>Run firebot and smokebot (using firebot and smokebot accounts on blaze)
<li>Build <a href="../FDS_Compilation/build_fds.html">FDS</a>
<li>Build <a href="../SMV/build_smokeview.html">Smokeview and utilities</a>
<li><a href="../SMV/build_guides.html">Copy FDS and Smokview manuals</a> to FDS_Guides directories on all three platforms
<li>Update FDS release notes, <a href="Scripts/CONV_fds_release.bat">Convert</a> FDS wiki to html, then commit
<li>Update and commit Smokeview release
<li><a href="../SMV/build_guides.html">Copy FDS Smokeview guides</a> from bot directories to to ~/FDS_Guides on all three platforms
</ol>

<h3>Bundles</h3>
<table border=on>
Expand Down

0 comments on commit bf0ba30

Please sign in to comment.