Version 1.1.1

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@71 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/ChangeLog b/ChangeLog
index 9b5e1dbe23340b67b144c0cd416137e89680a3c9..e7d7cb7692371c5488a06addb879c9e42e1b197d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-03  Sampo Niskanen
+
+       * Released version 1.1.1
+
 2010-09-01  Sampo Niskanen
 
        * [BUG] Fixed rocket config dialog being too large

diff --git a/ReleaseNotes b/ReleaseNotes
index a72db2e66101d4cbf0183dc9e8d117b17b753ff0..67a353ae2761f07b36d09f5d1f9fd39b96cd7330 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,12 @@
+OpenRocket 1.1.1  (2010-09-03):
+-------------------------------
+
+Major rewrite of the simulation code, enhanced support for thrust
+curve loading and selection, faster startup time and bug fixes.
+
+Old simulation listeners are incompatible with this release.
+
+
 OpenRocket 1.1.0  (2010-03-21):
 -------------------------------
 

diff --git a/build.properties b/build.properties
index d6f02cc79fa350d2d70d0f7a71f8ff11f1f81af7..d578847612a2201f5610b217fcf5d55aa36a039f 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 
 # The OpenRocket build version
 
-build.version=1.1.1pre
+build.version=1.1.1
 
 
 # The source of the package.  When building a package for a specific

diff --git a/releasing.txt b/releasing.txt
index a0b2744a7e2908d5991d34d150c83a638e6cfd8a..68934ed2d97c2f6c06300b4f4310d3cabed35194 100644 (file)
--- a/releasing.txt
+++ b/releasing.txt
@@ -20,13 +20,14 @@ Steps for making a release:
      - select ReleaseNotes properties, set as release notes
      - select JAR properties, set release note file and default downloads
      - select ZIP properties, set release note file
-11. Update HTML: index.html (release notes) download.html (version number)
-12. Update HTML to web server:
+11. Update HTML: htp/htp.def (version number) htp/news.htp (release info)
+12. Run "htp @" and check the web pages locally
+13. Update HTML to web server:
     scp * plaa,openrocket@web.sourceforge.net:htdocs/
-13. Test downloading from Sourceforge and web site
-14. Update update.php to web server:
+14. Test downloading from Sourceforge and web site
+15. Update update.php to web server:
     scp updates.php plaa,openrocket@web.sourceforge.net:htdocs/actions/
-15. Test update checking without specific options
-16. Update build.properties to "pre" version + commit
-17. Send email about new release to openrocket-announce@lists.sourceforge.net
+16. Test update checking without specific options
+17. Update build.properties to "pre" version + commit
+18. Send email about new release to openrocket-announce@lists.sourceforge.net
 

diff --git a/web/html/actions/updates.php b/web/html/actions/updates.php
index 5a8d9994a0efc73820b3ebc606e258748b55f360..d1936eccc5b4b517e7e5a4d7a25a5cdd000056b7 100644 (file)
--- a/web/html/actions/updates.php
+++ b/web/html/actions/updates.php
@@ -79,7 +79,7 @@ $updates = "";
 if (preg_match("/^1\.1\.0/", $version)) {
   $updates = "Version: 1.1.1\n" .
     "6: Enhanced motor selection\n" .
-    "5: Rewritten simulation code" .
+    "5: Rewritten simulation code\n" .
     "4: Bug fixes";
 } else if (preg_match("/^0\.9\.6/", $version)) {
   $updates = "Version: 1.0.0\n" .

diff --git a/web/html/documentation.html b/web/html/documentation.html
index a686d0a6bd0a85362a1509d421dc39e201006960..2ddaba5239c8b2c2a35b09cb26af0e19be3d03d4 100644 (file)
--- a/web/html/documentation.html
+++ b/web/html/documentation.html
@@ -63,12 +63,12 @@
       <p>
        <span class="licenseimage"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="CC BY-SA" src="cc-by-sa-80x15.png" /></a></span>
        <a href="techdoc.pdf">OpenRocket technical documentation</a> (2010-04-06)
-       &nbsp;&nbsp; <span class="note">(PDF 1.3MB)</span>
+       &nbsp;&nbsp; <span class="note">(PDF&nbsp;1.3MB)</span>
       </p>
       <p>
        <span class="licenseimage"><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/"><img alt="CC BY-NC-ND" src="cc-by-nc-nd-80x15.png" /></a></span>
        <a href="thesis.pdf">Development of an Open Source model rocket simulation software</a> (Master's thesis)
-       &nbsp;&nbsp; <span class="note">(PDF 1.3MB)</span>
+       &nbsp;&nbsp; <span class="note">(PDF&nbsp;1.3MB)</span>
       </p>
     </div>
     <p>The technical documentation is licensed under a

diff --git a/web/html/download.html b/web/html/download.html
index 3eab2312124fa80d9d8b0449b5b340a0e1d81751..cc5e575dc4c7acce1b0b6fb5c0dc0a06d08bf8b7 100644 (file)
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -45,6 +45,15 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
+  <p><span class="date">3.9.2010:</span> Version 1.1.1 is
+    <a href="download.html">released</a>!</p>
+  <p>For this release a major part of the simulator code has been
+    rewritten for better flexibility in future development.  It also
+    includes a vastly improved thrust curve selection dialog, the
+    possibility to loading user-defined thrust curves and better
+    startup times than previous releases.</p>
+  <p>Simulation listeners written for older versions of OpenRocket
+    are not compatible with this release.</p>
   <p><span class="date">21.3.2010:</span> Version 1.1.0 is
     <a href="download.html">released</a>!</p>
   <p>This release includes the first support for loading RockSim
@@ -58,11 +67,6 @@
     bug fixes.  It is also a stable milestone, after which development
     on larger features will be started in a 1.1 branch.  Look out
     for it!  :-)</p>
-  <p><span class="date">17.2.2010:</span> Version 0.9.6 is
-    <a href="download.html">released</a>!</p>
-  <p>This release updates the aerodynamic calculation methods to be
-    more in line with the Barrowman method and enhances the simulation
-    time step selection, in addition to fixing numerous bugs.</p>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
@@ -81,13 +85,13 @@
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.1/OpenRocket-1.1.1.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.0.jar</span>
+      <span>OpenRocket-1.1.1.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/ReleaseNotes/view">Release notes</a> |
-            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0-src.zip/download">Source code</a>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.1/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.1/OpenRocket-1.1.1-src.zip/download">Source code</a>
     </span>
   </div>
       <h3>Stable release</h3>
@@ -104,7 +108,7 @@
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
       <p>From the command line OpenRocket can be started by
-      <span class="command">java -jar OpenRocket-1.1.0.jar</span></p>
+      <span class="command">java -jar OpenRocket-1.1.1.jar</span></p>
        
     </div>
     <div class="clear"></div>

diff --git a/web/html/index.html b/web/html/index.html
index d160df33804bbe02abd2909f62adce185084640f..d6346e517d7e12f02a9f9e294f7830329ce8ac80 100644 (file)
--- a/web/html/index.html
+++ b/web/html/index.html
@@ -46,12 +46,12 @@
     <h2>Introduction</h2>
     <div class="rightpane">
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.1/OpenRocket-1.1.1.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.0.jar</span>
+      <span>OpenRocket-1.1.1.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/ReleaseNotes/view">Release notes</a> |
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.1/ReleaseNotes/view">Release notes</a> |
             <a href="download.html">Other versions</a>
     </span>
   </div>
@@ -88,6 +88,15 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
+  <p><span class="date">3.9.2010:</span> Version 1.1.1 is
+    <a href="download.html">released</a>!</p>
+  <p>For this release a major part of the simulator code has been
+    rewritten for better flexibility in future development.  It also
+    includes a vastly improved thrust curve selection dialog, the
+    possibility to loading user-defined thrust curves and better
+    startup times than previous releases.</p>
+  <p>Simulation listeners written for older versions of OpenRocket
+    are not compatible with this release.</p>
   <p><span class="date">21.3.2010:</span> Version 1.1.0 is
     <a href="download.html">released</a>!</p>
   <p>This release includes the first support for loading RockSim

diff --git a/web/html/update-html.sh b/web/html/update-html.sh
deleted file mode 100755 (executable)
index 913a8b3..0000000
--- a/web/html/update-html.sh
+++ /dev/null
@@ -1 +0,0 @@
-scp *.html  plaa,openrocket@web.sourceforge.net:htdocs/

diff --git a/web/htp/htp.def b/web/htp/htp.def
index a5811fa80d6e69b72fbd0f574974085ac4b8468a..c432d350826987be908cb973351d85b8451a5ad3 100644 (file)
--- a/web/htp/htp.def
+++ b/web/htp/htp.def
@@ -1,5 +1,5 @@
 <set stableversion="1.0.0">
-<set developmentversion="1.1.0">
+<set developmentversion="1.1.1">
 <set version="${developmentversion}">
 
 <def name="downloadbox">

diff --git a/web/htp/news.htp b/web/htp/news.htp
index 0ba2e67604395a43dd84030906e8e97eb6d98acb..5257bbcf6a50a4021ccd568308862aaf860aaf58 100644 (file)
--- a/web/htp/news.htp
+++ b/web/htp/news.htp
@@ -9,6 +9,18 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
+  <p><span class="date">3.9.2010:</span> Version 1.1.1 is 
+    <a href="download.html">released</a>!</p>
+
+  <p>For this release a major part of the simulator code has been
+    rewritten for better flexibility in future development.  It also
+    includes a vastly improved thrust curve selection dialog, the
+    possibility to loading user-defined thrust curves and better
+    startup times than previous releases.</p>
+
+  <p>Simulation listeners written for older versions of OpenRocket
+    are not compatible with this release.</p>
+
   <p><span class="date">21.3.2010:</span> Version 1.1.0 is 
     <a href="download.html">released</a>!</p>
 
@@ -26,6 +38,10 @@
     on larger features will be started in a 1.1 branch.  Look out
     for it!  :-)</p>
 
+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+
   <p><span class="date">17.2.2010:</span> Version 0.9.6 is
     <a href="download.html">released</a>!</p>
 
@@ -33,10 +49,6 @@
     more in line with the Barrowman method and enhances the simulation
     time step selection, in addition to fixing numerous bugs.</p>
 
-
-  <if not onlyrecent><!--- Older items not shown on download page:  --->
-
-
   <p><span class="date">28.11.2009:</span> Version 0.9.5 is
     <a href="download.html">released</a>!</p>
 

diff --git a/web/update-html.sh b/web/update-html.sh
new file mode 100755 (executable)
index 0000000..ea98bd7
--- /dev/null
+++ b/web/update-html.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+htp @ || exit 1
+scp html/*.html  plaa,openrocket@web.sourceforge.net:htdocs/