Skip to content
Browse files

Merge branch 'parrot_3_3'

  • Loading branch information...
2 parents 31ca512 + c1bc61d commit a9a87f1c7d0e5c79f50be121544a56a1e6c23e31 @Whiteknight Whiteknight committed
Showing with 39 additions and 21 deletions.
  1. +1 −1 CREDITS
  2. +4 −0 ChangeLog
  3. +2 −2 MANIFEST.generated
  4. +1 −1 README
  5. +1 −1 VERSION
  6. +1 −0 docs/parrothist.pod
  7. +18 −5 docs/project/release_manager_guide.pod
  8. +1 −1 include/parrot/oplib/core_ops.h
  9. +3 −3 src/ops/core_ops.c
  10. +7 −7 tools/release/release.json
View
2 CREDITS
@@ -100,7 +100,7 @@ E: yDNA@cpan.org
N: Andrew Whitworth
D: Internals development
D: Documentation
-D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0 and 2.11.0
+D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0 and 3.3.0
E: wknight8111@gmail.com
U: Whiteknight
View
4 ChangeLog
@@ -1,5 +1,9 @@
#1
+2011.04.19 Whiteknight
+ * Released 3.3.0
+ See NEWS for more.
+
2011.03.15 Gerd
* Released 3.2.0
See NEWS for more.
View
4 MANIFEST.generated
@@ -1,11 +1,11 @@
# See tools/dev/install_files.pl for documentation on the
# format of this file.
# Please re-sort this file after *EVERY* modification
-blib/lib/libparrot.3.2.0.dylib [main]lib
+blib/lib/libparrot.3.3.0.dylib [main]lib
blib/lib/libparrot.a [main]lib
blib/lib/libparrot.dylib [main]lib
blib/lib/libparrot.so [main]lib
-blib/lib/libparrot.so.3.2.0 [main]lib
+blib/lib/libparrot.so.3.3.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
docs/ops/bit.pod [doc]
View
2 README
@@ -1,4 +1,4 @@
-This is Parrot, version 3.2.0
+This is Parrot, version 3.3.0
------------------------------
Parrot is Copyright (C) 2001-2011, Parrot Foundation.
View
2 VERSION
@@ -1 +1 @@
-3.2.0
+3.3.0
View
1 docs/parrothist.pod
@@ -124,5 +124,6 @@ Starred release numbers indicate supported releases.
cotto 3.0.0 * 2011-Jan-18 "Beef Stew"
mikehh 3.1.0 2011-Feb-15 "Budgerigar"
Gerd 3.2.0 2011-Mar-15 "Nanday Parakeet"
+ Whiteknight 3.3.0 2011-Apr-19 "Fire in the Sky"
=cut
View
23 docs/project/release_manager_guide.pod
@@ -49,6 +49,10 @@ You might also select a name (and optionally a quote) for your release.
For example, you could select a name from
L<http://en.wikipedia.org/wiki/List_of_parrots>.
+NOTE: Build a recent version of Parrot to have available during the release
+to help with bootstrapping. You must have a version of Parrot built and
+available to you for some of the subsequent steps.
+
=item 1.
The day of the release has come.
@@ -126,10 +130,20 @@ Give yourself credit for the release in F<CREDITS>.
=item f
-To have parrot configured and have run C<make> with the old version number is
-condition for this step. Run C<./ops2c --core> (or C<make bootstrap-ops>,
-ignoring errors) followed by C<make reconfig> and C<make> to update the names
-of version-specific internal functions.
+This is a bootstrapping step, which requires you to have an existing parrot
+executable available, preferrably from the previous release or pre-release
+development version from the master branch.
+
+You *must* do this with a previous version of Parrot built before you updated
+the VERSION file. You *must* update VERSION before doing this step.
+
+Run C<./ops2c --core> (or C<make bootstrap-ops>, ignoring errors) followed
+by C<make reconfig> and C<make> to update the names of version-specific
+internal functions.
+
+This step uses the older Parrot to create new ops core files and routines
+using the new version number. The released version of Parrot requires these
+files and the new VERSION.
=item g
@@ -448,7 +462,6 @@ L<http://www.google.com/calendar/render?cid=ldhctdamsgfg5a1cord52po9h8@group.cal
Versions with a asterisk (*) are supported releases.
- - Apr 19, 2011 - 3.3* - whiteknight
- May 17, 2011 - 3.4 - gerd
- Jun 21, 2011 - 3.5 - cotto
- Jul 19, 2011 - 3.6* - kid51
View
2 include/parrot/oplib/core_ops.h
@@ -19,7 +19,7 @@
#include "parrot/runcore_api.h"
PARROT_EXPORT
-op_lib_t *Parrot_DynOp_core_3_2_0(PARROT_INTERP, long init);
+op_lib_t *Parrot_DynOp_core_3_3_0(PARROT_INTERP, long init);
opcode_t * Parrot_end(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_noop(opcode_t *, PARROT_INTERP);
View
6 src/ops/core_ops.c
@@ -23197,7 +23197,7 @@ op_lib_t core_op_lib = {
PARROT_FUNCTION_CORE, /* core_type = PARROT_XX_CORE */
0, /* flags */
3, /* major_version */
- 2, /* minor_version */
+ 3, /* minor_version */
0, /* patch_version */
1071, /* op_count */
core_op_info_table, /* op_info_table */
@@ -23324,7 +23324,7 @@ static void hop_deinit(PARROT_INTERP)
hop_buckets = NULL;
}PARROT_EXPORT
op_lib_t *
-Parrot_DynOp_core_3_2_0(PARROT_INTERP, long init) {
+Parrot_DynOp_core_3_3_0(PARROT_INTERP, long init) {
/* initialize and return op_lib ptr */
if (init == 1) {
@@ -23353,7 +23353,7 @@ Parrot_lib_core_ops_load(PARROT_INTERP)
{
PMC *const lib = Parrot_pmc_new(interp, enum_class_ParrotLibrary);
- ((Parrot_ParrotLibrary_attributes*)PMC_data(lib))->oplib_init = (void *) Parrot_DynOp_core_3_2_0;
+ ((Parrot_ParrotLibrary_attributes*)PMC_data(lib))->oplib_init = (void *) Parrot_DynOp_core_3_3_0;
dynop_register(interp, lib);
return lib;
}
View
14 tools/release/release.json
@@ -1,9 +1,9 @@
{
- "release.version" : "3.2.0",
- "release.name" : "Nanday Parakeet",
+ "release.version" : "3.3.0",
+ "release.name" : "Fire in the Sky",
"release.day" : "Tuesday",
- "release.date" : "15 March 2011",
- "release.nextdate" : "19 April 2011",
+ "release.date" : "19 April 2011",
+ "release.nextdate" : "17 May 2011",
"web.root" : "http://parrot.org/",
"web.source" : "download",
@@ -12,10 +12,10 @@
"web.org_root" : "https://github.com/parrot",
"bugday.day" : "Saturday",
- "bugday.date" : "16 April 2011",
+ "bugday.date" : "14 May 2011",
"wiki.root" : "https://trac.parrot.org/parrot/wiki/",
- "wiki.bugday" : "bug_day_2011_04_16",
+ "wiki.bugday" : "bug_day_2011_05_14",
- "ftp.path" : "ftp://ftp.parrot.org/pub/parrot/releases/devel/3.2.0/"
+ "ftp.path" : "ftp://ftp.parrot.org/pub/parrot/releases/supported/3.3.0/"
}

0 comments on commit a9a87f1

Please sign in to comment.
Something went wrong with that request. Please try again.