From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 60145 invoked by alias); 22 Sep 2015 15:53:25 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 59979 invoked by uid 89); 22 Sep 2015 15:53:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.1 required=5.0 tests=AWL,BAYES_50,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: rgout0305.bt.lon5.cpcloud.co.uk Received: from rgout0305.bt.lon5.cpcloud.co.uk (HELO rgout0305.bt.lon5.cpcloud.co.uk) (65.20.0.211) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 22 Sep 2015 15:53:23 +0000 X-OWM-Source-IP: 86.160.189.124 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-CTCH-RefID: str=0001.0A090202.5601796E.00BB,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-Junkmail-Premium-Raw: score=27/50,refid=2.7.2:2015.9.9.120920:17:27.888,ip=86.160.189.124,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __ANY_URI, __URI_NO_WWW, __URI_NO_PATH, __STOCK_PHRASE_7, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, __URI_NS, SXL_IP_DYNAMIC[124.189.160.86.fur], HTML_00_01, HTML_00_10, RDNS_SUSP_GENERIC, RDNS_SUSP, REFERENCES, NO_URI_HTTPS X-CTCH-Spam: Unknown Received: from localhost.localdomain (86.160.189.124) by rgout03.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 55DD8A4A0341FBC3; Tue, 22 Sep 2015 16:53:18 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 2/3] Remove unfinished, unused support for 'autodep:' lines in setup.ini Date: Tue, 22 Sep 2015 15:53:00 -0000 Message-Id: <1442937170-17580-3-git-send-email-jon.turney@dronecode.org.uk> In-Reply-To: <1442937170-17580-1-git-send-email-jon.turney@dronecode.org.uk> References: <1442937170-17580-1-git-send-email-jon.turney@dronecode.org.uk> X-SW-Source: 2015-09/txt/msg00035.txt.bz2 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 --- ChangeLog | 12 ++++++++++++ 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 -- 10 files changed, 13 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c6fd3a..4a6b3b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2015-09-18 Jon Turney + * 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. + +2015-09-18 Jon Turney + * Makefile.am (AM_CPPFLAGS): Remove regex from include path. (@SETUP@_SOURCES): Remove regex.c. * regex/config.h: Delete file. diff --git a/IniDBBuilder.h b/IniDBBuilder.h index 3477981..0756d91 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 ff92ec2..b75d0fd 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 b19d440..7b9e0d6 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 74d040d..4b05cb3 100644 --- a/cygpackage.cc +++ b/cygpackage.cc @@ -193,12 +193,6 @@ cygpackage::set_sdesc (const std::string& desc) } void -cygpackage::set_autodep (const std::string& autodep) -{ - autodep_regex = autodep; -} - -void cygpackage::set_ldesc (const std::string& desc) { ldesc = desc; diff --git a/cygpackage.h b/cygpackage.h index c00539b..0b08e0d 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 67764f0..49bbfa6 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 5fd6c3f..da3e5d0 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 7340913..c7d9d24 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 7fcdaeb..32700f0 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.5.3