kde-projects: Rename XML reader class.

wilder
Michael Pyne 8 years ago
parent 19d054971c
commit ca586bf17a
  1. 2
      CMakeLists.txt
  2. 8
      modules/ksb/BuildContext.pm
  3. 8
      modules/ksb/KDEProjectsReader.pm
  4. 6
      modules/ksb/ModuleSet/KDEProjects.pm

@ -40,7 +40,7 @@ if (KDESRC_BUILD_INSTALL_MODULES)
modules/ksb/Debug.pm modules/ksb/Debug.pm
modules/ksb/DependencyResolver.pm modules/ksb/DependencyResolver.pm
modules/ksb/IPC.pm modules/ksb/IPC.pm
modules/ksb/KDEXMLReader.pm modules/ksb/KDEProjectsReader.pm
modules/ksb/Module.pm modules/ksb/Module.pm
modules/ksb/ModuleResolver.pm modules/ksb/ModuleResolver.pm
modules/ksb/ModuleSet.pm modules/ksb/ModuleSet.pm

@ -29,7 +29,7 @@ use ksb::Module::BranchGroupResolver;
use ksb::Updater::KDEProjectMetadata 0.20; use ksb::Updater::KDEProjectMetadata 0.20;
use ksb::Version qw(scriptVersion); use ksb::Version qw(scriptVersion);
use ksb::StatusView; use ksb::StatusView;
use ksb::KDEXMLReader 0.20; use ksb::KDEProjectsReader 0.50;
use File::Temp qw(tempfile); use File::Temp qw(tempfile);
use File::Spec; # rel2abs use File::Spec; # rel2abs
@ -219,7 +219,7 @@ sub moduleList
# Parameters should simply be a list of KDE project paths to ignore, # Parameters should simply be a list of KDE project paths to ignore,
# e.g. 'extragear/utils/kdesrc-build'. Partial paths are acceptable, matches # e.g. 'extragear/utils/kdesrc-build'. Partial paths are acceptable, matches
# are determined by comparing the path provided to the suffix of the full path # are determined by comparing the path provided to the suffix of the full path
# of modules being compared. See KDEXMLReader::_projectPathMatchesWildcardSearch # of modules being compared. See KDEProjectsReader::_projectPathMatchesWildcardSearch
# #
# Existing items on the ignore list are not removed. # Existing items on the ignore list are not removed.
sub addToIgnoreList sub addToIgnoreList
@ -958,7 +958,7 @@ sub setKDEProjectsMetadataModuleNeeded
return; return;
} }
# Returns a KDEXMLReader module, which has already read in the database and # Returns a KDEProjectsReader module, which has already read in the database and
# is ready to be queried. Note that exceptions can be thrown in the process # is ready to be queried. Note that exceptions can be thrown in the process
# of downloading and parsing the database information, so be ready for that. # of downloading and parsing the database information, so be ready for that.
sub getProjectDataReader sub getProjectDataReader
@ -977,7 +977,7 @@ sub getProjectDataReader
croak_runtime ("Invalid git-desired-protocol: $protocol"); croak_runtime ("Invalid git-desired-protocol: $protocol");
} }
$self->{projects_db} = ksb::KDEXMLReader->new($projectDatabaseModule, $protocol); $self->{projects_db} = ksb::KDEProjectsReader->new($projectDatabaseModule, $protocol);
return $self->{projects_db}; return $self->{projects_db};
} }

@ -1,6 +1,6 @@
package ksb::KDEXMLReader 0.40; package ksb::KDEProjectsReader 0.50;
# Class: KDEXMLReader # Class: KDEProjectsReader
# #
# Enumerates and provides basic metadata of KDE projects, based on # Enumerates and provides basic metadata of KDE projects, based on
# the YAML metadata included in sysadmin/repo-management. # the YAML metadata included in sysadmin/repo-management.
@ -31,9 +31,9 @@ if (!$success) {
# Method: new # Method: new
# #
# Constructs a new KDEXMLReader. This doesn't contradict any part of the class # Constructs a new KDEProjectsReader. This doesn't contradict any part of the class
# documentation which claims this class is a singleton however. This should be # documentation which claims this class is a singleton however. This should be
# called as a method (e.g. KDEXMLReader->new(...)). # called as a method (e.g. KDEProjectsReader->new(...)).
# #
# Parameters: # Parameters:
# $projectMetadataModule - ksb::Module reference to the repo-metadata module. # $projectMetadataModule - ksb::Module reference to the repo-metadata module.

@ -8,7 +8,7 @@ package ksb::ModuleSet::KDEProjects 0.30;
# which this class uses to imbue ksb::Modules generated by this ModuleSet. # which this class uses to imbue ksb::Modules generated by this ModuleSet.
# #
# The only changes here are to allow for expanding out module specifications # The only changes here are to allow for expanding out module specifications
# (except for ignored modules), by using KDEXMLReader. # (except for ignored modules), by using KDEProjectsReader.
# #
# See also: ModuleSet # See also: ModuleSet
@ -20,7 +20,7 @@ no if $] >= 5.018, 'warnings', 'experimental::smartmatch';
use ksb::Module; use ksb::Module;
use ksb::Debug; use ksb::Debug;
use ksb::KDEXMLReader 0.20; use ksb::KDEProjectsReader 0.50;
use ksb::BuildContext 0.20; use ksb::BuildContext 0.20;
use ksb::Util; use ksb::Util;
@ -164,7 +164,7 @@ sub _expandModuleCandidates
if (none_true( if (none_true(
map { map {
ksb::KDEXMLReader::_projectPathMatchesWildcardSearch( ksb::KDEProjectsReader::_projectPathMatchesWildcardSearch(
$result->{'fullName'}, $result->{'fullName'},
$_ $_
) )

Loading…
Cancel
Save