From bd1723cf115f5b57b2e89d264c09281e4e197a50 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 18 Sep 2015 15:22:04 +0100 Subject: [PATCH] Remove unfinished, unused support for 'autodep:' lines in setup.ini This effectively reverts the parts of commits 9b98ba2301658c34d0e9c3fd4bbd964ce52ef8ae and dd15057d785045dfc1395ed5f39c84bcdcb88b13 which add that. * IniDBBuilder.h (IniDBBuilder::autodep): Remove. * IniDBBuilderPackage.cc (IniDBBuilderPackage::autodep): Remove. * IniDBBuilderPackage.h (IniDBBuilderPackage::autodep): Remove. * cygpackage.cc (cygpackage::set_autodep): Remove. * cygpackage.h (cygpackage::set_autodep): Remove. * inilex.ll: Remove autodep. * iniparse.yy: Remove autodep. * package_version.cc (packageversion::set_autodep): Remove. * package_version.h (packageversion::set_autodep): Remove. Signed-off-by: Jon Turney --- IniDBBuilder.h | 1 - IniDBBuilderPackage.cc | 6 ------ IniDBBuilderPackage.h | 1 - cygpackage.cc | 6 ------ cygpackage.h | 2 -- inilex.ll | 1 - iniparse.yy | 3 +-- package_version.cc | 7 ------- package_version.h | 2 -- 9 files changed, 1 insertion(+), 28 deletions(-) diff --git a/IniDBBuilder.h b/IniDBBuilder.h index 3477981c..0756d91e 100644 --- a/IniDBBuilder.h +++ b/IniDBBuilder.h @@ -60,7 +60,6 @@ public: virtual void buildPackageListOperator (PackageSpecification::_operators const &) = 0; virtual void buildPackageListOperatorVersion (const std::string& ) = 0; virtual void buildMessage (const std::string&, const std::string&) = 0; - virtual void autodep (const std::string&, const std::string&) = 0; void set_arch (const std::string& a) { arch = a; } void set_release (const std::string& rel) { release = rel; } diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc index ff92ec22..b75d0fdb 100644 --- a/IniDBBuilderPackage.cc +++ b/IniDBBuilderPackage.cc @@ -626,9 +626,3 @@ IniDBBuilderPackage::buildMessage (const std::string& message_id, const std::str { cp->set_message (message_id, message); } - -void -IniDBBuilderPackage::autodep (const std::string& file_regex, const std::string& message) -{ - cbpv.set_autodep (file_regex); -} diff --git a/IniDBBuilderPackage.h b/IniDBBuilderPackage.h index b19d440f..7b9e0d65 100644 --- a/IniDBBuilderPackage.h +++ b/IniDBBuilderPackage.h @@ -62,7 +62,6 @@ public: virtual void buildBeginBinary (); virtual void buildDescription (const std::string&); virtual void buildMessage (const std::string&, const std::string&); - virtual void autodep (const std::string&, const std::string&); virtual void buildSourceName (const std::string& ); virtual void buildSourceNameVersion (const std::string& ); virtual void buildPackageListAndNode (); diff --git a/cygpackage.cc b/cygpackage.cc index 74d040d9..4b05cb3b 100644 --- a/cygpackage.cc +++ b/cygpackage.cc @@ -192,12 +192,6 @@ cygpackage::set_sdesc (const std::string& desc) sdesc = desc; } -void -cygpackage::set_autodep (const std::string& autodep) -{ - autodep_regex = autodep; -} - void cygpackage::set_ldesc (const std::string& desc) { diff --git a/cygpackage.h b/cygpackage.h index c00539b6..0b08e0de 100644 --- a/cygpackage.h +++ b/cygpackage.h @@ -52,7 +52,6 @@ public: { return ldesc; }; - virtual void set_autodep (const std::string& ); virtual void uninstall (); @@ -86,7 +85,6 @@ private: std::string canonical; std::string fn; std::string sdesc, ldesc; - std::string autodep_regex; char getfilenamebuffer[CYG_PATH_MAX]; // package_stability_t stability; diff --git a/inilex.ll b/inilex.ll index 67764f03..49bbfa66 100644 --- a/inilex.ll +++ b/inilex.ll @@ -119,7 +119,6 @@ B64 [a-zA-Z0-9_-] "sdesc:" return SDESC; "ldesc:" return LDESC; "message:" return MESSAGE; -"autodep:" return AUTODEP; "Description:" BEGIN (descriptionstate); return DESCTAG; "Size:" return FILESIZE; "MD5sum:" return MD5LINE; diff --git a/iniparse.yy b/iniparse.yy index 5fd6c3f6..da3e5d0a 100644 --- a/iniparse.yy +++ b/iniparse.yy @@ -51,7 +51,7 @@ void add_correct_version(); %token OPENBRACE CLOSEBRACE EQUAL GT LT GTEQUAL LTEQUAL %token OPENSQUARE CLOSESQUARE %token BINARYPACKAGE BUILDDEPENDS STANDARDSVERSION FORMAT DIRECTORY FILES -%token MESSAGE AUTODEP +%token MESSAGE %token ARCH RELEASE %% @@ -125,7 +125,6 @@ singleitem /* non-empty */ | BUILDDEPENDS { iniBuilder->buildBeginBuildDepends(); } versionedpackagelist NL | FILES NL SourceFilesList | MESSAGE STRING STRING NL { iniBuilder->buildMessage ($2, $3); } - | AUTODEP STRING STRING NL { iniBuilder->autodep ($2, $3); } | DESCTAG mlinedesc | error { yyerror (std::string("unrecognized line ") + stringify(yylineno) diff --git a/package_version.cc b/package_version.cc index 7340913a..c7d9d242 100644 --- a/package_version.cc +++ b/package_version.cc @@ -58,7 +58,6 @@ public: void set_sdesc (const std::string& ) {} const std::string LDesc () {return std::string();} void set_ldesc (const std::string& ) {} - void set_autodep (const std::string& ) {} void uninstall (){} void pick(bool const &newValue){/* Ignore attempts to pick this!. Throw an exception here if you want to detect such attemtps instead */} virtual void addScript(Script const &) {} @@ -218,12 +217,6 @@ packageversion::set_ldesc (const std::string& ldesc) data->set_ldesc (ldesc); } -void -packageversion::set_autodep (const std::string& regex) -{ - data->set_autodep (regex); -} - packageversion packageversion::sourcePackage() const { diff --git a/package_version.h b/package_version.h index 7fcdaeb4..32700f03 100644 --- a/package_version.h +++ b/package_version.h @@ -113,7 +113,6 @@ public: void set_sdesc (const std::string& ); const std::string LDesc () const; void set_ldesc (const std::string& ); - void set_autodep (const std::string& ); packageversion sourcePackage () const; PackageSpecification & sourcePackageSpecification (); void setSourcePackageSpecification (PackageSpecification const &); @@ -179,7 +178,6 @@ public: virtual void set_sdesc (const std::string& ) = 0; virtual const std::string LDesc () = 0; virtual void set_ldesc (const std::string& ) = 0; - virtual void set_autodep (const std::string& ) = 0; /* only semantically meaningful for binary packages */ /* direct link to the source package for this binary */ /* if multiple versions exist and the source doesn't discriminate -- 2.43.5