From b5588c2c0f511effe3197794217308c55c7a1491 Mon Sep 17 00:00:00 2001 From: pmichaud Date: Fri, 27 Jan 2012 14:15:34 -0600 Subject: Update Configure.pl and Makefile.in for new configuration. --- skel/Configure.pl | 2 +- skel/tools/build/Makefile.in | 155 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 skel/tools/build/Makefile.in diff --git a/skel/Configure.pl b/skel/Configure.pl index 3f08535..7dafab4 100644 --- a/skel/Configure.pl +++ b/skel/Configure.pl @@ -64,7 +64,7 @@ MAIN: { my $gen_nqp = $options{'gen-nqp'}; # determine the version of NQP we want - my ($nqp_want) = split(' ', slurp('tools/build/NQP_REVISION')); + my ($nqp_want) = split(' ', slurp('rakudo-2012.01/tools/build/NQP_REVISION')); if (defined $gen_nqp) { $with_nqp = gen_nqp($nqp_want, %options); diff --git a/skel/tools/build/Makefile.in b/skel/tools/build/Makefile.in new file mode 100644 index 0000000..02b0c1f --- /dev/null +++ b/skel/tools/build/Makefile.in @@ -0,0 +1,155 @@ +# Copyright (C) 2006-2010, The Perl Foundation. +# $Id$ + +PARROT = parrot-3.11.0 +NQP = nqp-2012.01 +RAKUDO = rakudo-2012.01 + +PARROT_ARGS = + +# values from parrot_config +PARROT_BIN_DIR = @bindir@ +PARROT_VERSION = @versiondir@ +PARROT_INCLUDE_DIR = @includedir@$(PARROT_VERSION) +PARROT_LIB_DIR = @libdir@$(PARROT_VERSION) +PARROT_SRC_DIR = @srcdir@$(PARROT_VERSION) +HAS_ICU = @has_icu@ + +CC = @cc@ +CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @gc_flag@ +EXE = @exe@ +LD = @ld@ +LDFLAGS = @ldflags@ @ld_debug@ +LD_LOAD_FLAGS = @ld_load_flags@ +LIBPARROT = @inst_libparrot_ldflags@ +O = @o@ +LOAD_EXT = @load_ext@ +PERL = @perl@ +CP = @cp@ +MV = @mv@ +RM_F = @rm_f@ +MKPATH = $(PERL) -MExtUtils::Command -e mkpath +CHMOD = $(PERL) -MExtUtils::Command -e chmod +POD2MAN = @pod2man@ + +# locations of parrot resources +PARROT = $(PARROT_BIN_DIR)/parrot$(EXE) +NQP_EXE = $(PARROT_BIN_DIR)/nqp$(EXE) +PBC_TO_EXE = $(PARROT_BIN_DIR)/pbc_to_exe$(EXE) +PARROT_CONFIG = $(PARROT_BIN_DIR)/parrot_config$(EXE) +PARROT_TOOLS_DIR = $(PARROT_LIB_DIR)/tools +PARROT_PERL_LIB = $(PARROT_TOOLS_DIR)/lib +OPS2C = $(PARROT_BIN_DIR)/ops2c$(EXE) +PMC2C = $(PERL) $(PARROT_TOOLS_DIR)/build/pmc2c.pl +PMC2C_INCLUDES = --include src/pmc --include $(PARROT_SRC_DIR) --include $(PARROT_SRC_DIR)/pmc +CINCLUDES = -I$(PARROT_INCLUDE_DIR) -I$(PARROT_INCLUDE_DIR)/pmc +LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@ + +PERL6_EXE = perl6$(EXE) +PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 + +MODULES = \ + modules/zavolaj \ + modules/xml-writer \ + modules/svg \ + modules/svg-plot \ + modules/Math-RungeKutta \ + modules/Math-Model \ + modules/perl6-Term-ANSIColor \ + modules/test-mock \ + modules/Perl6-MIME-Base64 \ + modules/perl6-lwp-simple \ + modules/json \ + modules/perl6-digest-md5 \ + modules/perl6-File-Tools \ + modules/panda \ + modules/perl6-Config-INI \ + modules/perl6-http-easy \ + modules/Bailador \ + modules/MiniDBI + +all: rakudo + +rakudo: $(RAKUDO)/$(PERL6_EXE) +$(RAKUDO)/$(PERL6_EXE): + cd $(RAKUDO) && $(PERL) Configure.pl --with-nqp=$(NQP_EXE) && $(MAKE) +rakudo-test: rakudo + cd $(RAKUDO) && $(MAKE) test +rakudo-spectest: rakudo + cd $(RAKUDO) && $(MAKE) spectest +rakudo-install: rakudo + cd $(RAKUDO) && $(MAKE) install + @win32_libparrot_copy@ + $(CP) $(DESTDIR)$(PARROT_BIN_DIR)/$(PERL6_EXE) . + $(CHMOD) 755 $(PERL6_EXE) + +modules-install: rakudo + @echo "Installing 'ufo'" + $(CP) modules/ufo/bin/ufo $(DESTDIR)$(PARROT_BIN_DIR)/ufo + $(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/ufo + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PARROT_BIN_DIR)/$(PERL6_EXE) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES) + @echo "Installing 'ufobuilder'" + $(CP) modules/panda/bin/ufobuilder $(DESTDIR)$(PARROT_BIN_DIR)/ufobuilder + $(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/ufobuilder + @echo "Installing 'panda'" + $(CP) modules/panda/bin/panda $(DESTDIR)$(PARROT_BIN_DIR)/panda + $(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/panda + +install: rakudo-install modules-install + +test: + @echo "" + @echo "To run the Rakudo compiler tests, use 'make rakudo-test'" + @echo "To run the Perl 6 spectests, use 'make rakudo-spectest'" + @echo "" + @echo "To run tests for individual modules, try:" + @echo " prove -e ./perl6 -r modules//t" + @echo "" + +## cleaning +clean: + $(RM_F) $(CLEANUPS) + +distclean: realclean + +realclean: clean + $(RM_F) Makefile + +testclean: + + +## miscellaneous targets +# a listing of all targets meant to be called by users +help: + @echo "" + @echo "Following targets are available for the user:" + @echo "" + @echo "Maintenance:" + @echo " perlcritic: Run Perl::Critic on all the Perl 5 code." + @echo "" + @echo "Cleaning:" + @echo " clean: Basic cleaning up." + @echo " distclean: Removes also anything built, in theory." + @echo " realclean: Removes also files generated by 'Configure.pl'." + @echo " testclean: Clean up test results." + @echo "" + @echo "Misc:" + @echo " help: Print this help message." + @echo "" + +config: + $(PERL) Configure.pl + +$(PARROT): + +CRITIC_FILES=Configure.pl build/ + +perlcritic: + perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES) + +release: MANIFEST + [ -n "$(VERSION)" ] || ( echo "\nTry 'make release VERSION=yyyy.mm'\n\n"; exit 1 ) + [ -d rakudo-star-$(VERSION) ] || ln -s . rakudo-star-$(VERSION) + $(PERL) -ne 'print "rakudo-star-$(VERSION)/$$_"' MANIFEST | \ + tar -zcv -T - -f rakudo-star-$(VERSION).tar.gz + rm rakudo-star-$(VERSION) -- cgit v1.1