Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'origin/master'

Conflicts:
	bin/ufo
  • Loading branch information...
commit b6879d6c83a6e3fcdbcc4a4cc8c8f7d5f676953d 2 parents 4c9b9f2 + 89c892c
@moritz moritz authored
Showing with 5 additions and 7 deletions.
  1. +1 −0  .gitignore
  2. +4 −7 bin/ufo
View
1  .gitignore
@@ -0,0 +1 @@
+Makefile
View
11 bin/ufo
@@ -5,7 +5,6 @@ sub makefile_template() {
return q{
.PHONY: all build test install clean distclean purge
-UFO := $(shell which ufo)
PERL6 = $binary
PREFIX = ~/.perl6
BLIB = blib
@@ -23,9 +22,6 @@ TESTS = $(shell if [ -d 't' ]; then find t -name '*.t'; fi)
all:: build
-Makefile:: $(UFO)
- ufo
-
build:: $(BLIB_PIRS) $(BLIB_PMS)
$(BLIB)/%.pm:: %.pm
@@ -45,10 +41,10 @@ $(BLIB)/%.pir:: %.pm6
env PERL6LIB=$(P6LIB) $(PERL6) --target=pir --output=$@ $<
test:: build
- env PERL6LIB=$(P6LIB) prove -e '$(PERL6)' -r --nocolor t/
+ env PERL6LIB=$(P6LIB) prove -e '$(PERL6)' -r t/
$(TESTS):: build
- env PERL6LIB=$(P6LIB) prove -v -e '$(PERL6)' -r --nocolor $@
+ env PERL6LIB=$(P6LIB) prove -v -e '$(PERL6)' -r $@
install:: build $(INSTALL_SOURCES) $(INSTALL_PIRS) $(INSTALL_SCRIPTS)
@@ -95,6 +91,7 @@ sub MAIN($filename = 'Makefile', Bool :$alpha) {
.subst('$sources', $sources)\
.subst('$scripts', $scripts)
);
+ $makefile.close;
}
sub get_scripts() {
@@ -114,7 +111,7 @@ sub get_sources() {
split "\n",
qx[find lib -name \*.pm -or -name \*.pm6];
- # To know the best order of compilation, we build a dependency graph of
+ # To know the best order of compilation, we build a dependency graph of
# all the modules in lib/. %usages_of ends up containing a graph, with
# the keys (containing names modules) being nodes, and the values
# (containing arrays of names) denoting directed edges.
Please sign in to comment.
Something went wrong with that request. Please try again.