Permalink
Browse files

[GH #890] Generate MANIFEST.generate, remove MANIFEST_configure.gener…

…ated

Some files are still missing.
add_to_generated($filename, $section, $dir) is called from the Makefile
shell via tools/build/addgenerated.pl, and from $conf directly.

Improve docs Makefile
  • Loading branch information...
1 parent a5ec03b commit 2be29e88d61c3e052c1d5082d50381bfa6d21c19 Reini Urban committed Dec 22, 2012
View
@@ -77,9 +77,9 @@
? '"'.join("\" \"", map {qq($_)} @ARGV).'"'
: '');
-# Log files created by Configure.pl in MANIFEST_configure.generated
+# Log files created by Configure.pl in MANIFEST.generated
$conf->{active_configuration} = 1;
-unlink 'MANIFEST_configure.generated';
+unlink 'MANIFEST.generated';
# Run the actual steps from Parrot::Configure
$conf->runsteps or exit(1);
View
@@ -16,7 +16,6 @@ DONORS.pod [main]doc
LICENSE [main]doc
MANIFEST []
MANIFEST.SKIP []
-MANIFEST.generated []
PBC_COMPAT [main]doc
PLATFORMS [devel]doc
README.pod [devel]doc
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -33,6 +33,7 @@ sub runstep {
else {
if ( $conf->cc_run() =~ /ok/ ) {
_handle_cc_run_ok($conf, $suffix, $path_f);
+ $conf->add_to_generated( $path_f, "[]" );
}
}
$conf->cc_clean();
@@ -35,6 +35,8 @@ sub runstep {
"HAS_PPC_$suffix" => '1',
);
$conf->debug(" (\U$suffix) ");
+ $conf->add_to_generated( $f, "[]" );
+ # $conf->append_configure_log($f);
}
}
$conf->cc_clean();
@@ -59,6 +59,8 @@ sub runstep {
);
$conf->debug(" (\U$suffix) ");
$conf->data->add( ' ', TEMP_atomic_o => 'src/atomic/sparc_v9.o' );
+ # $conf->append_configure_log($f);
+ $conf->add_to_generated( $f, "[]" );
}
}
$conf->cc_clean();
View
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007, Parrot Foundation.
+# Copyright (C) 2001-2012, Parrot Foundation.
=head1 NAME
@@ -22,7 +22,6 @@ use base qw(Parrot::Configure::Step);
use Parrot::Configure::Utils ':gen';
-
sub _init {
my $self = shift;
my %data;
@@ -41,12 +40,13 @@ sub runstep {
$conf->genfile($self->{templates}->{config_h}, 'include/parrot/config.h',
ignore_pattern => 'PARROT_CONFIG_DATE',
- conditioned_lines => 1
+ conditioned_lines => 1,
+ manifest => [ "[main]", "include" ]
);
-
$conf->genfile($self->{templates}->{feature_h}, 'include/parrot/feature.h',
ignore_pattern => 'PARROT_CONFIG_DATE',
- feature_file => 1
+ feature_file => 1,
+ manifest => [ "[main]", "include" ]
);
my @sorted_keys = sort $conf->data->keys();
@@ -76,7 +76,9 @@ sub runstep {
split /,/, $conf->options->get('define') || ''
);
- $conf->genfile($self->{templates}->{has_header_h}, 'include/parrot/has_header.h');
+ $conf->genfile($self->{templates}->{has_header_h}, 'include/parrot/has_header.h',
+ manifest => [ "[main]", "include" ]
+ );
return 1;
}
View
@@ -43,12 +43,13 @@ sub runstep {
$conf->data->clean;
my $template = $self->{templates}->{myconfig};
- $conf->genfile($template, 'myconfig' );
+ $conf->genfile($template, 'myconfig',
+ manifest => [ "[devel]" ]);
$template = $self->{templates}->{config_pir};
my $gen_pir = q{runtime/parrot/library/config.pir};
- $conf->append_configure_log($gen_pir);
- $conf->genfile($template, $gen_pir );
+ $conf->genfile($template, $gen_pir,
+ manifest => [ "[main]" ]);
$template = $self->{templates}->{Config_pm};
open( my $IN, "<", $template )
@@ -60,7 +61,7 @@ sub runstep {
or die "Can't create dir $configdir: $!";
}
my $gen_pm = q{lib/Parrot/Config/Generated.pm};
- $conf->append_configure_log($gen_pm);
+ add_to_generated($gen_pm, "[devel]", "lib");
open( my $OUT, ">", $gen_pm )
or die "Can't open $gen_pm: $!";
@@ -124,9 +125,9 @@ END
$template = $self->{templates}->{config_lib};
open( $IN, "<", $template ) or die "Can't open '$template': $!";
my $c_l_pir = q{config_lib.pir};
- $conf->append_configure_log($c_l_pir);
- open( $OUT, ">", $c_l_pir ) or die "Can't open $c_l_pir: $!";
+ add_to_generated($c_l_pir, '[devel]', '');
+ open( $OUT, ">", $c_l_pir ) or die "Can't open $c_l_pir: $!";
print {$OUT} <<"END";
# ex: set ro:
# DO NOT EDIT THIS FILE
View
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009, Parrot Foundation.
+# Copyright (C) 2001-2012, Parrot Foundation.
=head1 NAME
@@ -42,7 +42,8 @@ sub generate_h {
my ( $self, $conf ) = @_;
my $file = 'include/parrot/core_pmcs.h';
- $conf->append_configure_log($file);
+ # $conf->append_configure_log($file);
+ add_to_generated($file, "[main]", "include");
open( my $OUT, '>', "${file}_tmp" );
print {$OUT} <<'END_H';
@@ -88,7 +89,8 @@ sub generate_c {
my $file = "src/core_pmcs.c";
my @pmcs = split( qr/ /, $conf->data->get('pmc_names') );
- $conf->append_configure_log($file);
+ # $conf->append_configure_log($file);
+ add_to_generated($file, "[]", "");
open( my $OUT, '>', "${file}_tmp" );
print {$OUT} <<'END_C';
@@ -155,7 +157,8 @@ sub generate_pm {
my $file = "lib/Parrot/PMC.pm";
my @pmcs = split( qr/ /, $conf->data->get('pmc_names') );
- $conf->append_configure_log($file);
+ # $conf->append_configure_log($file);
+ add_to_generated($file, "[devel]", "lib");
open( my $OUT, '>', "${file}_tmp" );
print $OUT <<'END_PM';
View
@@ -76,7 +76,7 @@ sub makefiles {
my $args = $self->{makefiles}->{$target};
my $source = delete $args->{SOURCE};
- $conf->genfile($source => $target, %$args );
+ $conf->genfile($source => $target, %$args);
}
return;
}
@@ -7,9 +7,10 @@ MKPATH = @mkpath@
TOUCH = @touch@
RM_F = @rm_f@
RM_RF = @rm_rf@
-PERLDOC_BIN = @perldoc@
+PERLDOC = @perldoc@
POD2MAN = @pod2man@
VERSION = @VERSION@@DEVEL@
+ADDGENERATED = cd .. && $(PERL) tools/build/addgenerated.pl
# long list of .pod files
POD = @TEMP_pod@
@@ -19,7 +20,7 @@ POD = @TEMP_pod@
#
# The default target
-all: packfile-c.pod $(POD) ops/index.pod man
+all: doc-prep packfile-c.pod $(POD) ops/index.pod man
# This is a listing of all targets, that are meant to be called by users
# Most of them are proxied in the root makefile parrot/Makefile
@@ -77,7 +78,10 @@ man.good: $(MAN_1)
man.stub:
@echo "pod2man is required, but not detected."
-clean:
+man-clean:
+ $(RM_F) $(MAN_1)
+
+clean: man-clean html-clean pdf-clean htmlhelp-clean
$(RM_F) packfile-c.pod $(POD) doc-prep
html:
@@ -93,6 +97,7 @@ pdf: ../tools/docs/filename_and_chapter.pl
$(MKPATH) build/modified_pod
$(PERL) ../tools/docs/filename_and_chapter.pl
cd build && pdflatex parrot-book.tex && pdflatex parrot-book.tex
+ $(ADDGENERATED) "docs/build/parrot-book.pdf" "[main]" doc
#pdf-release: build/parrot-book.pdf
# cp build/parrot-book.pdf build/parrot-book-$$(date +"%Y.%m").pdf
@@ -103,6 +108,7 @@ pdf-clean:
htmlhelp: html
#IF(win32): cd .. && $(PERL) tools/docs/mk_chm.pl
#IF(win32): -cd html && hhc parrot.hhp
+#IF(win32): $(ADDGENERATED) "docs/html/parrot.chm" "[main]" doc
htmlhelp-clean:
#IF(win32): $(RM_F) "html/*.hhc" "html/*.hhk" "html/*.hhp" "html/*.chm"
Oops, something went wrong.

0 comments on commit 2be29e8

Please sign in to comment.