[svn:parrot] r36249 - in trunk: compilers/ncigen/config/makefiles config/init languages/APL/config/makefiles languages/PIR/config/makefiles languages/abc/config/makefiles languages/c99/config/makefiles languages/cardinal/config/makefiles languages/chitchat/config/makefiles languages/ecmascript/config/makefiles languages/json/config/makefiles languages/lolcode/config/makefiles languages/perl6/config/makefiles languages/pod/config/makefiles languages/pynie/config/makefiles languages/squaak/config/makefiles tools/dev

fperrad at svn.parrot.org fperrad at svn.parrot.org
Sun Feb 1 16:34:20 UTC 2009


Author: fperrad
Date: Sun Feb  1 16:34:19 2009
New Revision: 36249
URL: https://trac.parrot.org/parrot/changeset/36249

Log:
[config] make @cat@ available and use it

Modified:
   trunk/compilers/ncigen/config/makefiles/ncigen.in
   trunk/config/init/defaults.pm
   trunk/languages/APL/config/makefiles/root.in
   trunk/languages/PIR/config/makefiles/root.in
   trunk/languages/abc/config/makefiles/root.in
   trunk/languages/c99/config/makefiles/cpp.in
   trunk/languages/c99/config/makefiles/root.in
   trunk/languages/cardinal/config/makefiles/root.in
   trunk/languages/chitchat/config/makefiles/root.in
   trunk/languages/ecmascript/config/makefiles/root.in
   trunk/languages/json/config/makefiles/root.in
   trunk/languages/lolcode/config/makefiles/root.in
   trunk/languages/perl6/config/makefiles/root.in
   trunk/languages/perl6/config/makefiles/utils.in
   trunk/languages/pod/config/makefiles/root.in
   trunk/languages/pynie/config/makefiles/root.in
   trunk/languages/squaak/config/makefiles/root.in
   trunk/tools/dev/mk_language_shell.pl

Modified: trunk/compilers/ncigen/config/makefiles/ncigen.in
==============================================================================
--- trunk/compilers/ncigen/config/makefiles/ncigen.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/compilers/ncigen/config/makefiles/ncigen.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 

Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/config/init/defaults.pm	Sun Feb  1 16:34:19 2009	(r36249)
@@ -181,11 +181,17 @@
         perl      => $^X,
         perl_inc  => $self->find_perl_headers(),
         test_prog => 'parrot',
+
+        # some utilities in Makefile
+        cat       => '$(PERL) -MExtUtils::Command -e cat',
+        chmod     => '$(PERL) -MExtUtils::Command -e ExtUtils::Command::chmod',
+        cp        => '$(PERL) -MExtUtils::Command -e cp',
+        mkpath    => '$(PERL) -MExtUtils::Command -e mkpath',
+        mv        => '$(PERL) -MExtUtils::Command -e mv',
         rm_f      => '$(PERL) -MExtUtils::Command -e rm_f',
         rm_rf     => '$(PERL) -MExtUtils::Command -e rm_rf',
-        mkpath    => '$(PERL) -MExtUtils::Command -e mkpath',
         touch     => '$(PERL) -MExtUtils::Command -e touch',
-        chmod     => '$(PERL) -MExtUtils::Command -e ExtUtils::Command::chmod',
+
         ar        => $Config{ar},
         ar_flags  => 'cr',
 
@@ -211,8 +217,6 @@
         platform_asm => 0,
         as           => 'as',    # assembler
 
-        cp    => '$(PERL) -MExtUtils::Command -e cp',
-        mv    => '$(PERL) -MExtUtils::Command -e mv',
         lns   => $Config{lns},                          # soft link
         slash => '/',
 

Modified: trunk/languages/APL/config/makefiles/root.in
==============================================================================
--- trunk/languages/APL/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/APL/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_F          = @rm_f@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/PIR/config/makefiles/root.in
==============================================================================
--- trunk/languages/PIR/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/PIR/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/abc/config/makefiles/root.in
==============================================================================
--- trunk/languages/abc/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/abc/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/c99/config/makefiles/cpp.in
==============================================================================
--- trunk/languages/c99/config/makefiles/cpp.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/c99/config/makefiles/cpp.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 

Modified: trunk/languages/c99/config/makefiles/root.in
==============================================================================
--- trunk/languages/c99/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/c99/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/cardinal/config/makefiles/root.in
==============================================================================
--- trunk/languages/cardinal/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/cardinal/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -16,7 +16,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 PBC_TO_EXE    = $(BUILD_DIR)/pbc_to_exe$(EXE)

Modified: trunk/languages/chitchat/config/makefiles/root.in
==============================================================================
--- trunk/languages/chitchat/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/chitchat/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/ecmascript/config/makefiles/root.in
==============================================================================
--- trunk/languages/ecmascript/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/ecmascript/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -16,7 +16,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/json/config/makefiles/root.in
==============================================================================
--- trunk/languages/json/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/json/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/lolcode/config/makefiles/root.in
==============================================================================
--- trunk/languages/lolcode/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/lolcode/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -16,7 +16,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot$(EXE)
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/perl6/config/makefiles/root.in
==============================================================================
--- trunk/languages/perl6/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/perl6/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -26,7 +26,7 @@
 PERL          = @perl@
 RM_F          = @rm_f@
 PARROT        = ../../parrot$(EXE)
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 BUILD_DYNOPS  = $(PERL) $(BUILD_DIR)/tools/build/dynoplibs.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl

Modified: trunk/languages/perl6/config/makefiles/utils.in
==============================================================================
--- trunk/languages/perl6/config/makefiles/utils.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/perl6/config/makefiles/utils.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -16,7 +16,7 @@
 CP            = @cp@
 MAKE          = @make_c@
 PARROT        = ../../../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 

Modified: trunk/languages/pod/config/makefiles/root.in
==============================================================================
--- trunk/languages/pod/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/pod/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/pynie/config/makefiles/root.in
==============================================================================
--- trunk/languages/pynie/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/pynie/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/languages/squaak/config/makefiles/root.in
==============================================================================
--- trunk/languages/squaak/config/makefiles/root.in	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/languages/squaak/config/makefiles/root.in	Sun Feb  1 16:34:19 2009	(r36249)
@@ -15,7 +15,7 @@
 RM_RF         = @rm_rf@
 CP            = @cp@
 PARROT        = ../../parrot at exe@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 #CONDITIONED_LINE(darwin):

Modified: trunk/tools/dev/mk_language_shell.pl
==============================================================================
--- trunk/tools/dev/mk_language_shell.pl	Sun Feb  1 15:06:59 2009	(r36248)
+++ trunk/tools/dev/mk_language_shell.pl	Sun Feb  1 16:34:19 2009	(r36249)
@@ -172,7 +172,7 @@
 PERL          = @perl@
 RM_F          = @rm_f@
 CP            = @cp@
-CAT           = $(PERL) -MExtUtils::Command -e cat
+CAT           = @cat@
 PARROT        = ../../parrot at exe@
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 #IF(darwin):


More information about the parrot-commits mailing list