Skip to content

Commit

Permalink
Merge remote branch 'origin/master' into 233/file_based_config
Browse files Browse the repository at this point in the history
  • Loading branch information
leto committed Jan 21, 2012
2 parents 1632ca3 + 77a5843 commit 3e6bc3e
Show file tree
Hide file tree
Showing 89 changed files with 2,165 additions and 2,406 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ cachegrind.out.*
/*.tmp
# vim swap files
/\.*sw?
/*/*.sw?
/*/*/*.sw?
/*/*/*/*.sw?
/*.vcproj*
/.git
/.parrot_current_rev
Expand All @@ -56,6 +59,7 @@ cachegrind.out.*
/libparrot.def
/libparrot.dll
/libparrot.dll.a
/cygparrot*.dll
/miniparrot
/myconfig
/ops2c
Expand Down
2 changes: 1 addition & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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, 2.11.0, 3.3.0 and 3.10.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 and 4.0.0
E: wknight8111@gmail.com
U: Whiteknight

Expand Down
19 changes: 19 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
2012-01-17 release 4.1.0
- Core
+ Shared libraries and installable binaries are now stripped if built with
--optimize on Cygwin, which greatly reduces their size on disk
- Documentation
- Tests

2012-01-17 release 4.0.0
- Core
+ Several cleanups to the interp subsystem API
+ Cleanups and documentation additions for green threads and timers
+ Iterator PMC and family now implement the "iterator" role
+ A bug in Parrot_ext_try was fixed where it was not popping a context correctly
- Documentation
+ Docs for all versions of Parrot ever released are now available
at http://parrot.github.com
- Tests
+ Timer PMC tests were converted from PASM to PIR

2011-12-20 release 3.11.0
- Core
+ packfile api and pbc handling improvements
Expand Down
3 changes: 1 addition & 2 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -1237,9 +1237,8 @@ src/gc/variable_size_pool.h []
src/global_setup.c []
src/hash.c []
src/hll.c []
src/interp/api.c []
src/interp/inter_cb.c []
src/interp/inter_create.c []
src/interp/inter_misc.c []
src/io/api.c []
src/io/buffer.c []
src/io/core.c []
Expand Down
10 changes: 10 additions & 0 deletions MANIFEST.SKIP
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# ports/ should not go into release tarballs
^ports$
^ports/
^$
^/
^.*\.diff$
^.*\.diff/
^.*\.obj$
Expand All @@ -26,6 +28,12 @@
^.*\.rej/
^.*\.res$
^.*\.res/
^/.*/.*/.*/.*\.sw?$
^/.*/.*/.*/.*\.sw?/
^/.*/.*/.*\.sw?$
^/.*/.*/.*\.sw?/
^/.*/.*\.sw?$
^/.*/.*\.sw?/
^/.*\.core$
^/.*\.core/
^/.*\.def$
Expand Down Expand Up @@ -150,6 +158,8 @@
^/core.*/
^/cover_db$
^/cover_db/
^/cygparrot.*\.dll$
^/cygparrot.*\.dll/
^/docs/.*\.tmp$
^/docs/.*\.tmp/
^/docs/Makefile$
Expand Down
6 changes: 4 additions & 2 deletions MANIFEST.generated
Original file line number Diff line number Diff line change
@@ -1,13 +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.3.11.0.dylib [main]lib
blib/lib/libparrot.4.0.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.11.0 [main]lib
blib/lib/libparrot.so.4.0.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
cygparrot4_0_0.dll [main]bin
docs/ops/bit.pod [doc]
docs/ops/cmp.pod [doc]
docs/ops/core.pod [doc]
Expand Down Expand Up @@ -159,6 +160,7 @@ lib/Parrot/Config/Generated.pm [devel]lib
lib/Parrot/PMC.pm [devel]lib
lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm [devel]lib
libparrot.dll [main]bin
libparrot.dll.a [main]lib
libparrot.lib [main]bin
runtime/parrot/dynext/bit_ops.bundle [library]
runtime/parrot/dynext/bit_ops.dll [library]
Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This is Parrot, version 3.11.0
This is Parrot, version 4.0.0
------------------------------

Parrot is Copyright (C) 2001-2011, Parrot Foundation.
Expand Down Expand Up @@ -170,8 +170,8 @@ WEB SITES

The following web sites have all the information you need about Parrot:
http://www.parrot.org/
http://trac.parrot.org/
http://docs.parrot.org/
https://github.com/parrot/parrot/

Have fun,
The Parrot Team.
2 changes: 1 addition & 1 deletion RESPONSIBLE_PARTIES
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ commit access, just those who have a role they've taken responsibility
for.

See docs/project/roles_responsibilities.pod for role definitions, and
https://trac.parrot.org/parrot/wiki/Languages for language authors/maintainers.
https://github.com/parrot/parrot/wiki/Languages for language authors/maintainers.


Project Team
Expand Down
6 changes: 3 additions & 3 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

All todo items should have a corresponding trac ticket. See the current list:
All todo items should have a corresponding github issue. See the current list:

https://trac.parrot.org/parrot/report/9
https://github.com/parrot/parrot/issues?labels=todo

To open a new todo ticket, use

https://trac.parrot.org/
https://github.com/parrot/parrot/issues/new

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11.0
4.0.0
Loading

0 comments on commit 3e6bc3e

Please sign in to comment.