Skip to content
Browse files

Merge one_make branch into trunk.

git-svn-id: https://svn.parrot.org/parrot/trunk@43593 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
2 parents 6ea4f14 + 67f4095 commit ca43d9c3920d9e3b92f4d5475be1b7f3b4715d7b @jkeenan jkeenan committed
Showing with 251 additions and 7 deletions.
  1. +18 −0 Defines.mak
  2. +226 −0 Rules.mak
  3. +1 −1 t/basic.t
  4. +2 −2 t/harness
  5. +1 −1 t/heredoc.t
  6. +1 −1 t/macro.t
  7. +1 −1 t/stmts.t
  8. +1 −1 t/subflags.t
View
18 Defines.mak
@@ -0,0 +1,18 @@
+PIRC_O_FILES = \
+ compilers/pirc/src/main$(O) \
+ compilers/pirc/src/pirparser$(O) \
+ compilers/pirc/src/pirlexer$(O) \
+ compilers/pirc/src/pircompunit$(O) \
+ compilers/pirc/src/pircompiler$(O) \
+ compilers/pirc/src/pirsymbol$(O) \
+ compilers/pirc/src/piremit$(O) \
+ compilers/pirc/src/hdocprep$(O) \
+ compilers/pirc/src/pirmacro$(O) \
+ compilers/pirc/src/pirregalloc$(O) \
+ compilers/pirc/src/bcgen$(O) \
+ compilers/pirc/src/pirpcc$(O) \
+ compilers/pirc/src/pirerr$(O) \
+ compilers/pirc/src/pircapi$(O) \
+ compilers/pirc/src/pirop$(O)
+
+PIRC_CLEANUPS = $(PIRC_O_FILES) "compilers/pirc/t/*.pir" ./pirc$(EXE)
View
226 Rules.mak
@@ -0,0 +1,226 @@
+compilers/pirc/src/piremit$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ $(INC_DIR)/embed.h \
+ $(INC_DIR)/oplib/ops.h
+
+compilers/pirc/src/pirparser$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirerr$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/bcgen$(O) : \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h \
+ include/pmc/pmc_sub.h \
+ include/pmc/pmc_namespace.h
+
+compilers/pirc/src/pirregalloc$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/heredoc/heredocmain$(O) : $(PARROT_H_HEADERS)
+
+compilers/pirc/macro/macrolexer$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/macro/macro.h \
+ compilers/pirc/macro/lexer.h \
+ compilers/pirc/macro/macroparser.h
+
+compilers/pirc/macro/macroparser$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/macro/macro.h \
+ compilers/pirc/macro/lexer.h \
+ compilers/pirc/macro/macroparser.h \
+ compilers/pirc/macro/macrolexer.h
+
+compilers/pirc/src/hdocprep$(O) : $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h compilers/pirc/src/pirheredoc.h
+
+compilers/pirc/src/main$(O) : \
+ $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirheredoc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pircapi.h
+
+compilers/pirc/src/pircapi$(O) : \
+ $(PARROT_H_HEADERS) \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pircapi.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pircompiler$(O) : \
+ compilers/pirc/src/pircompiler.h \
+ $(PARROT_H_HEADERS) \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirdefines.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pircompunit$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/dynext.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirlexer$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirmacro$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirop$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirpcc$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirsymbol$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+# the all here is too broad, but the separate pirc.exe is going away soonish.
+pirc$(EXE): $(PIRC_O_FILES) all
+ $(LINK) $(LD_OUT) $@ \
+ $(PIRC_O_FILES) \
+ $(RPATH_BLIB) $(ALL_PARROT_LIBS) $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
+
+compilers/pirc/src/pir.y.flag compilers/pirc/src/pirparser.c compilers/pirc/src/pirparser.h : compilers/pirc/src/pir.y
+ $(YACC) compilers/pirc/src/pir.y -d -o compilers/pirc/src/pirparser.c
+ $(TOUCH) compilers/pirc/src/pir.y.flag compilers/pirc/src/pirparser.c compilers/pirc/src/pirparser.h
+
+compilers/pirc/src/pir.l.flag compilers/pirc/src/pirlexer.c : compilers/pirc/src/pir.l
+ $(LEX) -o compilers/pirc/src/pirlexer.c compilers/pirc/src/pir.l
+ $(TOUCH) compilers/pirc/src/pir.l.flag compilers/pirc/src/pirlexer.c
+
+# XXX This should eventually be combined with the standard parrot test suite.
+pirc-test: all
+ $(PERL) compilers/pirc/t/harness
View
2 t/basic.t
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 6;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a local, a reg and an if-stat");
View
4 t/harness
@@ -5,11 +5,11 @@
use strict;
use warnings;
-use lib '../../lib';
+use lib qw(lib);
use Test::Harness;
-my @tests = @ARGV ? @ARGV : <t/*.t>;
+my @tests = @ARGV ? @ARGV : <compilers/pirc/t/*.t>;
eval { require TAP::Harness };
if ($@) {
View
2 t/heredoc.t
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");
View
2 t/macro.t
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");
View
2 t/stmts.t
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 5;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a simple sub call - no params");
View
2 t/subflags.t
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");

0 comments on commit ca43d9c

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