This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH setup 2/3] 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 <jon.turney@dronecode.org.uk>
---
 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  <jon.turney@dronecode.org.uk>
 
+	* 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  <jon.turney@dronecode.org.uk>
+
 	* 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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]