[svn:parrot] r42341 - in trunk: . config/auto config/auto/sizes config/gen docs/book/draft docs/book/pct docs/dev docs/pdds examples/embed examples/languages/abc examples/languages/squaak examples/pge include/parrot ports/cpan ports/cygwin ports/debian ports/fedora ports/mandriva ports/suse runtime/parrot/languages runtime/parrot/library/Math src/call src/gc src/interp src/runcore t/compilers/tge t/oo t/pmc t/src tools/dev tools/util

jkeenan at svn.parrot.org jkeenan at svn.parrot.org
Sat Nov 7 23:48:29 UTC 2009


Author: jkeenan
Date: Sat Nov  7 23:48:27 2009
New Revision: 42341
URL: https://trac.parrot.org/parrot/changeset/42341

Log:
Merge convert_OSNAME into trunk.  In config steps after auto::arch, we know 'osname', so use '->data->get('osname')' instead of '->data->get_p5('OSNAME')'.  Cf.:  https://trac.parrot.org/parrot/ticket/1194.

Modified:
   trunk/   (props changed)
   trunk/config/auto/crypto.pm
   trunk/config/auto/gdbm.pm
   trunk/config/auto/gettext.pm
   trunk/config/auto/gmp.pm
   trunk/config/auto/opengl.pm
   trunk/config/auto/pcre.pm
   trunk/config/auto/readline.pm
   trunk/config/auto/sizes/intval_maxmin_c.in   (props changed)
   trunk/config/auto/thread.pm
   trunk/config/gen/opengl.pm
   trunk/docs/book/draft/README   (props changed)
   trunk/docs/book/draft/appa_glossary.pod   (props changed)
   trunk/docs/book/draft/appb_patch_submission.pod   (props changed)
   trunk/docs/book/draft/appc_command_line_options.pod   (props changed)
   trunk/docs/book/draft/appd_build_options.pod   (props changed)
   trunk/docs/book/draft/appe_source_code.pod   (props changed)
   trunk/docs/book/draft/ch01_introduction.pod   (props changed)
   trunk/docs/book/draft/ch02_getting_started.pod   (props changed)
   trunk/docs/book/draft/ch07_dynpmcs.pod   (props changed)
   trunk/docs/book/draft/ch08_dynops.pod   (props changed)
   trunk/docs/book/draft/ch10_opcode_reference.pod   (props changed)
   trunk/docs/book/draft/ch11_directive_reference.pod   (props changed)
   trunk/docs/book/draft/ch12_operator_reference.pod   (props changed)
   trunk/docs/book/draft/chXX_hlls.pod   (props changed)
   trunk/docs/book/draft/chXX_library.pod   (props changed)
   trunk/docs/book/draft/chXX_testing_and_debugging.pod   (props changed)
   trunk/docs/book/pct/ch01_introduction.pod   (props changed)
   trunk/docs/book/pct/ch02_getting_started.pod   (props changed)
   trunk/docs/book/pct/ch03_compiler_tools.pod   (props changed)
   trunk/docs/book/pct/ch04_pge.pod   (props changed)
   trunk/docs/book/pct/ch05_nqp.pod   (props changed)
   trunk/docs/dev/c_functions.pod   (props changed)
   trunk/docs/pdds/pdd30_install.pod   (props changed)
   trunk/examples/embed/cotorra.c   (props changed)
   trunk/examples/languages/abc/   (props changed)
   trunk/examples/languages/squaak/   (props changed)
   trunk/examples/pge/demo.pir   (props changed)
   trunk/include/parrot/call.h   (props changed)
   trunk/include/parrot/gc_api.h   (props changed)
   trunk/include/parrot/runcore_api.h   (props changed)
   trunk/include/parrot/runcore_profiling.h   (props changed)
   trunk/include/parrot/runcore_trace.h   (props changed)
   trunk/ports/cpan/pause_guide.pod   (props changed)
   trunk/ports/cygwin/parrot-1.0.0-1.cygport   (props changed)
   trunk/ports/debian/libparrot-dev.install.in   (props changed)
   trunk/ports/debian/libparrot.install.in   (props changed)
   trunk/ports/debian/parrot-doc.install.in   (props changed)
   trunk/ports/debian/parrot.install.in   (props changed)
   trunk/ports/fedora/parrot.spec.fedora   (props changed)
   trunk/ports/mandriva/parrot.spec.mandriva   (props changed)
   trunk/ports/suse/parrot.spec.suse   (props changed)
   trunk/runtime/parrot/languages/   (props changed)
   trunk/runtime/parrot/library/Math/Rand.pir   (props changed)
   trunk/src/call/ops.c   (props changed)
   trunk/src/call/pcc.c   (props changed)
   trunk/src/gc/alloc_memory.c   (props changed)
   trunk/src/gc/alloc_resources.c   (props changed)
   trunk/src/gc/api.c   (props changed)
   trunk/src/gc/malloc.c   (props changed)
   trunk/src/gc/malloc_trace.c   (props changed)
   trunk/src/gc/mark_sweep.c   (props changed)
   trunk/src/gc/system.c   (props changed)
   trunk/src/interp/inter_cb.c   (props changed)
   trunk/src/interp/inter_create.c   (props changed)
   trunk/src/interp/inter_misc.c   (props changed)
   trunk/src/runcore/cores.c   (props changed)
   trunk/src/runcore/main.c   (props changed)
   trunk/src/runcore/profiling.c   (props changed)
   trunk/src/runcore/trace.c   (props changed)
   trunk/t/compilers/tge/NoneGrammar.tg   (props changed)
   trunk/t/oo/root_new.t   (props changed)
   trunk/t/pmc/namespace-old.t   (props changed)
   trunk/t/src/embed.t   (props changed)
   trunk/tools/dev/fetch_languages.pl   (props changed)
   trunk/tools/dev/mk_gitignore.pl   (props changed)
   trunk/tools/util/perlcritic-cage.conf   (props changed)

Modified: trunk/config/auto/crypto.pm
==============================================================================
--- trunk/config/auto/crypto.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/crypto.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -47,7 +47,7 @@
         return 1;
     }
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/gdbm.pm
==============================================================================
--- trunk/config/auto/gdbm.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/gdbm.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -50,7 +50,7 @@
         return 1;
     }
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/gettext.pm
==============================================================================
--- trunk/config/auto/gettext.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/gettext.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -50,7 +50,7 @@
         return 1;
     }
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/gmp.pm
==============================================================================
--- trunk/config/auto/gmp.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/gmp.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -56,7 +56,7 @@
         return 1;
     }
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/opengl.pm
==============================================================================
--- trunk/config/auto/opengl.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/opengl.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -167,7 +167,7 @@
 
     return $self->_handle_no_opengl($conf) if $without;
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
             conf            => $conf,

Modified: trunk/config/auto/pcre.pm
==============================================================================
--- trunk/config/auto/pcre.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/pcre.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -46,7 +46,7 @@
         return 1;
     }
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/readline.pm
==============================================================================
--- trunk/config/auto/readline.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/readline.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -39,7 +39,7 @@
     my $verbose = $conf->options->get('verbose');
 
     my $cc     = $conf->data->get('cc');
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
 
     my $extra_libs = $self->_select_lib( {
         conf            => $conf,

Modified: trunk/config/auto/thread.pm
==============================================================================
--- trunk/config/auto/thread.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/auto/thread.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -44,7 +44,7 @@
         return 1;
     }
 
-    if ($conf->data->get_p5('OSNAME') eq 'MSWin32'
+    if ($conf->data->get('osname') eq 'MSWin32'
      || $conf->data->get('i_pthread') eq 'define') {
         $conf->data->set( HAS_THREADS => 1 );
         $self->set_result('yes');

Modified: trunk/config/gen/opengl.pm
==============================================================================
--- trunk/config/gen/opengl.pm	Sat Nov  7 22:54:16 2009	(r42340)
+++ trunk/config/gen/opengl.pm	Sat Nov  7 23:48:27 2009	(r42341)
@@ -437,7 +437,7 @@
 
     my @include_paths_win32 = grep /\S/ => split /;/ => ($ENV{INCLUDE} || '');
 
-    my $osname = $conf->data->get_p5('OSNAME');
+    my $osname = $conf->data->get('osname');
     if (scalar @include_paths_win32 == 0 && $osname =~ /mswin32/i) {
         my $cc = $conf->data->get('cc');
         my $path = dirname(dirname(which($cc))) . '\include';


More information about the parrot-commits mailing list