Ticket #1954: tt1954_first.diff
File tt1954_first.diff, 10.0 KB (added by jkeenan, 11 years ago) |
---|
-
MANIFEST
diff --git a/MANIFEST b/MANIFEST index 70b203b..21fb98d 100644
a b 223 223 config/gen/config_pm/myconfig.in [] 224 224 config/gen/core_pmcs.pm [] 225 225 config/gen/makefiles.pm [] 226 config/gen/makefiles/docs.in []227 226 config/gen/makefiles/editor.in [] 228 227 config/gen/makefiles/ext.in [] 228 config/gen/makefiles/html.in [] 229 229 config/gen/makefiles/parrot_embed_pl.in [] 230 230 config/gen/makefiles/parrot_pc.in [] 231 231 config/gen/makefiles/root.in [] -
config/auto/perldoc.pm
diff --git a/config/auto/perldoc.pm b/config/auto/perldoc.pm index 8ff8465..d210422 100644
a b 46 46 47 47 _handle_version($conf, $version, $cmd); 48 48 49 my $TEMP_pod_build = <<'E_NOTE';50 51 # the following part of the Makefile was built by 'config/auto/perldoc.pm'52 53 E_NOTE54 55 opendir my $OPS, 'src/ops' or die "opendir ops: $!";56 my @ops = sort grep { !/^\./ && /\.ops$/ } readdir $OPS;57 closedir $OPS;58 59 my $TEMP_pod = join q{ } =>60 map { my $t = $_; $t =~ s/\.ops$/.pod/; "ops/$t" } @ops;61 62 my $new_perldoc = $conf->data->get('new_perldoc');63 64 foreach my $ops (@ops) {65 my $pod = $ops;66 $pod =~ s/\.ops$/.pod/;67 if ( $new_perldoc ) {68 $TEMP_pod_build .= <<"END"69 ops/$pod: ../src/ops/$ops70 \t\$(PERLDOC_BIN) -ud ops/$pod ../src/ops/$ops71 \t\$(CHMOD) 0644 ops/$pod72 73 END74 }75 else {76 $TEMP_pod_build .= <<"END"77 ops/$pod: ../src/ops/$ops78 \t\$(PERLDOC_BIN) -u ../ops/$ops > ops/$pod79 \t\$(CHMOD) 0644 ../ops/$pod80 81 END82 }83 }84 85 $conf->data->set(86 TEMP_pod => $TEMP_pod,87 TEMP_pod_build => $TEMP_pod_build,88 );89 90 49 return 1; 91 50 } 92 51 … … 98 57 has_perldoc => 0, 99 58 new_perldoc => 0, 100 59 perldoc => 'echo', 101 TEMP_pod => '',102 TEMP_pod_build => '',103 60 ); 104 61 $self->set_result('no'); 105 62 return; -
config/gen/makefiles.pm
diff --git a/config/gen/makefiles.pm b/config/gen/makefiles.pm index 0be30c9..4de7a0e 100644
a b 15 15 use strict; 16 16 use warnings; 17 17 18 19 18 use base qw(Parrot::Configure::Step); 20 19 21 20 use Parrot::Configure::Utils ':gen'; … … 57 56 { SOURCE => 'config/gen/makefiles/editor.in' }, 58 57 59 58 'parrot.pc' => { SOURCE => 'config/gen/makefiles/parrot_pc.in' }, 60 ' docs/Makefile' => { SOURCE => 'config/gen/makefiles/docs.in' },59 'html/Makefile' => { SOURCE => 'config/gen/makefiles/html.in' }, 61 60 }; 62 61 return \%data; 63 62 } … … 85 84 foreach my $target (@targets) { 86 85 my $args = $self->{makefiles}->{$target}; 87 86 my $source = delete $args->{SOURCE}; 88 89 87 $conf->genfile($source => $target, %$args ); 90 88 } 91 89 return; -
(a) a/config/gen/makefiles/docs.in vs. (b) /dev/null
diff --git a/config/gen/makefiles/docs.in b/config/gen/makefiles/docs.in deleted file mode 100644 index 4965daa..0000000
a b 1 # Copyright (C) 2001-2010, Parrot Foundation.2 3 # Setup of some commands4 PERL = @perl@5 CHMOD = @chmod@6 MKPATH = @mkpath@7 TOUCH = @touch@8 RM_F = @rm_f@9 RM_RF = @rm_rf@10 PERLDOC_BIN = @perldoc@11 VERSION = @VERSION@@DEVEL@12 13 # long list of .pod files14 POD = @TEMP_pod@15 16 #17 # Targets18 #19 20 # The default target21 all: packfile-c.pod $(POD)22 23 # This is a listing of all targets, that are meant to be called by users24 # Most of them are proxied in the root makefile parrot/Makefile25 help :26 @echo ""27 @echo "Following targets are available to the user:"28 @echo ""29 @echo "all: Generate documentation from .pod files or from the sources."30 @echo " This is the default target."31 @echo ""32 @echo "htmlhelp: windows only, generate a .chm file."33 @echo "htmlhelp-clean: Remove generated .chm"34 @echo ""35 @echo "pdf: Generate a PDF from the html docs"36 @echo "pdf-clean: Remove generated pdf"37 @echo ""38 @echo " clean: Remove the generated documentation."39 @echo ""40 41 $(POD): doc-prep42 43 doc-prep:44 $(MKPATH) ops45 $(TOUCH) doc-prep46 47 packfile-c.pod: ../src/packfile/api.c48 #IF(new_perldoc): $(PERLDOC_BIN) -ud packfile-c.pod ../src/packfile/api.c49 #ELSE: $(PERLDOC_BIN) -u ../src/packfile/api.c > packfile-c.pod50 51 clean:52 $(RM_F) packfile-c.pod $(POD) doc-prep53 54 html:55 $(PERL) -I../lib ../tools/docs/make_html_docs.pl --version=$(VERSION)56 html-clean:57 $(RM_RF) html58 59 # If you are missing the command 'pdflatex' then you have first to install a60 # LaTeX distribution with it. For Windows and UNIX downloads are for example61 # available from: http://miktex.org, http://tug.org/texlive or62 # http://www.ctan.org63 pdf: ../tools/docs/filename_and_chapter.pl64 $(MKPATH) build/modified_pod65 $(PERL) ../tools/docs/filename_and_chapter.pl66 cd build && pdflatex parrot-book.tex && pdflatex parrot-book.tex67 68 #pdf-release: build/parrot-book.pdf69 # cp build/parrot-book.pdf build/parrot-book-$$(date +"%Y.%m").pdf70 71 pdf-clean:72 $(RM_RF) build73 74 htmlhelp: html75 #IF(win32): cd .. && $(PERL) tools/docs/mk_chm.pl76 #IF(win32): -cd html && hhc parrot.hhp77 78 htmlhelp-clean:79 #IF(win32): $(RM_F) "html/*.hhc" "html/*.hhk" "html/*.hhp" "html/*.chm"80 81 @TEMP_pod_build@82 83 # Local variables:84 # mode: makefile85 # End:86 # vim: ft=make: -
(a) /dev/null vs. (b) b/config/gen/makefiles/html.in
diff --git a/config/gen/makefiles/html.in b/config/gen/makefiles/html.in new file mode 100644 index 0000000..d1cbb2b
a b 1 # Copyright (C) 2001-2010, Parrot Foundation. 2 3 # Setup of some commands 4 PERL = @perl@ 5 CHMOD = @chmod@ 6 MKPATH = @mkpath@ 7 TOUCH = @touch@ 8 RM_F = @rm_f@ 9 RM_RF = @rm_rf@ 10 PERLDOC_BIN = @perldoc@ 11 VERSION = @VERSION@@DEVEL@ 12 13 14 # 15 # Targets 16 # 17 18 # The default target 19 all: html 20 21 html: 22 $(PERL) -I../lib ../tools/docs/make_html_docs.pl --version=$(VERSION) 23 html-clean: 24 $(RM_RF) html 25 26 clean: html-clean 27 28 htmlhelp: html 29 #IF(win32): cd .. && $(PERL) tools/docs/mk_chm.pl 30 #IF(win32): -cd html && hhc parrot.hhp 31 32 htmlhelp-clean: 33 #IF(win32): $(RM_F) "html/*.hhc" "html/*.hhk" "html/*.hhp" "html/*.chm" 34 35 # This is a listing of all targets, that are meant to be called by users 36 # Most of them are proxied in the root makefile parrot/Makefile 37 help : 38 @echo "" 39 @echo "Following targets are available to the user:" 40 @echo "" 41 @echo "all: Generate .html documentation." 42 @echo " This is the default target." 43 @echo "" 44 @echo "htmlhelp: windows only, generate a .chm file." 45 @echo "htmlhelp-clean: Remove generated .chm" 46 @echo "" 47 @echo "pdf: Generate a PDF from the html docs" 48 @echo "pdf-clean: Remove generated pdf" 49 @echo "" 50 @echo " clean: Remove the generated documentation." 51 @echo "" 52 53 # If you are missing the command 'pdflatex' then you have first to install a 54 # LaTeX distribution with it. For Windows and UNIX downloads are for example 55 # available from: http://miktex.org, http://tug.org/texlive or 56 # http://www.ctan.org 57 pdf: ../tools/docs/filename_and_chapter.pl 58 $(MKPATH) build/modified_pod 59 $(PERL) ../tools/docs/filename_and_chapter.pl 60 cd build && pdflatex parrot-book.tex && pdflatex parrot-book.tex 61 62 #pdf-release: build/parrot-book.pdf 63 # cp build/parrot-book.pdf build/parrot-book-$$(date +"%Y.%m").pdf 64 65 pdf-clean: 66 $(RM_RF) build 67 68 # Local variables: 69 # mode: makefile 70 # End: 71 # vim: ft=make: -
config/gen/makefiles/root.in
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in index 6655eaf..1b01e16 100644
a b 145 145 146 146 GEN_MAKEFILES = \ 147 147 Makefile \ 148 docs/Makefile \148 html/Makefile \ 149 149 editor/Makefile \ 150 150 ext/Makefile \ 151 151 src/dynoplibs/Rules.mak \ … … 606 606 607 607 all : \ 608 608 corevm \ 609 docs \610 609 #IF(has_glut): $(LIBGLUTCB_SO) \ 611 610 #IF(has_dynamic_linking): $(EXTRANCITHUNKS_SO) \ 612 611 $(DIS) \ … … 754 753 @echo "" 755 754 @echo "Documentation:" 756 755 @echo " help: Print this help message." 757 @echo " docs: Generate documentation from POD in the sources."758 756 @echo " html: Generate HTML documentation from POD in the sources." 759 757 @echo " html-clean: Remove the HTML documentation." 760 758 @echo " htmlhelp: Compile HTML documentation (CHM format)." … … 1889 1887 # 1890 1888 ############################################################################### 1891 1889 1892 #IF(has_perldoc):docs : docs.dummy1893 #ELSE:docs : docs.stub1894 1895 docs.stub:1896 @echo "Perldoc is required, but not detected."1897 1898 docs.dummy :1899 $(MAKE) docs1900 1901 docs-clean :1902 $(MAKE) docs clean1903 1904 1890 #IF(has_perldoc):html : html.dummy 1905 1891 #ELSE:html : html.stub 1906 1892 … … 1908 1894 @echo "Perldoc is required, but not detected." 1909 1895 1910 1896 html.dummy : 1911 $(MAKE) docshtml1897 $(MAKE) html html 1912 1898 1913 1899 html-clean : 1914 $(MAKE) docshtml-clean1900 $(MAKE) html html-clean 1915 1901 1916 1902 #IF(has_perldoc):htmlhelp : htmlhelp.dummy 1917 1903 #ELSE:htmlhelp : htmlhelp.stub … … 1920 1906 @echo "Perldoc is required, but not detected." 1921 1907 1922 1908 htmlhelp.dummy : 1923 $(MAKE) docshtmlhelp1909 $(MAKE) html htmlhelp 1924 1910 1925 1911 htmlhelp-clean : 1926 $(MAKE) docshtmlhelp-clean1912 $(MAKE) html htmlhelp-clean 1927 1913 1928 1914 pdf: 1929 $(MAKE) docspdf1915 $(MAKE) html pdf 1930 1916 1931 1917 pdf-clean: 1932 $(MAKE) docspdf-clean1918 $(MAKE) html pdf-clean 1933 1919 1934 1920 ############################################################################### 1935 1921 # … … 2204 2190 test-clean \ 2205 2191 prog-clean \ 2206 2192 dynext-clean \ 2207 #IF(has_perldoc): docs-clean \2208 2193 #IF(has_perldoc): html-clean \ 2209 2194 examples-clean \ 2210 2195 ext-clean \