From 25725a6c25d53a8b0427c23d2c592f1692d4e7a6 Mon Sep 17 00:00:00 2001 From: pmichaud Date: Fri, 27 Jan 2012 14:20:38 -0600 Subject: Update Makefile to download modules again; remove obsolete build/ scripts. --- Makefile | 1 + skel/build/Makefile.in | 159 ----------------------------------------------- skel/build/gen_parrot.pl | 65 ------------------- 3 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 skel/build/Makefile.in delete mode 100644 skel/build/gen_parrot.pl diff --git a/Makefile b/Makefile index 34ed8b6..51326e2 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,7 @@ DISTTARGETS = \ $(PARROT_DIR) \ $(NQP_DIR) \ $(RAKUDO_DIR) \ + $(MODULES_DIR) \ star-patches \ $(DISTDIR)/MANIFEST \ diff --git a/skel/build/Makefile.in b/skel/build/Makefile.in deleted file mode 100644 index 8e0e683..0000000 --- a/skel/build/Makefile.in +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright (C) 2006-2010, The Perl Foundation. -# $Id$ - -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@ - -# rakudo directories -DYNEXT_DIR = dynext -PMC_DIR = src/pmc -OPS_DIR = src/ops -PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 -MANDIR = @mandir@ -DOCDIR = @prefix@/share/doc - -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 --parrot-config=$(PARROT_CONFIG) && $(MAKE) -rakudo-test: rakudo/perl6 - cd rakudo && $(MAKE) test -rakudo-spectest: rakudo/perl6 - 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) 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) diff --git a/skel/build/gen_parrot.pl b/skel/build/gen_parrot.pl deleted file mode 100644 index 1cbb51f..0000000 --- a/skel/build/gen_parrot.pl +++ /dev/null @@ -1,65 +0,0 @@ -#! perl -# Copyright (C) 2009 The Perl Foundation - -=head1 TITLE - -gen_parrot.pl - script to obtain and build Parrot for Rakudo - -=head2 SYNOPSIS - - perl gen_parrot.pl [--parrot --configure=options] - -=head2 DESCRIPTION - -Maintains an appropriate copy of Parrot in the parrot/ subdirectory. -The revision of Parrot to be used in the build is given by the -build/PARROT_REVISION file. - -=cut - -use strict; -use warnings; -use 5.008; - -# Work out slash character to use. -my $slash = $^O eq 'MSWin32' ? '\\' : '/'; - -chdir('parrot-3.6.0') || die "Can't chdir to 'parrot-3.6.0': $!"; - -## If we have a Makefile from a previous build, do a 'make realclean' -if (-f 'Makefile') { - my %config = read_parrot_config(); - my $make = $config{'make'}; - if ($make) { - print "\nPerforming '$make realclean' ...\n"; - system_or_die($make, "realclean"); - } -} - -print "\nConfiguring Parrot ...\n"; -my @config_command = ($^X, 'Configure.pl', @ARGV); -print "@config_command\n"; -system_or_die( @config_command ); - -print "\nBuilding Parrot ...\n"; -my %config = read_parrot_config(); -my $make = $config{'make'} or exit(1); -system_or_die($make, 'install-dev'); - -sub read_parrot_config { - my %config = (); - if (open my $CFG, "config_lib.pir") { - while (<$CFG>) { - if (/P0\["(.*?)"], "(.*?)"/) { $config{$1} = $2 } - } - close $CFG; - } - %config; -} - -sub system_or_die { - my @cmd = @_; - - system( @cmd ) == 0 - or die "Command failed (status $?): @cmd\n"; -} -- cgit v1.1