From 8c2dc9349fd36d6f117327995cfc5776b39284ef Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Fri, 29 Jun 2007 15:08:11 +0530 Subject: [PATCH] Prepare for GAC support * automake.in (am_install_var): Add a new option to add custom 'noinst' like prefixes. (handle_cli): Use it to treat 'gac' as a noinst-like directory. --- ChangeLog | 5 +++++ automake.in | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fd5ae7..5957f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-06-29 Raja R Harinath + Prepare for GAC support + * automake.in (am_install_var): Add a new option to add custom + 'noinst' like prefixes. + (handle_cli): Use it to treat 'gac' as a noinst-like directory. + * automake.in (handle_cli_assembly_resources): Register each generated .resources with $clean_files. * lib/am/cli.am (clean-%DIR%%PRIMARY%): Don't rm *.resources. diff --git a/automake.in b/automake.in index 567f767..7b88079 100755 --- a/automake.in +++ b/automake.in @@ -4903,8 +4903,9 @@ sub handle_cli foreach my $target (keys %targets) { - my @assemblies = &am_install_var ('cli', 'CLI' . $target . 'S', - 'noinst', 'check', 'lib' #, 'gac' + my @assemblies = &am_install_var ('-noinst=gac', + 'cli', 'CLI' . $target . 'S', + 'noinst', 'check', 'lib', 'pkglib', 'gac' ); next unless @assemblies; @@ -7118,6 +7119,8 @@ sub am_install_var { my (@args) = @_; + my %noinst = ( noinst => 1, check => 1 ); + my $do_require = 1; my $can_dist = 0; my $default_dist = 0; @@ -7136,6 +7139,12 @@ sub am_install_var $default_dist = 1; $can_dist = 1; } + elsif ($args[0] =~ /^-noinst=/) + { + my $dir = $args[0]; + $dir =~ s/^-noinst=//; + $noinst{$dir} = 1; + } elsif ($args[0] !~ /^-/) { last; @@ -7241,7 +7250,7 @@ sub am_install_var } # Is this to be installed? - my $install_p = $nodir_name ne 'noinst' && $nodir_name ne 'check'; + my $install_p = !exists $noinst{$nodir_name}; # If so, with install-exec? (or install-data?). my $exec_p = ($nodir_name =~ /$EXEC_DIR_PATTERN/o); -- 1.5.2.2.549.gaeb59