[svn:parrot] r42461 - in trunk: . config/gen/makefiles

[pmichaud at svn.parrot.org]

Author: pmichaud
Date: Thu Nov 12 21:12:48 2009
New Revision: 42461
URL: https://trac.parrot.org/parrot/changeset/42461

Log:
[nqp-rx]:  Change "make" and "make install" to build parrot-nqp (new)
instead of parrot_nqp (old).

Modified:
   trunk/   (props changed)
   trunk/MANIFEST.generated
   trunk/config/gen/makefiles/root.in

Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated	Thu Nov 12 20:59:27 2009	(r42460)
+++ trunk/MANIFEST.generated	Thu Nov 12 21:12:48 2009	(r42461)
@@ -64,8 +64,8 @@
 installable_pbc_merge                             [main]bin
 installable_pbc_to_exe.exe                        [main]bin
 installable_pbc_to_exe                            [main]bin
-installable_parrot_nqp.exe                        [main]bin
-installable_parrot_nqp                            [main]bin
+installable_parrot-nqp.exe                        [main]bin
+installable_parrot-nqp                            [main]bin
 lib/Parrot/Config/Generated.pm                    [devel]lib
 libparrot.dll                                     [main]bin
 libparrot.lib                                     [main]bin

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Thu Nov 12 20:59:27 2009	(r42460)
+++ trunk/config/gen/makefiles/root.in	Thu Nov 12 21:12:48 2009	(r42461)
@@ -502,7 +502,7 @@
 PBC_TO_EXE          := $(CUR_DIR)/pbc_to_exe$(EXE)
 PARROT_CONFIG       := $(CUR_DIR)/parrot_config$(EXE)
 PIRC                := $(CUR_DIR)/pirc$(EXE)
-NQP                 := $(CUR_DIR)/parrot_nqp$(EXE)
+NQP                 := $(CUR_DIR)/parrot-nqp$(EXE)
 
 # Installable executables
 INSTALLABLEPARROT   := $(CUR_DIR)/installable_parrot$(EXE)
@@ -512,7 +512,7 @@
 INSTALLABLEPBCTOEXE := $(CUR_DIR)/installable_pbc_to_exe$(EXE)
 INSTALLABLEPDB      := $(CUR_DIR)/installable_parrot_debugger$(EXE)
 INSTALLABLECONFIG   := $(CUR_DIR)/installable_parrot_config$(EXE)
-INSTALLABLENQP      := $(CUR_DIR)/installable_parrot_nqp$(EXE)
+INSTALLABLENQP      := $(CUR_DIR)/installable_parrot-nqp$(EXE)
 
 # Libraries
 LIBPARROT_STATIC    := @blib_dir@/@libparrot_static@
@@ -823,8 +823,8 @@
 	$(CHMOD) 0755 $(PIRC)
 
 $(NQP) : $(PBC_TO_EXE) compilers.dummy
-	$(CP) compilers/nqp/nqp.pbc parrot_nqp.pbc
-	$(PBC_TO_EXE) parrot_nqp.pbc
+	$(CP) runtime/parrot/library/nqp-rx.pbc parrot-nqp.pbc
+	$(PBC_TO_EXE) parrot-nqp.pbc
 
 $(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
     lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
@@ -934,9 +934,9 @@
 $(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) $(SRC_DIR)/install_config$(O)
 	$(PBC_TO_EXE) pbc_to_exe.pbc --install
 
-$(INSTALLABLENQP) : compilers/nqp/nqp.pbc $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE)
-	$(CP) compilers/nqp/nqp.pbc parrot_nqp.pbc
-	$(PBC_TO_EXE) parrot_nqp.pbc --install
+$(INSTALLABLENQP) : runtime/parrot/library/nqp-rx.pbc $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE)
+	$(CP) runtime/parrot/library/nqp-rx.pbc parrot-nqp.pbc
+	$(PBC_TO_EXE) parrot-nqp.pbc --install
 
 #
 # Parrot Debugger