svn commit: r911596 - in /qpid/trunk/qpid/python: ./ qpid/ qpid/specs/

[rh...@apache.org]

Author: rhs
Date: Thu Feb 18 21:29:59 2010
New Revision: 911596

URL: http://svn.apache.org/viewvc?rev=911596&view=rev
Log:
remove extra dots from filenames so as not to confuse windows

Added:
    qpid/trunk/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml
      - copied, changed from r911524, qpid/trunk/qpid/python/qpid/specs/amqp.0-10-qpid-errata.xml
    qpid/trunk/qpid/python/qpid/specs/amqp-0-10.dtd
      - copied unchanged from r911524, qpid/trunk/qpid/python/qpid/specs/amqp.0-10.dtd
    qpid/trunk/qpid/python/qpid/specs/amqp-0-8.xml
      - copied unchanged from r911524, qpid/trunk/qpid/python/qpid/specs/amqp.0-8.xml
    qpid/trunk/qpid/python/qpid/specs/amqp-0-9.xml
      - copied unchanged from r911524, qpid/trunk/qpid/python/qpid/specs/amqp.0-9.xml
Removed:
    qpid/trunk/qpid/python/qpid/specs/amqp.0-10-qpid-errata.xml
    qpid/trunk/qpid/python/qpid/specs/amqp.0-10.dtd
    qpid/trunk/qpid/python/qpid/specs/amqp.0-8.xml
    qpid/trunk/qpid/python/qpid/specs/amqp.0-9.xml
Modified:
    qpid/trunk/qpid/python/qpid/ops.py
    qpid/trunk/qpid/python/qpid/specs/   (props changed)
    qpid/trunk/qpid/python/qpid/specs_config.py
    qpid/trunk/qpid/python/setup.py

Modified: qpid/trunk/qpid/python/qpid/ops.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/ops.py?rev=911596&r1=911595&r2=911596&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/ops.py (original)
+++ qpid/trunk/qpid/python/qpid/ops.py Thu Feb 18 21:29:59 2010
@@ -242,7 +242,8 @@
   return types
 
 def load_types(file):
-  pclfile = "%s.ops.pcl" % file
+  base, ext = os.path.splitext(file)
+  pclfile = "%s.pcl" % base
   if os.path.exists(pclfile) and \
         os.path.getmtime(pclfile) > os.path.getmtime(file):
     f = open(pclfile, "rb")

Propchange: qpid/trunk/qpid/python/qpid/specs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 18 21:29:59 2010
@@ -1 +1 @@
-amqp.0-10-qpid-errata.xml.ops.pcl
+amqp-0-10-qpid-errata.pcl

Copied: qpid/trunk/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml (from r911524, qpid/trunk/qpid/python/qpid/specs/amqp.0-10-qpid-errata.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml?p2=qpid/trunk/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml&p1=qpid/trunk/qpid/python/qpid/specs/amqp.0-10-qpid-errata.xml&r1=911524&r2=911596&rev=911596&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/specs/amqp.0-10-qpid-errata.xml (original)
+++ qpid/trunk/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml Thu Feb 18 21:29:59 2010
@@ -121,7 +121,7 @@
 
 -->
 
-<!DOCTYPE amqp SYSTEM "amqp.0-10.dtd">
+<!DOCTYPE amqp SYSTEM "amqp-0-10.dtd">
 
 <amqp xmlns="http://www.amqp.org/schema/amqp.xsd"
     major="0" minor="10" port="5672">

Modified: qpid/trunk/qpid/python/qpid/specs_config.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/specs_config.py?rev=911596&r1=911595&r2=911596&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/specs_config.py (original)
+++ qpid/trunk/qpid/python/qpid/specs_config.py Thu Feb 18 21:29:59 2010
@@ -20,6 +20,6 @@
 import os
 
 AMQP_SPEC_DIR=os.path.join(os.path.dirname(os.path.abspath(__file__)), "specs")
-amqp_spec = os.path.join(AMQP_SPEC_DIR, "amqp.0-10-qpid-errata.xml")
-amqp_spec_0_8 = os.path.join(AMQP_SPEC_DIR, "amqp.0-8.xml")
-amqp_spec_0_9 = os.path.join(AMQP_SPEC_DIR, "amqp.0-9.xml")
+amqp_spec = os.path.join(AMQP_SPEC_DIR, "amqp-0-10-qpid-errata.xml")
+amqp_spec_0_8 = os.path.join(AMQP_SPEC_DIR, "amqp-0-8.xml")
+amqp_spec_0_9 = os.path.join(AMQP_SPEC_DIR, "amqp-0-9.xml")

Modified: qpid/trunk/qpid/python/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/setup.py?rev=911596&r1=911595&r2=911596&view=diff
==============================================================================
--- qpid/trunk/qpid/python/setup.py (original)
+++ qpid/trunk/qpid/python/setup.py Thu Feb 18 21:29:59 2010
@@ -270,22 +270,25 @@
     else:
       return None, None
 
+def pclfile(xmlfile):
+  return "%s.pcl" % os.path.splitext(xmlfile)[0]
+
 class install_lib(_install_lib):
 
   def get_outputs(self):
     outputs = _install_lib.get_outputs(self)
     extra = []
     for of in outputs:
-      if os.path.basename(of) == "amqp.0-10-qpid-errata.xml":
-        extra.append("%s.ops.pcl" % of)
+      if os.path.basename(of) == "amqp-0-10-qpid-errata.xml":
+        extra.append(pclfile(of))
     return outputs + extra
 
   def install(self):
     outfiles = _install_lib.install(self)
     extra = []
     for of in outfiles:
-      if os.path.basename(of) == "amqp.0-10-qpid-errata.xml":
-        tgt = "%s.ops.pcl" % of
+      if os.path.basename(of) == "amqp-0-10-qpid-errata.xml":
+        tgt = pclfile(of)
         if self.force or newer(of, tgt):
           log.info("caching %s to %s" % (of, os.path.basename(tgt)))
           if not self.dry_run:



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org