@ -95,7 +95,9 @@ our %package_opts = (
"do-not-compile" => "",
"email-address" => "",
"email-on-compile-error" => "",
"install-after-build" => 1, # Default to true
"git-repository-base" => {}, # Base path template for use multiple times.
"use-modules" => "",
"install-after-build" => 1, # Default to true
"kdedir" => "$ENV{HOME}/kde",
"kde-languages" => "",
"libpath" => "",
@ -2921,6 +2923,97 @@ sub setup_default_modules()
}
}
# Reads a "line" from a file. This line is stripped of comments and extraneous
# whitespace. Also, backslash-continued multiple lines are merged into a single
# line.
#
# First parameter is the reference to the filehandle to read from.
# Returns the text of the line.
sub read_line
{
my $fh = shift;
while(<$fh>) {
# Remove trailing newline
chomp;
# Replace \ followed by optional space at EOL and try again.
if(s/\\\s*$//)
{
$_ .= <$fh>;
redo unless eof($fh);
}
s/#.*$//; # Remove comments
next if /^\s*$/; # Skip blank lines
return $_;
}
return undef;
}
# Takes an input line, and extracts it into an option name, and simplified
# value. The value has "false" converted to 0, white space simplified (like in
# Qt), and tildes (~) in what appear to be path-like entries are converted to
# the home directory path.
#
# First parameter is the input line.
# Return value is (optionname, option-value)
sub split_option_value
{
my $input = shift;
my $optionRE = qr/\$\{([a-zA-Z0-9-]+)\}/;
# The option is the first word, followed by the
# flags on the rest of the line. The interpretation
# of the flags is dependant on the option.
my ($option, $value) = ($input =~ /^\s* # Find all spaces
([-\w]+) # First match, alphanumeric, -, and _
# (?: ) means non-capturing group, so (.*) is $value
# So, skip spaces and pick up the rest of the line.
(?:\s+(.*))?$/x);
$value = "" unless defined $value;
# Simplify this.
$value =~ s/\s+$//;
$value =~ s/^\s+//;
$value =~ s/\s+/ /;
# Check for false keyword and convert it to Perl false.
$value = 0 if lc($value) eq 'false';
# Replace reference to global option with their value.
# The regex basically just matches ${option-name}.
my ($sub_var_name) = ($value =~ $optionRE);
while ($sub_var_name)
{
my $sub_var_value = get_option('global', $sub_var_name);
if(not $sub_var_value)
{
my $line_no = $.;
warning " *\n * WARNING: $sub_var_name is not set at line y[$line_no]\n *";
$sub_var_value = '';
}
debug "Substituting \${$sub_var_name} with $sub_var_value";
$value =~ s/\${$sub_var_name}/$sub_var_value/g;
# Replace other references as well. Keep this RE up to date with
# the other one.
($sub_var_name) = ($value =~ $optionRE);
}
# Replace tildes with home directory.
1 while ($value =~ s"(^|:|=)~/"$1$ENV{'HOME'}/");
return ($option, $value);
}
# Reads in the options from the config file and adds them to the option store.
# The first parameter is a reference to the file handle to read from.
# The second parameter is 'global' if we're reading the global section, or
@ -2938,20 +3031,8 @@ sub parse_module
}
# Read in each option
while (<$fh> )
while (read_line($fh) )
{
# Handle line continuation
chomp;
if(s/\\\s*$//) # Replace \ followed by optional space at EOL and try again.
{
$_ .= <$fh>;
redo unless eof($fh);
}
s/#.*$//; # Remove comments
next if /^\s*$/; # Skip blank lines
if($module eq 'global')
{
last if /^end\s+global/; # Stop
@ -2969,56 +3050,90 @@ sub parse_module
exit 1; # exit instead of finish() since we're not fully setup yet.
}
# The option is the first word, followed by the
# flags on the rest of the line. The interpretation
# of the flags is dependant on the option.
my ($option, $value) = /^\s* # Find all spaces
([-\w]+) # First match, alphanumeric, -, and _
# (?: ) means non-capturing group, so (.*) is $value
# So, skip spaces and pick up the rest of the line.
(?:\s+(.*))?$/x;
my ($option, $value) = split_option_value($_);
$value = "" unless defined $value;
# Handle special options.
if ($module eq 'global' && $option eq 'git-repository-base') {
# This will be a hash reference instead of a scalar
my ($repo, $url) = ($value =~ /^([a-zA-Z0-9_-]+)\s+(.+)$/);
$value = get_option('global', $option) || { };
# Simplify this.
$value =~ s/\s+$//;
$value =~ s/^\s+//;
$value =~ s/\s+/ /;
if (!$repo || !$url) {
error <<"EOF" ;
The y[git-repository-base] option at y[b[$rcfile:$.]
requires a repository name and URL.
# Check for false keyword and convert it to Perl false.
$value = 0 if lc($value) eq 'false';
e.g. git-repository base kde git://anongit.kde.org/
# Replace reference to global option with their value.
# The regex basically just matches ${option-name}. Keep the RE up
# to date with the same one below.
Use this in a "module-set" group:
my ($sub_var_name) = ($value =~ m/\$\{([a-zA-Z0-9-]+)\}/);
while ($sub_var_name)
{
my $sub_var_value = get_option('global', $sub_var_name);
e.g.
module-set kde
use-modules automoc akonadi soprano attica
end module-set
EOF
exit 1;
}
if(not $sub_var_value)
{
my $line_no = $.;
warning " *\n * WARNING: $sub_var_name is not set at line y[$line_no]\n *";
$value->{$repo} = $url;
}
$sub_var_value = '';
}
set_option($module, $option, $value);
}
}
# Reads in a "moduleset".
#
# First parameter is the filehandle to the config file to read from.
# Second parameter is the name of the moduleset, which is really the name
# of the base repository to use.
# Returns the expanded list of module names to include.
sub parse_moduleset
{
my ($fh, $repoName) = @_;
my $repoSet = get_option('global', 'git-repository-base');
my @modules;
if (not exists $repoSet->{$repoName}) {
error "There is no repository assigned to y[b[$repoName] when assigning";
error "a moduleset on line $. of $rcfile";
exit 1;
}
debug "Substituting \${$sub_var_name} with $sub_var_value";
while(read_line($fh)) {
return @modules if /^end\s+module(-?set)?$/;
$value =~ s/\${$sub_var_name}/$sub_var_value/g;
my ($option, $value) = split_option_value($_) ;
# Replace other references as well. Keep this RE up to date with
# the other one.
($sub_var_name) = $value =~ m/\$\{([a-zA-Z0-9-]+)\}/;
if ($option eq 'use-modules') {
@modules = split(' ', $value);
}
else {
warning "Ignoring option $option on line $. of $rcfile";
next;
}
# Replace tildes with home directory.
1 while ($value =~ s"(^|:|=)~/"$1$ENV{'HOME'}/");
if (not @modules) {
error "No modules were selected for repository y[b[$repoName]";
error "in the y[use-modules] on line $. of $rcfile";
exit 1;
}
set_option($module, $option, $value);
# Setup default options for each module
for my $module (@modules) {
my $moduleName = $module;
$moduleName =~ s/\.git$//; # Remove trailing .git for module name
if (not defined $package_opts{$moduleName})
{
$package_opts{$moduleName} = default_module_options($moduleName);
}
set_option($moduleName, 'repository', $repoSet->{$repoName} . $module);
}
}
return @modules;
}
# This subroutine reads in the settings from the user's configuration
@ -3068,7 +3183,7 @@ EOM
return;
}
my ($option, $flags, $ modulename);
my ($option, $modulename, %readModules );
# Read in global settings
while (<CONFIG>)
@ -3106,20 +3221,33 @@ EOM
# Now read in module settings
while (<CONFIG>)
{
s/#.*$//; # Remove comments
s/^\s*//; # Remove leading whitespace
s/#.*$//; # Remove comments
s/^\s*//; # Remove leading whitespace
next if (/^\s*$/); # Skip blank lines
my @addedModules = ();
# Get modulename (has dash, dots, slashes, or letters/numbers)
($modulename) = /^module\s+([-\/\.\w]+)\s*$/;
if (not $modulename)
{
warning "Invalid configuration file $rcfile!";
warning "Expecting a start of module section at line $..";
warning "Global settings will be retained.";
($modulename) = /^module-set\s+([-\/\.\w]+)$/;
if (not $modulename) {
error "Invalid configuration file $rcfile!";
error "Expecting a start of module section at line $. of $rcfile.";
error "Global settings will be retained.";
$modulename = 'null'; # Keep reading the module section though.
exit 1;
}
# A moduleset can give us more than one module to add.
@addedModules = parse_moduleset(\*CONFIG, $modulename);
}
else {
parse_module(\*CONFIG, $modulename);
push @addedModules, $modulename;
}
# Don't build default modules if user has their own wishes.
@ -3129,24 +3257,27 @@ EOM
@update_list = @build_list = ( );
}
parse_module(\*CONFIG, $modulename);
next if ($modulename eq 'null' );
# Don't re-add duplicated modules (it may be possible to see a module
# declaration for a module already seen in a module-set)
@addedModules = grep { not exists $readModules{$_} } (@addedModules );
# Done reading options, add this module to the update list
push (@update_list, $modulename) unless exists $ignore_list{$modulename};
# Done reading options, add this module(s) to the update lists
push (@update_list, @addedModules);
push (@build_list, @addedModules);
# Add it to the build list, unless the build is only
# supposed to be done manually.
if (not get_option ($modulename, 'manual-build') and not exists $ignore_list{$modulename})
{
push (@build_list, $modulename);
}
# Add an entry for each module that has been read in so we don't
# add it later to update/build list.
@readModules{@addedModules} = 1;
}
close CONFIG;
delete $package_opts{'null'}; # Just in case.
# All modules and their options have been read, filter out modules not
# to update or build, based on the --ignore-modules option already present
# on the command line. manual-update and manual-build are also relevant,
# but handled in get_build_list or get_update_list.
@update_list = grep { not exists $ignore_list{$_} } (@update_list);
@build_list = grep { not exists $ignore_list{$_} } (@build_list);
# If the user doesn't ask to build any modules, build a default set.
# The good question is what exactly should be built, but oh well.
@ -4219,13 +4350,9 @@ sub get_update_list
push @update_list, $l10n; # Add l10n module to potential update list.
}
my @return_list;
for (@update_list)
{
push @return_list, $_ if not get_option($_, "manual-update");
}
return @return_list;
return grep {
not get_option($_, 'manual-update')
} (@update_list);
}
# Subroutine to get the list of KDE modules to build. Returned
@ -4307,13 +4434,10 @@ EOF
return @ARGV unless $#ARGV == -1;
my @list;
for (@build_list)
{
push @list, $_ unless get_option($_, 'manual-update');
}
return @list;
return grep {
not get_option($_, 'manual-update') and
not get_option($_, 'manual-build')
} (@build_list);
}
# Used to sort module names. 'global' always starts first, modules with /
Michael Pyne
16 years ago