defaria.com/blogs/Status/archives/000144.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard">
   4 <head>
   5    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   6    <meta name="generator" content="Movable Type 5.2.3" />
   7
   8    <link rel="stylesheet" href="http://defaria.com/blogs/Status/styles-site.css" type="text/css" />
   9    <link rel="alternate" type="application/atom+xml" title="Atom" href="http://defaria.com/blogs/Status/atom.xml" />
  10    <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://defaria.com/blogs/Status/index.xml" />
  11
  12    <title>Status for Andrew DeFaria: Builds, Releases and Merging</title>
  13
  14    <link rel="start" href="http://defaria.com/blogs/Status/" title="Home" />
  15    <link rel="prev" href="http://defaria.com/blogs/Status/archives/000141.html" title="build_view bug" />
  16    <link rel="next" href="http://defaria.com/blogs/Status/archives/000145.html" title="Hok's merge" />
  17
  18
  19
  20
  21
  22    <script type="text/javascript" src="http://defaria.com/blogs/Status/mt-site.js"></script>
  23 </head>
  24 <body class="layout-one-column" onload="individualArchivesOnLoad(commenter_name)">
  25    <div id="container">
  26       <div id="container-inner" class="pkg">
  27
  28          <div id="banner">
  29             <div id="banner-inner" class="pkg">
  30                <h1 id="banner-header"><a href="http://defaria.com/blogs/Status/" accesskey="1">Status for Andrew DeFaria</a></h1>
  31                <h2 id="banner-description">Searchable status reports and work log</h2>
  32             </div>
  33          </div>
  34
  35          <div id="pagebody">
  36             <div id="pagebody-inner" class="pkg">
  37                <div id="alpha">
  38                   <div id="alpha-inner" class="pkg">
  39
  40                      <p class="content-nav">
  41                         <a href="http://defaria.com/blogs/Status/archives/000141.html">&laquo; build_view bug</a> |
  42                         <a href="http://defaria.com/blogs/Status/">Main</a>
  43                         | <a href="http://defaria.com/blogs/Status/archives/000145.html">Hok's merge &raquo;</a>
  44                      </p>
  45
  46                      <a id="a000144"></a>
  47                      <div class="entry" id="entry-144">
  48                         <h3 class="entry-header">Builds, Releases and Merging</h3>
  49                         <div class="entry-content">
  50                            <div class="entry-body">
  51                               <p>Lots of merging and building with 2 releases today. Still working through problems with us_2340 <-> china_2340 merging. Had to merge flmFiles.h from 2.3 -> us_2340 to pick up some definintions. Also had to build mksf.exe because some changes were coming from China and some from here at the same time. Merging the .exe is not possible in such situations so after insuring that all sources were merged I rebuilt the .exe</p>
  52
  53 <ul>
  54
  55 <li>Built and released 2.2.2.1</li>
  56
  57 <li>Completed merge of 2.2 -> 2.3</li>
  58
  59 <li>Built and released 2.3.0.5</li>
  60
  61 <li>Completed merge of 2.3 -> 2.4</li>
  62
  63 <li>Finished <a href="http://sonsweb.salira.com/WebSAM.html">WebSAM Testing</a> and entered <a href="http://sonsweb.salira.com/WebSAM_Testing.html">bugs</a> into Clearquest</li>
  64
  65 </ul>
  66                            </div>
  67                            <div id="more" class="entry-more">
  68
  69                            </div>
  70                         </div>
  71                         <p class="entry-footer">
  72                            <span class="post-footers">Posted by  on February 24, 2004  3:54 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000144.html">Permalink</a>
  73                         </p>
  74                      </div>
  75
  76
  77
  78
  79                   </div>
  80                </div>
  81             </div>
  82          </div>
  83       </div>
  84    </div>
  85 </body>
  86 </html>