Skip to content
Browse files

Fix Configure and the Makefile template and add a .gitignore

  • Loading branch information...
1 parent 095b3ab commit c0579bc5881a46dcbe187dfcfb30f20de32c731f @leto committed
Showing with 18 additions and 86 deletions.
  1. +4 −0 .gitignore
  2. +4 −4 Configure.nqp
  3. +0 −72 Makefile
  4. +10 −10 src/Makefile.in
View
4 .gitignore
@@ -0,0 +1,4 @@
+
+*~
+*.sw?
+Makefile
View
8 Configure.nqp
@@ -14,7 +14,7 @@ MAIN();
sub MAIN () {
# Wave to the friendly users
- say("Hello, I'm Configure. My job is to poke and prod\nyour system to figure out how to build PL/Parrot.\n");
+ say("Hello, I'm Configure. My job is to poke and prod\nyour system to figure out how to build nqpTAP.\n");
# Load Parrot config and glue functions
pir::load_bytecode('PGE.pbc');
@@ -38,9 +38,9 @@ sub MAIN () {
# Give the user a hint of next action
my $make := %VM<config><make>;
say("Configure completed for platform '$OS'.");
- say("You can now type '$make' to build PL/Parrot.\n");
- say("You may also type '$make test' to run the PL/Parrot test suite.\n");
- say("Happy Hacking,\n\tThe PL/Parrot Team");
+ say("You can now type '$make' to build nqpTAP.\n");
+ say("You may also type '$make test' to run the nqpTAP test suite.\n");
+ say("Happy Hacking,\n\tThe nqpTAP Team");
}
sub replacement ($match) {
View
72 Makefile
@@ -1,72 +0,0 @@
-# Copyright (C) 2009, Parrot Foundation.
-
-# Command aliases and portability fixes
-PERL = /usr/local/bin/perl
-RM_F = $(PERL) -MExtUtils::Command -e rm_f
-CP = $(PERL) -MExtUtils::Command -e cp
-CHMOD = $(PERL) -MExtUtils::Command -e ExtUtils::Command::chmod
-
-O = .o
-EXE =
-
-PARROT_BIN = /Users/leto/git/nqp-rx/parrot_install/bin
-PARROT_LIB = /Users/leto/git/nqp-rx/parrot_install/lib/1.7.0-devel
-
-PARROT = $(PARROT_BIN)/parrot
-PBC_TO_EXE = $(PARROT_BIN)/pbc_to_exe
-PARROT_NQP = $(PARROT_BIN)/parrot-nqp
-
-# The default target
-all: plparrot$(EXE)
-
-# Always run the FORCEd targets, without checking the filesystem
-.PHONY: FORCE
-
-FORCE:
-
-# Rebuild the Makefile if needed
-Makefile: src/Makefile.in Configure.nqp
- $(PARROT_NQP) Configure.nqp
-
-# List all user-visible targets
-help: FORCE
- @echo ""
- @echo "The following targets are available:"
- @echo ""
- @echo " all: Generate plparrot executable (default target)"
- @echo " clean: Clean generated files"
- @echo " test: Test plparrot and its libraries"
- @echo " help: Print this help message"
- @echo ""
-
-# The main build sequence
-plparrot$(EXE): src/plparrot$(EXE)
- $(CP) src/plparrot$(EXE) plparrot$(EXE)
- $(CHMOD) 0755 plparrot$(EXE)
-
-src/plparrot$(EXE): Makefile src/plparrot.pbc src/lib/Metadata.pbc src/lib/Util.pbc src/lib/Glue.pbc
- $(PBC_TO_EXE) src/plparrot.pbc
-
-.SUFFIXES: .nqp .pir .pbc
-
-.pir.pbc:
- $(PARROT) -o $@ $<
-
-.nqp.pir:
- $(PARROT_NQP) --target=pir -o $@ $<
-
-# Convenience
-realclean: clean
-
-clean: FORCE
- $(RM_F) "*~" "src/lib/*.pbc" "src/*.pbc" "src/*$(O)" "src/*.c" \
- src/lib/Util.pir src/lib/Metadata.pir src/plparrot.pir \
- src/plparrot$(EXE) plparrot$(EXE) Makefile
-
-test: FORCE
- $(PARROT_NQP) t/harness t/*.t
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
View
20 src/Makefile.in
@@ -17,7 +17,7 @@ PBC_TO_EXE = $(PARROT_BIN)/pbc_to_exe
PARROT_NQP = $(PARROT_BIN)/parrot-nqp
# The default target
-all: plparrot$(EXE)
+all: nqptap$(EXE)
# Always run the FORCEd targets, without checking the filesystem
.PHONY: FORCE
@@ -33,19 +33,19 @@ help: FORCE
@echo ""
@echo "The following targets are available:"
@echo ""
- @echo " all: Generate plparrot executable (default target)"
+ @echo " all: Generate nqptap executable (default target)"
@echo " clean: Clean generated files"
- @echo " test: Test plparrot and its libraries"
+ @echo " test: Test nqptap and its libraries"
@echo " help: Print this help message"
@echo ""
# The main build sequence
-plparrot$(EXE): src/plparrot$(EXE)
- $(CP) src/plparrot$(EXE) plparrot$(EXE)
- $(CHMOD) 0755 plparrot$(EXE)
+nqptap$(EXE): src/nqptap$(EXE)
+ $(CP) src/nqptap$(EXE) nqptap$(EXE)
+ $(CHMOD) 0755 nqptap$(EXE)
-src/plparrot$(EXE): Makefile src/plparrot.pbc src/lib/Metadata.pbc src/lib/Util.pbc src/lib/Glue.pbc
- $(PBC_TO_EXE) src/plparrot.pbc
+src/nqptap$(EXE): Makefile src/nqptap.pbc src/lib/Metadata.pbc src/lib/Util.pbc src/lib/Glue.pbc
+ $(PBC_TO_EXE) src/nqptap.pbc
.SUFFIXES: .nqp .pir .pbc
@@ -60,8 +60,8 @@ realclean: clean
clean: FORCE
$(RM_F) "*~" "src/lib/*.pbc" "src/*.pbc" "src/*$(O)" "src/*.c" \
- src/lib/Util.pir src/lib/Metadata.pir src/plparrot.pir \
- src/plparrot$(EXE) plparrot$(EXE) Makefile
+ src/lib/Util.pir src/lib/Metadata.pir src/nqptap.pir \
+ src/nqptap$(EXE) nqptap$(EXE) Makefile
test: FORCE
$(PARROT_NQP) t/harness t/*.t

0 comments on commit c0579bc

Please sign in to comment.
Something went wrong with that request. Please try again.