[svn:languages] r47 - in lolcode/trunk: . config/makefiles
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Wed Mar 11 11:08:33 UTC 2009
Author: fperrad
Date: Wed Mar 11 11:08:32 2009
New Revision: 47
URL: https://trac.parrot.org/languages/changeset/47
Log:
[LOLCODE] re-run mk_language_shell.pl
Now works with an installed Parrot.
Modified:
lolcode/trunk/ (props changed)
lolcode/trunk/Configure.pl
lolcode/trunk/config/makefiles/root.in
Modified: lolcode/trunk/Configure.pl
==============================================================================
--- lolcode/trunk/Configure.pl Wed Mar 11 10:44:48 2009 (r46)
+++ lolcode/trunk/Configure.pl Wed Mar 11 11:08:32 2009 (r47)
@@ -5,13 +5,57 @@
use warnings;
use 5.008;
-my $build_dir = '../..';
-my $hll = 'lolcode';
-my $cmd = qq{$^X -Ilib tools/dev/reconfigure.pl --step=gen::languages --languages=$hll};
-
-print "Running '$cmd' in $build_dir\n";
-chdir $build_dir;
-`$cmd`
+# Get a list of parrot-configs to invoke.
+my @parrot_config_exe = (
+ 'parrot/parrot_config',
+ '../../parrot_config',
+ 'parrot_config',
+);
+
+# Get configuration information from parrot_config
+my %config = read_parrot_config(@parrot_config_exe);
+unless (%config) {
+ die "Unable to locate parrot_config.";
+}
+
+# Create the Makefile using the information we just got
+create_makefiles(%config);
+
+sub read_parrot_config {
+ my @parrot_config_exe = @_;
+ my %config = ();
+ for my $exe (@parrot_config_exe) {
+ no warnings;
+ if (open my $PARROT_CONFIG, '-|', "$exe --dump") {
+ print "Reading configuration information from $exe\n";
+ while (<$PARROT_CONFIG>) {
+ $config{$1} = $2 if (/(\w+) => '(.*)'/);
+ }
+ close $PARROT_CONFIG;
+ last if %config;
+ }
+ }
+ %config;
+}
+
+
+# Generate Makefiles from a configuration
+sub create_makefiles {
+ my %config = @_;
+ my %makefiles = (
+ 'config/makefiles/root.in' => 'Makefile',
+# 'config/makefiles/pmc.in' => 'src/pmc/Makefile',
+# 'config/makefiles/ops.in' => 'src/ops/Makefile',
+ );
+ my $build_tool = $config{libdir} . $config{versiondir}
+ . '/tools/dev/gen_makefile.pl';
+
+ foreach my $template (keys %makefiles) {
+ my $makefile = $makefiles{$template};
+ print "Creating $makefile\n";
+ system($config{perl}, $build_tool, $template, $makefile);
+ }
+}
# Local Variables:
# mode: cperl
Modified: lolcode/trunk/config/makefiles/root.in
==============================================================================
--- lolcode/trunk/config/makefiles/root.in Wed Mar 11 10:44:48 2009 (r46)
+++ lolcode/trunk/config/makefiles/root.in Wed Mar 11 11:08:32 2009 (r47)
@@ -2,83 +2,97 @@
## $Id$
## arguments we want to run parrot with
-PARROT_ARGS =
+PARROT_ARGS :=
## configuration settings
-BUILD_DIR = @build_dir@
-LOAD_EXT = @load_ext@
-O = @o@
-EXE = @exe@
+VERSION := @versiondir@
+BIN_DIR := @bin_dir@
+LIB_DIR := @lib_dir@$(VERSION)
+DOC_DIR := @doc_dir@$(VERSION)
+MANDIR := @mandir@$(VERSION)
+
+# Set up extensions
+LOAD_EXT := @load_ext@
+O := @o@
+
+# Various paths
+PERL6GRAMMAR := $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
+NQP := $(LIB_DIR)/languages/nqp/nqp.pbc
+PCT := $(LIB_DIR)/library/PCT.pbc
## Setup some commands
-PERL = @perl@
-RM_RF = @rm_rf@
-PARROT = ../../parrot$(EXE)
-CAT = @cat@
-BUILD_DYNPMC = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
-#CONDITIONED_LINE(darwin):
-#CONDITIONED_LINE(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
-#CONDITIONED_LINE(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
-
-## places to look for things
-PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
-PGE_LIBRARY = $(BUILD_DIR)/runtime/parrot/library/PGE
-PERL6GRAMMAR = $(PGE_LIBRARY)/Perl6Grammar.pbc
-NQP = $(BUILD_DIR)/compilers/nqp/nqp.pbc
-PCT = $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
-PBC_TO_EXE = $(BUILD_DIR)/pbc_to_exe$(EXE)
+MAKE := @make_c@
+PERL := @perl@
+CAT := @cat@
+CHMOD := @chmod@
+CP := @cp@
+MKPATH := @mkpath@
+RM_F := @rm_f@
+RM_RF := @rm_rf@
+POD2MAN := pod2man
+#IF(parrot_is_shared and not(cygwin or win32)):export LD_RUN_PATH := @blib_dir@:$(LD_RUN_PATH)
+PARROT := $(BIN_DIR)/parrot at exe@
+PBC_TO_EXE := $(BIN_DIR)/pbc_to_exe at exe@
+#IF(darwin):
+#IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
+#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
-PMC_DIR = src/pmc
-
-all: lolcode.pbc
-
-LOLCODE_GROUP = $(PMC_DIR)/lolcode_group$(LOAD_EXT)
-
-SOURCES = lolcode.pir \
+SOURCES := \
src/gen_grammar.pir \
src/gen_actions.pir \
src/gen_builtins.pir \
src/parser/yarn_literal.pir \
-# $(LOLCODE_GROUP)
+ lolcode.pir
-BUILTINS_PIR = \
+BUILTINS_PIR := \
src/builtins/say.pir \
src/builtins/expr_parse.pir \
src/builtins/math.pir \
src/builtins/cmp.pir
-# PMCS = lolcode
-# PMC_SOURCES = $(PMC_DIR)/lolcode.pmc
+DOCS := README
-lolcode$(EXE): lolcode.pbc
- $(PBC_TO_EXE) lolcode.pbc
+BUILD_CLEANUPS := \
+ lolcode.pbc \
+ "src/gen_*.pir" \
+ "*.c" \
+ "*$(O)" \
+ lolcode at exe@ \
+#IF(win32): parrot-lolcode.exe \
+#IF(win32): parrot-lolcode.iss \
+#IF(win32): "setup-parrot-*.exe" \
+ installable_lolcode at exe@
-installable_lolcode$(EXE): lolcode.pbc
- $(PBC_TO_EXE) lolcode.pbc --install
+TEST_CLEANUPS :=
# the default target
-lolcode.pbc: $(PARROT) $(SOURCES)
+build: lolcode.pbc
+
+all: build lolcode at exe@ installable
+
+lolcode.pbc: $(SOURCES)
$(PARROT) $(PARROT_ARGS) -o lolcode.pbc lolcode.pir
+lolcode at exe@: lolcode.pbc
+ $(PBC_TO_EXE) lolcode.pbc
+
src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
--output=src/gen_grammar.pir \
src/parser/grammar.pg
-src/gen_actions.pir: $(NQP) $(PCT) src/parser/actions.pm
+src/gen_actions.pir: $(NQP) src/parser/actions.pm
$(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \
--target=pir src/parser/actions.pm
src/gen_builtins.pir: $(BUILTINS_PIR)
- $(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
+ $(CAT) $(BUILTINS_PIR) > src/gen_builtins.pir
-$(LOLCODE_GROUP): $(PARROT) $(PMC_SOURCES)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) generate $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) compile $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
+installable: installable_lolcode at exe@
+
+installable_lolcode at exe@: lolcode.pbc
+ $(PBC_TO_EXE) lolcode.pbc --install
-# regenerate the Makefile
Makefile: config/makefiles/root.in
$(PERL) Configure.pl
@@ -87,10 +101,16 @@
@echo ""
@echo "Following targets are available for the user:"
@echo ""
- @echo " all: lolcode.pbc"
+ @echo " build: lolcode.pbc"
@echo " This is the default."
+ @echo " lolcode at exe@ Self-hosting binary not to be installed."
+ @echo " all: lolcode.pbc lolcode at exe@ installable"
+ @echo " installable: Create libs and self-hosting binaries to be installed."
+ @echo " install: Install the installable targets and docs."
+ @echo ""
@echo "Testing:"
@echo " test: Run the test suite."
+ @echo " test-installable: Test self-hosting targets."
@echo " testclean: Clean up test results."
@echo ""
@echo "Cleaning:"
@@ -102,41 +122,46 @@
@echo " help: Print this help message."
@echo ""
-test: all
- $(PERL) t/harness
+test: build
+ $(PERL) -I$(LIB_DIR)/tools/lib t/harness
-# this target has nothing to do
-testclean:
-
-CLEANUPS = \
- lolcode.pbc \
- lolcode.c \
- lolcode.ilk \
- *.manifest \
- *.pdb \
- lolcode$(O) \
- lolcode$(EXE) \
- installable_lolcode$(EXE) \
- src/gen_grammar.pir \
- src/gen_actions.pir \
- src/gen_builtins.pir \
- $(PMC_DIR)/*.h \
- $(PMC_DIR)/*.c \
- $(PMC_DIR)/*.dump \
- $(PMC_DIR)/*$(O) \
- $(PMC_DIR)/*$(LOAD_EXT) \
- $(PMC_DIR)/*.exp \
- $(PMC_DIR)/*.ilk \
- $(PMC_DIR)/*.manifest \
- $(PMC_DIR)/*.pdb \
- $(PMC_DIR)/*.lib \
+# basic run for missing libs
+test-installable: installable
+ echo "1" | ./installable_lolcode at exe@
+
+install: installable
+ $(CP) installable_lolcode at exe@ $(BIN_DIR)/parrot-lolcode at exe@
+ $(CHMOD) 0755 $(BIN_DIR)/parrot-lolcode at exe@
+ -$(MKPATH) $(LIB_DIR)/languages/lolcode
+ $(CP) lolcode.pbc $(LIB_DIR)/languages/lolcode/lolcode.pbc
+# -$(MKPATH) $(MANDIR)/man1
+# $(POD2MAN) doc/running.pod > $(MANDIR)/man1/parrot-lolcode.1
+# -$(MKPATH) $(DOC_DIR)/languages/lolcode
+# $(CP) $(DOCS) $(DOC_DIR)/languages/lolcode
+
+uninstall:
+ $(RM_F) $(BIN_DIR)/parrot-lolcode at exe@
+ $(RM_RF) $(LIB_DIR)/languages/lolcode
+# $(RM_F) $(MANDIR)/man1/parrot-lolcode.1
+# $(RM_RF) $(DOC_DIR)/languages/lolcode
+
+win32-inno-installer: installable
+# -$(MKPATH) man/man1
+# $(POD2MAN) doc/running.pod > man/man1/parrot-lolcode.1
+# -$(MKPATH) man/html
+# pod2html --infile doc/running.pod --outfile man/html/parrot-lolcode.html
+ $(CP) installable_lolcode at exe@ parrot-lolcode.exe
+ $(PERL) $(LIB_DIR)/tools/dev/mk_inno_language.pl lolcode
+ iscc parrot-lolcode.iss
+testclean:
+ $(RM_F) $(TEST_CLEANUPS)
clean:
- $(RM_RF) $(CLEANUPS)
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS)
-realclean: clean
- $(RM_RF) Makefile
+realclean:
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) Makefile
distclean: realclean
@@ -144,3 +169,4 @@
# mode: makefile
# End:
# vim: ft=make:
+
More information about the parrot-commits
mailing list