Merge branch 'master' into whiteknight/io_cleanup1

parrot · Aug 22, 2012 · a767d76 · a767d76
2 parents cdd13f8 + f93ef0f
commit a767d76
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/CREDITS b/CREDITS
@@ -113,7 +113,7 @@ N: Andrew Whitworth
 D: Product Manager (2.9.0 - current)
 D: Internals development
 D: Documentation
-D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0, 3.3.0, 3.10.0, 4.0.0 and 4.4.0
+D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0, 3.3.0, 3.10.0, 4.0.0, 4.4.0 and 4.7.0
 E: wknight8111@gmail.com
 U: Whiteknight
 

diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 2012-08-21    release 4.7.0
     - Core
         + Added .all_tags() and .all_tagged_pmcs() methods to PackfileView PMC
+        + Several build and coding standards fixes
 
 2012-07-17    release 4.6.0
     - Core

diff --git a/MANIFEST.generated b/MANIFEST.generated
@@ -1,14 +1,14 @@
 # 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.4.6.0.dylib                   [main]lib
+blib/lib/libparrot.4.7.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.4.6.0                      [main]lib
+blib/lib/libparrot.so.4.7.0                      [main]lib
 compilers/data_json/data_json.pbc                [data_json]
 config/gen/call_list/opengl.in                   []
-cygparrot-4.6.0.dll                              [main]bin
+cygparrot-4.7.0.dll                              [main]bin
 docs/ops/bit.pod                                 [doc]
 docs/ops/cmp.pod                                 [doc]
 docs/ops/core.pod                                [doc]

diff --git a/README.pod b/README.pod
@@ -4,7 +4,7 @@
 
 =head1 NAME
 
-README.pod - Readme to Parrot, version 4.6.0.
+README.pod - Readme to Parrot, version 4.7.0.
 
 =head1 DESCRIPTION
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.6.0
+4.7.0
diff --git a/config/auto/warnings.pm b/config/auto/warnings.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011, Parrot Foundation.
+# Copyright (C) 2007-2012, Parrot Foundation.
 
 =head1 NAME
 
@@ -172,7 +172,6 @@ sub _init {
         -Wfloat-equal
         -Wformat=2
         -Wlarger-than-4096
-        -Wlong-long
         -Wmissing-format-attribute
         -Wdeprecated-declarations
         -Wno-format-extra-args

diff --git a/docs/parrothist.pod b/docs/parrothist.pod
@@ -145,5 +145,6 @@ Starred release numbers indicate supported releases.
  Whiteknight 4.4.0          2012-May-15     "Banana Fanna Fo Ferret"
  alvis       4.5.0          2012-Jun-19     "Buff-faced Pygmy Parrot"
  rurban      4.6.0 *        2012-Jul-17     "Wild Parrots of Telegraph Hill"
+ Whiteknight 4.7.0          2012-Aug-22     "Hispaniolan"
 
 =cut
diff --git a/docs/project/release_manager_guide.pod b/docs/project/release_manager_guide.pod
@@ -544,7 +544,6 @@ The calendar of releases is available at the C<comp.lang.parrot> Google
 calendar, visible at
 L<http://www.google.com/calendar/render?cid=ldhctdamsgfg5a1cord52po9h8@group.calendar.google.com>.
 
-    - Aug 21, 2012 - 4.7.0   - whiteknight
     - Sep 18, 2012 - 4.8.0   - alvis
     - Oct 16, 2012 - 4.9.0   - dukeleto
     - Nov 20, 2012 - 4.10.0  - ??

diff --git a/include/parrot/oplib/core_ops.h b/include/parrot/oplib/core_ops.h
@@ -19,7 +19,7 @@
 #include "parrot/runcore_api.h"
 
 PARROT_EXPORT
-op_lib_t *Parrot_DynOp_core_4_6_0(PARROT_INTERP, long init);
+op_lib_t *Parrot_DynOp_core_4_7_0(PARROT_INTERP, long init);
 
  opcode_t * Parrot_end(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_noop(opcode_t *, PARROT_INTERP);

diff --git a/src/ops/core_ops.c b/src/ops/core_ops.c
@@ -24440,7 +24440,7 @@ op_lib_t core_op_lib = {
   PARROT_FUNCTION_CORE,                       /* core_type = PARROT_XX_CORE */
   0,                                /* flags */
   4,    /* major_version */
-  6,    /* minor_version */
+  7,    /* minor_version */
   0,    /* patch_version */
   1125,             /* op_count */
   core_op_info_table,       /* op_info_table */
@@ -24569,7 +24569,7 @@ static void hop_deinit(PARROT_INTERP)
     hop_buckets = NULL;
 }PARROT_EXPORT
 op_lib_t *
-Parrot_DynOp_core_4_6_0(PARROT_INTERP, long init) {
+Parrot_DynOp_core_4_7_0(PARROT_INTERP, long init) {
     /* initialize and return op_lib ptr */
     if (init == 1) {
 
@@ -24598,7 +24598,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_4_6_0;
+    ((Parrot_ParrotLibrary_attributes*)PMC_data(lib))->oplib_init = (void *) Parrot_DynOp_core_4_7_0;
     dynop_register(interp, lib);
     return lib;
 }

diff --git a/tools/release/release.json b/tools/release/release.json
@@ -1,8 +1,8 @@
 {
-    "release.version"  : "4.6.0",
-    "release.name"     : "Wild Parrots of Telegraph Hill",
-    "release.day"      : "Tuesday",
-    "release.nextdate" : "17 July 2012",
+    "release.version"  : "4.7.0",
+    "release.name"     : "Hispaniolan",
+    "release.day"      : "Wednesday",
+    "release.nextdate" : "18 September 2012",
 
     "web.root"         : "http://parrot.org/",
     "web.source"       : "download",
@@ -11,10 +11,10 @@
     "web.org_root"    :  "https://github.com/parrot",
 
     "bugday.day"       : "Saturday",
-    "bugday.date"      : "14 July 2012",
+    "bugday.date"      : "15 September 2012",
 
     "wiki.root"        : "https://github.com/parrot/parrot/wiki",
-    "wiki.bugday"      : "bug_day_2012_07_14",
+    "wiki.bugday"      : "bug_day_2012_09_15",
 
-    "ftp.path"         : "ftp://ftp.parrot.org/pub/parrot/releases/supported/4.6.0/"
+    "ftp.path"         : "ftp://ftp.parrot.org/pub/parrot/releases/devel/4.7.0/"
 }