bug fixes for release 1.1.2

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

diff --git a/ChangeLog b/ChangeLog
index fc0cab4f6f4d70b4c3032da2eb00ad74921c4b08..a8ea7facf0209955599df64a4017adc2c87416d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-07  Sampo Niskanen
+
+       * Released version 1.1.2
+
 2010-09-05  Sampo Niskanen
 
        * [BUG] Fixed bug that prevents adding stages to a rocket

diff --git a/ReleaseNotes b/ReleaseNotes
index 67a353ae2761f07b36d09f5d1f9fd39b96cd7330..0f627333c4d01974ee1afb8ef5674f07c35e051f 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,9 @@
+OpenRocket 1.1.2  (2010-09-07):
+-------------------------------
+
+Fixes a severe bug that prevented adding stages to rockets.
+
+
 OpenRocket 1.1.1  (2010-09-03):
 -------------------------------
 

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

diff --git a/releasing.txt b/releasing.txt
index 68934ed2d97c2f6c06300b4f4310d3cabed35194..e48b765e43ffc987a0b6dd7d444b001c6447e0fa 100644 (file)
--- a/releasing.txt
+++ b/releasing.txt
@@ -6,22 +6,22 @@ Steps for making a release:
 3.  Update ChangeLog
 4.  ant dist
 5.  Test new features (not in project directory)
-6.  Copy distribution files into dists/
-7.  Update Eclipse project and commit files to SVN
-8.  Tag the version in SVN, URL:
-    https://openrocket.svn.sourceforge.net/svnroot/openrocket/tags/Release_1.1.x
-9.  Update updates.php and test various versions using a different name:
+6.  Copy distribution files into OpenRocket-dists project
+7.  Update updates.php and test various versions using a different name:
     scp updates.php plaa,openrocket@web.sourceforge.net:htdocs/actions/testupdates.php
     java -Dopenrocket.debug.updateurl=http://openrocket.sourceforge.net/actions/testupdates.php -jar OpenRocket-1.1.0.jar
-10. Upload JAR and source distribution and ReleaseNotes to Sourceforge 
+8.  Update HTML: htp/htp.def (version number) htp/news.htp (release info)
+9.  Run "htp @" and check the web pages locally
+10. Update Eclipse project and commit files to SVN (OpenRocket and OpenRocket-dists)
+11. Tag the version in SVN, URL:
+    https://openrocket.svn.sourceforge.net/svnroot/openrocket/tags/Release_1.1.x
+12. Upload JAR and source distribution and ReleaseNotes to Sourceforge 
      - Project Admin -> File Manager
      - create new version directory under /openrocket
      - upload JAR, ZIP and ReleaseNotes
      - 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: 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/
 14. Test downloading from Sourceforge and web site

diff --git a/web/html/actions/updates.php b/web/html/actions/updates.php
index d1936eccc5b4b517e7e5a4d7a25a5cdd000056b7..3ff71ef0a8c96863eab3fa9404240e30a2454ddd 100644 (file)
--- a/web/html/actions/updates.php
+++ b/web/html/actions/updates.php
@@ -76,17 +76,23 @@ header("Content-type: text/plain");
 $version = $_GET["version"];
 $updates = "";
 
-if (preg_match("/^1\.1\.0/", $version)) {
-  $updates = "Version: 1.1.1\n" .
+$unstable = "1.1.2";
+$stable = "1.0.0";
+
+if (preg_match("/^1\.1\.1/", $version)) {
+  $updates = "Version: " . $unstable . "\n" .
+    "4: Fixed bug preventing addition of stages\n";
+} else if (preg_match("/^1\.1\.0/", $version)) {
+  $updates = "Version: " . $unstable . "\n" .
     "6: Enhanced motor selection\n" .
     "5: Rewritten simulation code\n" .
     "4: Bug fixes";
 } else if (preg_match("/^0\.9\.6/", $version)) {
-  $updates = "Version: 1.0.0\n" .
+  $updates = "Version: " . $stable . "\n" .
     "6: Hundreds of new thrustcurves\n" .
     "5: Bug fixes";
 } else if (preg_match("/^0\.9\.[45]/", $version)) {
-  $updates = "Version: 1.0.0\n" .
+  $updates = "Version: " . $stable . "\n" .
     "7: Hundreds of new thrustcurves\n" .
     "6: Aerodynamic computation updates\n" .
     "5: Numerous bug fixes";

diff --git a/web/html/download.html b/web/html/download.html
index cc5e575dc4c7acce1b0b6fb5c0dc0a06d08bf8b7..884d32e1a5f29adfd3a1db60d487fffc50d0d9d2 100644 (file)
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -45,6 +45,10 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
+  <p><span class="date">7.9.2010:</span> A bug-fix version 1.1.2 is
+    <a href="download.html">released</a>!</p>
+  <p>This release fixes a severe bug in 1.1.1 that prevented adding stages
+    to rocket designs.  Users are recommended to upgrade.</p>
   <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
@@ -60,13 +64,6 @@
     rocket design files (.RKT), thanks to contributions by Doug
     Pedrick.  It's also the kick-off of the 1.1 development branch of
     OpenRocket.</p>
-  <p><span class="date">10.3.2010:</span> Version 1.0.0 is
-    <a href="download.html">released</a>!</p>
-  <p>This release includes several hundred new thrustcurves from
-    <a href="http://www.thrustcurve.org/">thrustcurve.org</a> and some
-    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>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
@@ -85,13 +82,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.1/OpenRocket-1.1.1.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.2/OpenRocket-1.1.2.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.1.jar</span>
+      <span>OpenRocket-1.1.2.jar</span>
     </a>
     <span class="alternative">
-      <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>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.2/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.2/OpenRocket-1.1.2-src.zip/download">Source code</a>
     </span>
   </div>
       <h3>Stable release</h3>
@@ -108,7 +105,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.1.jar</span></p>
+      <span class="command">java -jar OpenRocket-1.1.2.jar</span></p>
        
     </div>
     <div class="clear"></div>

diff --git a/web/html/index.html b/web/html/index.html
index d6346e517d7e12f02a9f9e294f7830329ce8ac80..9320b0060aad36ae09131f737c87b6d80d90e161 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.1/OpenRocket-1.1.1.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.2/OpenRocket-1.1.2.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.1.jar</span>
+      <span>OpenRocket-1.1.2.jar</span>
     </a>
     <span class="alternative">
-      <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.2/ReleaseNotes/view">Release notes</a> |
             <a href="download.html">Other versions</a>
     </span>
   </div>
@@ -88,6 +88,10 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
+  <p><span class="date">7.9.2010:</span> A bug-fix version 1.1.2 is
+    <a href="download.html">released</a>!</p>
+  <p>This release fixes a severe bug in 1.1.1 that prevented adding stages
+    to rocket designs.  Users are recommended to upgrade.</p>
   <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

diff --git a/web/htp/htp.def b/web/htp/htp.def
index c432d350826987be908cb973351d85b8451a5ad3..17e166807ea1d57292b8afc9cbf3796f1e7851bd 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.1">
+<set developmentversion="1.1.2">
 <set version="${developmentversion}">
 
 <def name="downloadbox">

diff --git a/web/htp/news.htp b/web/htp/news.htp
index 5257bbcf6a50a4021ccd568308862aaf860aaf58..da5a7076c4c08c184b1a7b371f7e12ee075e931f 100644 (file)
--- a/web/htp/news.htp
+++ b/web/htp/news.htp
@@ -9,6 +9,12 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
+  <p><span class="date">7.9.2010:</span> A bug-fix version 1.1.2 is 
+    <a href="download.html">released</a>!</p>
+
+  <p>This release fixes a severe bug in 1.1.1 that prevented adding stages
+    to rocket designs.  Users are recommended to upgrade.</p>
+
   <p><span class="date">3.9.2010:</span> Version 1.1.1 is 
     <a href="download.html">released</a>!</p>
 
@@ -29,6 +35,10 @@
     Pedrick.  It's also the kick-off of the 1.1 development branch of
     OpenRocket.</p>
 
+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+
   <p><span class="date">10.3.2010:</span> Version 1.0.0 is 
     <a href="download.html">released</a>!</p>
 
@@ -38,10 +48,6 @@
     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>