[svn:parrot] r43632 - in trunk: config/gen/makefiles t/tools

cotto at svn.parrot.org cotto at svn.parrot.org
Thu Jan 28 07:29:46 UTC 2010


Author: cotto
Date: Thu Jan 28 07:29:45 2010
New Revision: 43632
URL: https://trac.parrot.org/parrot/changeset/43632

Log:
[build] change PBCMERGE to PBC_MERGE for naming consistency

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/t/tools/pbc_merge.t

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Wed Jan 27 22:36:56 2010	(r43631)
+++ trunk/config/gen/makefiles/root.in	Thu Jan 28 07:29:45 2010	(r43632)
@@ -518,7 +518,7 @@
 MINIPARROT          = ./miniparrot$(EXE)
 DIS                 = ./pbc_disassemble$(EXE)
 PDUMP               = ./pbc_dump$(EXE)
-PBCMERGE            = ./pbc_merge$(EXE)
+PBC_MERGE           = ./pbc_merge$(EXE)
 PDB                 = ./parrot_debugger$(EXE)
 PBC_TO_EXE          = ./pbc_to_exe$(EXE)
 PARROT_CONFIG       = ./parrot_config$(EXE)
@@ -526,14 +526,14 @@
 NQP_RX              = ./parrot-nqp$(EXE)
 
 # Installable executables
-INSTALLABLEPARROT   = ./installable_parrot$(EXE)
-INSTALLABLEDIS      = ./installable_pbc_disassemble$(EXE)
-INSTALLABLEPDUMP    = ./installable_pbc_dump$(EXE)
-INSTALLABLEPBCMERGE = ./installable_pbc_merge$(EXE)
-INSTALLABLEPBCTOEXE = ./installable_pbc_to_exe$(EXE)
-INSTALLABLEPDB      = ./installable_parrot_debugger$(EXE)
-INSTALLABLECONFIG   = ./installable_parrot_config$(EXE)
-INSTALLABLENQP      = ./installable_parrot-nqp$(EXE)
+INSTALLABLEPARROT    = ./installable_parrot$(EXE)
+INSTALLABLEDIS       = ./installable_pbc_disassemble$(EXE)
+INSTALLABLEPDUMP     = ./installable_pbc_dump$(EXE)
+INSTALLABLEPBC_MERGE = ./installable_pbc_merge$(EXE)
+INSTALLABLEPBCTOEXE  = ./installable_pbc_to_exe$(EXE)
+INSTALLABLEPDB       = ./installable_parrot_debugger$(EXE)
+INSTALLABLECONFIG    = ./installable_parrot_config$(EXE)
+INSTALLABLENQP       = ./installable_parrot-nqp$(EXE)
 
 # Libraries
 LIBPARROT_STATIC    = @blib_dir@/@libparrot_static@
@@ -603,7 +603,7 @@
     $(DIS) \
     $(PARROT_CONFIG) \
     $(PBC_TO_EXE) \
-    $(PBCMERGE) \
+    $(PBC_MERGE) \
     $(PDB) \
     $(PDUMP) \
     $(NQP_RX) \
@@ -696,14 +696,14 @@
 	@echo "  world:             'all' and 'parrot_utils'."
 	@echo "  installable:       same as 'world', but targets for installation"
 	@echo ""
-	@echo "  parrot_utils:      $(PDUMP), $(DIS), $(PDB), $(PBCMERGE) and $(PBC_TO_EXE) $(PARROT_CONFIG)"
+	@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 " $(PBCMERGE):"
+	@echo " $(PBC_MERGE):"
 	@echo "                     Merge bytecode files"
 	@echo " $(PBC_TO_EXE):"
 	@echo "                     Generate C, compile, and link bytecode files"
@@ -798,9 +798,9 @@
 
 world : all parrot_utils
 
-parrot_utils : $(PDUMP) $(DIS) $(PDB) $(PBCMERGE) $(PBC_TO_EXE) $(PARROT_CONFIG)
+parrot_utils : $(PDUMP) $(DIS) $(PDB) $(PBC_MERGE) $(PBC_TO_EXE) $(PARROT_CONFIG)
 
-installable: all $(INSTALLABLEPARROT) $(INSTALLABLEPDUMP) $(INSTALLABLEDIS) $(INSTALLABLEPDB) $(INSTALLABLEPBCMERGE) $(INSTALLABLEPBCTOEXE) $(INSTALLABLECONFIG) $(INSTALLABLENQP)
+installable: all $(INSTALLABLEPARROT) $(INSTALLABLEPDUMP) $(INSTALLABLEDIS) $(INSTALLABLEPDB) $(INSTALLABLEPBC_MERGE) $(INSTALLABLEPBCTOEXE) $(INSTALLABLECONFIG) $(INSTALLABLENQP)
 
 
 flags_dummy :
@@ -1014,14 +1014,14 @@
 # Parrot Bytecode File Merger
 #
 
-$(PBCMERGE) : src/pbc_merge$(O) $(LIBPARROT) src/parrot_config$(O)
+$(PBC_MERGE) : src/pbc_merge$(O) $(LIBPARROT) src/parrot_config$(O)
 	$(LINK) @ld_out@$@ \
     src/pbc_merge$(O) \
     src/parrot_config$(O) \
     @rpath_blib@ $(ALL_PARROT_LIBS) $(LINK_DYNAMIC) $(LINKFLAGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
 
-$(INSTALLABLEPBCMERGE) : src/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
+$(INSTALLABLEPBC_MERGE) : src/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
 	$(LINK) @ld_out@$@ \
     src/pbc_merge$(O) \
     src/install_config$(O) \
@@ -1817,7 +1817,7 @@
     $(INSTALLABLEPARROT) \
     $(INSTALLABLEDIS) \
     $(INSTALLABLEPDUMP) \
-    $(INSTALLABLEPBCMERGE) \
+    $(INSTALLABLEPBC_MERGE) \
     $(INSTALLABLEPBCTOEXE) \
     $(INSTALLABLEPDB) \
     $(INSTALLABLECONFIG) \
@@ -1827,7 +1827,7 @@
     compilers/imcc/main$(O) \
     $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
     $(PDB) src/parrot_debugger$(O) \
-    $(PBCMERGE) src/pbc_merge$(O) \
+    $(PBC_MERGE) src/pbc_merge$(O) \
     $(DIS) src/pbc_disassemble$(O)
 	$(RM_F) \
     src/main$(O) \
@@ -1855,14 +1855,14 @@
     $(INSTALLABLEPARROT) \
     $(INSTALLABLEDIS) \
     $(INSTALLABLEPDUMP) \
-    $(INSTALLABLEPBCMERGE) \
+    $(INSTALLABLEPBC_MERGE) \
     $(INSTALLABLEPDB) \
     $(INSTALLABLECONFIG) \
     $(INSTALLABLENQP) \
     compilers/imcc/main$(O) \
     $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
     $(PDB) src/parrot_debugger$(O) \
-    $(PBCMERGE) src/pbc_merge$(O) \
+    $(PBC_MERGE) src/pbc_merge$(O) \
     $(DIS) src/pbc_disassemble$(O) \
     $(PARROT_CONFIG) parrot_config$(O) parrot_config.c \
     src/parrot_config$(O) parrot_config.pbc \

Modified: trunk/t/tools/pbc_merge.t
==============================================================================
--- trunk/t/tools/pbc_merge.t	Wed Jan 27 22:36:56 2010	(r43631)
+++ trunk/t/tools/pbc_merge.t	Thu Jan 28 07:29:45 2010	(r43632)
@@ -25,11 +25,11 @@
 use Parrot::Test;
 use Parrot::Config;
 
-my $PARROT   = ".$PConfig{slash}$PConfig{test_prog}";
-my $PBCMERGE = ".$PConfig{slash}pbc_merge$PConfig{exe}";
+my $PARROT    = ".$PConfig{slash}$PConfig{test_prog}";
+my $PBC_MERGE = ".$PConfig{slash}pbc_merge$PConfig{exe}";
 
 # Only test if we have the PBC merge tool built.
-if ( -e $PBCMERGE ) {
+if ( -e $PBC_MERGE ) {
     plan tests => 4;
 }
 else {
@@ -50,7 +50,7 @@
 sub pbc_merge {
     my $outname = "t$PConfig{slash}tools$PConfig{slash}" . shift() . ".pbc";
     my $inputs = join( ' ', map { "t$PConfig{slash}tools$PConfig{slash}$_.pbc" } @_ );
-    system("$PBCMERGE -o $outname $inputs");
+    system("$PBC_MERGE -o $outname $inputs");
 }
 
 sub run_pbc {


More information about the parrot-commits mailing list