From 1fb64b161835358b8e64a56622c6225d3285f7f7 Mon Sep 17 00:00:00 2001 From: plaa Date: Tue, 7 Sep 2010 13:47:37 +0000 Subject: [PATCH] bug fixes for release 1.1.2 git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@80 180e2498-e6e9-4542-8430-84ac67f01cd8 --- ChangeLog | 4 ++++ ReleaseNotes | 6 ++++++ build.properties | 2 +- releasing.txt | 16 ++++++++-------- web/html/actions/updates.php | 14 ++++++++++---- web/html/download.html | 21 +++++++++------------ web/html/index.html | 10 +++++++--- web/htp/htp.def | 2 +- web/htp/news.htp | 14 ++++++++++---- 9 files changed, 56 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc0cab4f..a8ea7fac 100644 --- 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 67a353ae..0f627333 100644 --- 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 aeee4e68..3584c147 100644 --- 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 68934ed2..e48b765e 100644 --- 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 d1936ecc..3ff71ef0 100644 --- 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 cc5e575d..884d32e1 100644 --- a/web/html/download.html +++ b/web/html/download.html @@ -45,6 +45,10 @@

Recent news:

+

7.9.2010: A bug-fix version 1.1.2 is + released!

+

This release fixes a severe bug in 1.1.1 that prevented adding stages + to rocket designs. Users are recommended to upgrade.

3.9.2010: Version 1.1.1 is released!

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.

-

10.3.2010: Version 1.0.0 is - released!

-

This release includes several hundred new thrustcurves from - thrustcurve.org 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! :-)

Ready packages

@@ -85,13 +82,13 @@ Support This Project
- + Download now! - OpenRocket-1.1.1.jar + OpenRocket-1.1.2.jar - Release notes | - Source code + Release notes | + Source code

Stable release

@@ -108,7 +105,7 @@ Windows) by double-clicking the package icon. No installation is required.

From the command line OpenRocket can be started by - java -jar OpenRocket-1.1.1.jar

+ java -jar OpenRocket-1.1.2.jar

diff --git a/web/html/index.html b/web/html/index.html index d6346e51..9320b006 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -46,12 +46,12 @@

Introduction

- + Download now! - OpenRocket-1.1.1.jar + OpenRocket-1.1.2.jar - Release notes | + Release notes | Other versions
@@ -88,6 +88,10 @@

News

+

7.9.2010: A bug-fix version 1.1.2 is + released!

+

This release fixes a severe bug in 1.1.1 that prevented adding stages + to rocket designs. Users are recommended to upgrade.

3.9.2010: Version 1.1.1 is released!

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 c432d350..17e16680 100644 --- a/web/htp/htp.def +++ b/web/htp/htp.def @@ -1,5 +1,5 @@ - + diff --git a/web/htp/news.htp b/web/htp/news.htp index 5257bbcf..da5a7076 100644 --- a/web/htp/news.htp +++ b/web/htp/news.htp @@ -9,6 +9,12 @@ +

7.9.2010: A bug-fix version 1.1.2 is + released!

+ +

This release fixes a severe bug in 1.1.1 that prevented adding stages + to rocket designs. Users are recommended to upgrade.

+

3.9.2010: Version 1.1.1 is released!

@@ -29,6 +35,10 @@ Pedrick. It's also the kick-off of the 1.1 development branch of OpenRocket.

+ + + +

10.3.2010: Version 1.0.0 is released!

@@ -38,10 +48,6 @@ on larger features will be started in a 1.1 branch. Look out for it! :-)

- - - -

17.2.2010: Version 0.9.6 is released!

-- 2.39.5