Permalink
Browse files

Merge branch 'master' into nwellnhof/unicode_filenames

  • Loading branch information...
nwellnhof committed Jan 21, 2011
2 parents 69d66a8 + b87413e commit e29f45d76dc78550560a754613d70b0b32bb9970
View
@@ -1,11 +1,19 @@
# ex: set ro:
# $Id$
# generated by tools/dev/mk_manifest_and_skip.pl
# .gitignore
#
# Ignore any remaining SVN directories
# Ignore SVN, if people are using the SVN Github interface (danger!)
/\B.svn\b
# Ignore core files
/core*
# Ignore patch-related stuff
*.rej
*.orig
*.patch
*.diff
# ports/ should not go into release tarballs
*.obj
*.rc
*.res
/ports
/*.core
/*.def
View
@@ -1295,6 +1295,7 @@ src/platform/generic/hires_timer.c []
src/platform/generic/io.c []
src/platform/generic/itimer.c []
src/platform/generic/math.c []
src/platform/generic/misc.c []
src/platform/generic/socket.c []
src/platform/generic/stat.c []
src/platform/generic/sysmem.c []
View
@@ -14,6 +14,14 @@
# ports/ should not go into release tarballs
^ports$
^ports/
^.*\.diff$
^.*\.diff/
^.*\.orig$
^.*\.orig/
^.*\.patch$
^.*\.patch/
^.*\.rej$
^.*\.rej/
^/.*\.core$
^/.*\.core/
^/.*\.def$
@@ -134,6 +142,8 @@
^/compilers/tge/tgc\.pbc/
^/config_lib\.pir$
^/config_lib\.pir/
^/core.*$
^/core.*/
^/cover_db$
^/cover_db/
^/docs/.*\.tmp$
@@ -774,6 +784,8 @@
^/src/parrot_config\.c/
^/src/parrot_config\.h$
^/src/parrot_config\.h/
^/src/platform/.*/.*\.o$
^/src/platform/.*/.*\.o/
^/src/pmc/.*\.c$
^/src/pmc/.*\.c/
^/src/pmc/.*\.dump$
View
4 NEWS
@@ -1,3 +1,7 @@
New in 3.1.0
- Core
+ Exception PMCs are now subclassable from PIR
New in 3.0.0
- Core
+ A new embedding API is available in "parrot/api.h" and documented in
@@ -734,23 +734,17 @@ help :
@echo " all: 'parrot' and the documentation."
@echo " This is the default."
@echo ""
@echo " parrot_utils: ./pbc_dump, ./pbc_disassemble,"
@echo " ./parrot_debugger, ./pbc_merge,"
@echo " ./pbc_to_exe ./parrot_config"
@echo " ./pbc_dump: Parrot Dumper"
@echo " ./pbc_disassemble: Parrot Disassembler"
@echo " ./parrot_debugger: Parrot Debugger"
@echo " ./pbc_merge: Parrot configuration information"
@echo ""
@echo " world: 'all' and 'parrot_utils'."
@echo " installable: same as 'world', but targets for installation"
@echo ""
@echo " parrot_utils: $(PDUMP), $(DIS), $(PDB), $(PBC_MERGE) and $(PBC_TO_EXE) $(PARROT_CONFIG)"
@echo " $(PDUMP):"
@echo " Parrot Dumper"
@echo " $(DIS):"
@echo " Parrot Disassembler"
@echo " $(PDB):"
@echo " Parrot Debugger"
@echo " $(PBC_MERGE):"
@echo " Merge bytecode files"
@echo " $(PBC_TO_EXE):"
@echo " Generate C, compile, and link bytecode files"
@echo " $(PARROT_CONFIG):"
@echo " Provide Parrot configuration information"
@echo ""
@echo "Installation:"
@echo " install: Install under '$(PREFIX)' on Unix systems."
@echo " install-dev: Same as 'install'."
@@ -820,6 +814,7 @@ help :
@echo " tags-vi: Create tags for the vi editor."
@echo " tags-emacs: Create tags for the Emacs editor."
@echo " perlcritic: Check Perl code with Perl::Critic."
@echo " cagecritic: Extra strict checking with Perl::Critic."
@echo " bootstrap-ops: Generate C code from .ops files. Requires already built parrot."
@echo " bootstrap-nci Generate C code for NCI. Requires already built parrot."
@echo ""
@@ -434,7 +434,7 @@ Versions with a asterisk (*) are supported releases.
- Feb 15, 2011 - 3.1 - mikehh
- Mar 15, 2011 - 3.2 - gerd
- Apr 19, 2011 - 3.3* - whiteknight
- May 17, 2011 - 3.4 - ??
- May 17, 2011 - 3.4 - gerd
- Jun 21, 2011 - 3.5 - cotto
- Jul 19, 2011 - 3.6* - kid51
- Aug 16, 2011 - 3.7 - ??
@@ -99,6 +99,16 @@ extern int Parrot_signbit(double x);
int Parrot_signbit_l(long double x);
#endif
#ifndef signbit
# if NUMVAL_SIZE == 8
# define signbit(x) Parrot_signbit(x)
# else
# define signbit(x) Parrot_signbit_l(x)
# endif
#endif
#define Parrot_is_nzero(x) ((x) == 0.0 && signbit(x))
/*
** Memory:
*/
View
@@ -18,9 +18,6 @@ Parrot::Manifest - Re-create MANIFEST and MANIFEST.SKIP
$need_for_skip = $mani->determine_need_for_manifest_skip($print_str);
$mani->print_manifest_skip($print_str) if $need_for_skip;
$print_str = $mani->prepare_gitignore();
$mani->print_gitignore($print_str) if $need_for_skip;
=head1 DESCRIPTION
This package exports no functions. A Parrot::Manifest object is used in
@@ -43,7 +40,6 @@ use File::Basename;
script => $0,
file => $filename,
skip => $skipfilename,
gitignore => $gitignoresfilename,
})
Creates a Parrot::Manifest object by asking C<git status> for verbose output,
@@ -52,9 +48,6 @@ and parsing the results.
C<file> is the name of the file that the manifest will eventually be written
to, and defaults to F<MANIFEST>. C<skip> is the name of the file that will
hold the list of files to be skipped, and defaults to F<MANIFEST.SKIP>.
C<gitignore> contains the same information as F<MANIFEST.SKIP> in a different
format. It defaults to F<.gitignore>. The C<script> parameter is the name of
the program invoking Parrot::Manifest, for use in messages.
=cut
@@ -69,7 +62,6 @@ sub new {
script => $argsref->{script},
file => $argsref->{file} ? $argsref->{file} : q{MANIFEST},
skip => $argsref->{skip} ? $argsref->{skip} : q{MANIFEST.SKIP},
gitignore => $argsref->{gitignore} ? $argsref->{gitignore} : q{.gitignore},
);
my $lsfiles = qx($data{cmd} ls-files );
@@ -291,7 +283,7 @@ sub _get_current_files {
$print_str = $mani->prepare_manifest_skip();
Gets a list of the files that git ignores, and returns a string that can be
Gets a list of the files that Git ignores, and returns a string that can be
put into F<MANIFEST.SKIP>.
=cut
@@ -304,22 +296,6 @@ sub prepare_manifest_skip {
return $self->_compose_manifest_skip($ignores_ref);
}
=head2 prepare_gitignore
$print_str = $mani->prepare_gitignore();
Gets a list of the files that SVN ignores, and then writes it to the
F<.gitignore> file.
=cut
sub prepare_gitignore {
my $self = shift;
my $ignores_ref = $self->_get_ignores();
return $self->_compose_gitignore($ignores_ref);
}
=head2 determine_need_for_manifest_skip
@@ -386,32 +362,11 @@ sub print_manifest_skip {
return 1;
}
=head2 print_gitignore
$mani->print_gitignore($print_str) if $need_for_skip;
Writes the F<.gitignore> file. The example above does so only if needed.
=cut
sub print_gitignore {
my $self = shift;
my $print_str = shift;
open my $GITIGNORE, '>', $self->{gitignore}
or die "Unable to open $self->{gitignore} for writing";
$print_str .= $text_file_coda;
print $GITIGNORE $print_str;
close $GITIGNORE
or die "Unable to close $self->{gitignore} after writing";
return 1;
}
# Gets a list of files that SVN ignores
# Gets a list of files that Git ignores
sub _get_ignores {
my $self = shift;
# HACK: Make this portable
my $gitignore = `cat .gitignore| grep -v '^#'`;
my %ignores;
@@ -429,39 +384,6 @@ sub _get_ignores {
return \%ignores;
}
# Turns the list of ignored files into .gitignore format
sub _compose_gitignore {
my $self = shift;
my $ignores_ref = shift;
my $print_str = <<"END_HEADER";
# ex: set ro:
# $self->{id}
# generated by $self->{script}
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository.
# The .gitignore file is a convenience for developers working with git-svn.
# See http://www.kernel.org/pub/software/scm/git/docs/gitignore.html for the
# format of this file.
#
END_HEADER
foreach my $directory ( sort keys %{$ignores_ref} ) {
my $dir = $directory;
$dir =~ s!\\!/!g;
$print_str .= "# generated from svn:ignore of '$dir/'\n";
foreach ( sort split /\n/, $ignores_ref->{$directory} ) {
$print_str .=
( $dir ne '.' )
? "/$dir/$_\n"
: "/$_\n";
}
}
return $print_str;
}
# Turns list of ignored files into F<MANIFEST.SKIP> format
sub _compose_manifest_skip {
my $self = shift;
Oops, something went wrong.

0 comments on commit e29f45d

Please sign in to comment.