Author: pmichaud
Date: Thu Oct 4 23:53:49 2007
New Revision: 21879
Removed:
trunk/compilers/pge/PGE/pmc/
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/config/gen/makefiles/pge.in
Log:
[pge]:
* Remove codestring.pmc from compilers/pge (it's now in src/pmc).
* Resolves RT#45995.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Thu Oct 4 23:53:49 2007
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Oct 4 19:32:34 2007 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Oct 5 06:45:48 2007 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -110,7 +110,6 @@
compilers/pge/PGE/Perl6Regex.pir []
compilers/pge/PGE/Regex.pir []
compilers/pge/PGE/builtins.pg []
-compilers/pge/PGE/pmc/codestring.pmc []
compilers/pge/README.pod []
compilers/pge/STATUS []
compilers/pge/demo.pir []
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Thu Oct 4 23:53:49 2007
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Sep 24 18:00:46 2007 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Oct 5 06:45:48 2007 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -200,33 +200,6 @@
^compilers/pge/PGE/.*\.dll/
^compilers/pge/PGE/builtins_gen\.pir$
^compilers/pge/PGE/builtins_gen\.pir/
-# generated from svn:ignore of 'compilers/pge/PGE/pmc/'
-^compilers/pge/PGE/pmc/.*\.bundle$
-^compilers/pge/PGE/pmc/.*\.bundle/
-^compilers/pge/PGE/pmc/.*\.c$
-^compilers/pge/PGE/pmc/.*\.c/
-^compilers/pge/PGE/pmc/.*\.dll$
-^compilers/pge/PGE/pmc/.*\.dll/
-^compilers/pge/PGE/pmc/.*\.dump$
-^compilers/pge/PGE/pmc/.*\.dump/
-^compilers/pge/PGE/pmc/.*\.exp$
-^compilers/pge/PGE/pmc/.*\.exp/
-^compilers/pge/PGE/pmc/.*\.h$
-^compilers/pge/PGE/pmc/.*\.h/
-^compilers/pge/PGE/pmc/.*\.ilk$
-^compilers/pge/PGE/pmc/.*\.ilk/
-^compilers/pge/PGE/pmc/.*\.lib$
-^compilers/pge/PGE/pmc/.*\.lib/
-^compilers/pge/PGE/pmc/.*\.manifest$
-^compilers/pge/PGE/pmc/.*\.manifest/
-^compilers/pge/PGE/pmc/.*\.o$
-^compilers/pge/PGE/pmc/.*\.o/
-^compilers/pge/PGE/pmc/.*\.obj$
-^compilers/pge/PGE/pmc/.*\.obj/
-^compilers/pge/PGE/pmc/.*\.pdb$
-^compilers/pge/PGE/pmc/.*\.pdb/
-^compilers/pge/PGE/pmc/.*\.so$
-^compilers/pge/PGE/pmc/.*\.so/
# generated from svn:ignore of 'compilers/pirc/'
^compilers/pirc/Makefile$
^compilers/pirc/Makefile/
Modified: trunk/config/gen/makefiles/pge.in
==============================================================================
--- trunk/config/gen/makefiles/pge.in (original)
+++ trunk/config/gen/makefiles/pge.in Thu Oct 4 23:53:49 2007
@@ -7,23 +7,12 @@
PARROT = ../../[EMAIL PROTECTED]@
TOOL_DIR = ../..
CP = @cp@
-BUILD = $(PERL) @build_dir@/tools/build/dynpmc.pl
-O = @o@
-LOAD_EXT = @load_ext@
-PARROT_DYNEXT = @build_dir@/runtime/parrot/dynext
-PMCDIR = PGE/pmc
# Where to put things
PARROT_LIBRARY = ../../runtime/parrot/library
# the default target
-all: $(PMCDIR)/pge_group$(LOAD_EXT) $(PARROT_LIBRARY)/PGE.pbc
-
-PMCS = \
- codestring
-
-PMC_SOURCES = \
- $(PMCDIR)/codestring.pmc
+all: $(PARROT_LIBRARY)/PGE.pbc
SOURCES = PGE.pir \
PGE/Exp.pir \
@@ -46,12 +35,6 @@
$(PARROT) pgc.pir --output=PGE/builtins_gen.pir PGE/builtins.pg
$(PARROT) -o PGE.pbc --output-pbc PGE.pir
-$(PMCDIR)/pge_group$(LOAD_EXT): $(PARROT) $(PMC_SOURCES)
- (cd $(PMCDIR) && $(BUILD) generate $(PMCS))
- (cd $(PMCDIR) && $(BUILD) compile $(PMCS))
- (cd $(PMCDIR) && $(BUILD) linklibs $(PMCS))
- (cd $(PMCDIR) && $(BUILD) copy --destination=$(PARROT_DYNEXT) $(PMCS))
-
# This is a listing of all targets, that are meant to be called by users
help:
@echo ""
@@ -87,17 +70,7 @@
$(RM_RF) \
PGE.pbc \
$(PARROT_LIBRARY)/PGE.pbc \
- PGE/builtins_gen.pir \
- $(PMCDIR)/*.h \
- $(PMCDIR)/*.c \
- $(PMCDIR)/*.dump \
- $(PMCDIR)/*.pdb \
- $(PMCDIR)/*.lib \
- $(PMCDIR)/*.exp \
- $(PMCDIR)/*.ilk \
- $(PMCDIR)/*.manifest \
- $(PMCDIR)/*$(O) \
- $(PMCDIR)/*$(LOAD_EXT)
+ PGE/builtins_gen.pir
realclean: clean
$(RM_RF) Makefile