Skip to content

Commit 360b343

Browse files
committed
revert file names to no mumber prefix
1 parent 567e623 commit 360b343

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SELINUX_OPT := $(shell [ $(DOCKER_SELINUX_LABEL) -eq 1 ] && echo "$(COL
1414

1515
html: gen-pod6-source bigpage htmlify
1616

17-
htmlify: init-highlights assets
17+
htmlify: gen-pod6-source init-highlights assets
1818
perl6 htmlify.p6
1919

2020
gen-pod6-source:
@@ -38,7 +38,7 @@ assets:
3838
webdev-build:
3939
perl6 htmlify.p6 --no-highlight --sparse=200
4040

41-
bigpage:
41+
bigpage: gen-pod6-source
4242
pod2onepage --html -v --source-path=./build --exclude=404.pod6 > html/perl6.html
4343

4444
# Common tests that are run by travis with every commit
@@ -127,9 +127,13 @@ clean-search:
127127
clean-build:
128128
find build -name "*.pod6" -exec rm -f {} \;
129129

130-
clean: clean-html clean-images clean-search
130+
remove-build:
131+
rm -rf build
132+
133+
clean: clean-html clean-images clean-search clean-build
134+
135+
distclean: clean remove-build
131136

132-
distclean: clean
133137

134138
test-links: links.txt
135139
./util/test-links.sh

util/manage-page-order.p6

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,39 +58,29 @@ sub do-update () {
5858

5959
# FIRST
6060
# write the auto-generated pod6 files used for the Language page
61+
=begin comment
62+
# visit later
6163
write-Language-files();
64+
=end comment
6265

6366
# THEN
6467
# copy all under the doc dir to the build dir
6568
# NOTE this assumes the sort order is alpha by file name
6669
# NOTE we exclude the Language dir
70+
=begin comment
71+
# visit later
6772
copy-dir-tree(:fromdir('doc'), :todir('build'), :exclude('Language'));
73+
=end comment
74+
copy-dir-tree :fromdir('doc'), :todir('build');
6875
}
6976

70-
=begin comment
71-
sub copy-other-dirs-and-files(*@doc-subdirs) {
72-
# The arguments are subdir names under 'doc' and
73-
# the complete subdir trees are to be copied as
74-
# subdir trees under 'build'.
75-
76-
for @doc-subdirs -> $sdir {
77-
say "DEBUG: working subdir tree '$sdir'" if $debug;
78-
79-
# recursively copy tree to another tree
80-
my $fromdir = "doc/$sdir"; # complete path
81-
my $todir = "build/$sdir";
82-
copy-dir-tree(:$fromdir, :$todir, :$exclude);
83-
}
84-
}
85-
=end comment
86-
8777
sub copy-dir-tree(:$fromdir, :$todir, :$exclude) {
8878
# recursively copy tree to another tree
8979
return if !$fromdir.IO.d;
9080

9181
say "DEBUG: \$fromdir: '$fromdir', \$exclude: '$exclude'" if $debug;
9282
# skip some dirs, e.g., Language
93-
return if $fromdir ~~ /$exclude/;
83+
return if $exclude && $fromdir ~~ /$exclude/;
9484

9585
# create the target dir if need be
9686
mkdir $todir if !$todir.IO.d;

0 commit comments

Comments
 (0)