[Oscar-checkins] r5751 - in pkgsrc/tools/opkgc: Opkgc templates/debian

[<jpa...@os...>]

Author: jparpail
Date: 2007-03-22 11:46:14 -0400 (Thu, 22 Mar 2007)
New Revision: 5751

Modified:
   pkgsrc/tools/opkgc/Opkgc/
   pkgsrc/tools/opkgc/Opkgc/OpkgcCompiler.py
   pkgsrc/tools/opkgc/Opkgc/OpkgcXml.py
   pkgsrc/tools/opkgc/templates/debian/control.xslt
Log:
[OPKGC]
	Update Debian template for control file
	Dir created with Debian files contains package name




Property changes on: pkgsrc/tools/opkgc/Opkgc
___________________________________________________________________
Name: svn:ignore
   - OpkgcXslt.pyc
OpkgcCompiler.pyc

   + OpkgcXslt.pyc
OpkgcCompiler.pyc
OpkgcConfig.pyc
__init__.pyc
OpkgcXml.pyc


Modified: pkgsrc/tools/opkgc/Opkgc/OpkgcCompiler.py
===================================================================
--- pkgsrc/tools/opkgc/Opkgc/OpkgcCompiler.py	2007-03-22 14:19:24 UTC (rev 5750)
+++ pkgsrc/tools/opkgc/Opkgc/OpkgcCompiler.py	2007-03-22 15:46:14 UTC (rev 5751)
@@ -19,33 +19,33 @@
 class Compiler:
     """ Generic class for compiling config.xml
     """
-    __config = None
+    config = None
 
-    __xml_tool = None
-    __dest_dir = ''
-    __validate = True
+    dest_dir = ''
+    validate = True
 
+    xml_tool = XmlTools()
+
     def __init__(self, dest_dir, validate):
-        self.__dest_dir = dest_dir
-        self.__xml_tool = XmlTools()
-        self.__validate = validate
+        self.dest_dir = dest_dir
+        self.validate = validate
 
     def getDestDir(self):
-        return self.__dest_dir
+        return self.dest_dir
 
     def xmlInit(self, orig):
-        self.__xml_tool.init (orig)
+        self.xml_tool.init (orig)
 
     def xmlValidate(self):
-        if self.__validate:
-            self.__xml_tool.validate()
+        if self.validate:
+            self.xml_tool.validate()
 
     def xmlCompile(self, template, dest):
         """ Transform 'orig' to 'dest' with XSLT template 'template'
         
         'template' is a XSLT file
         """
-        self.__xml_tool.transform (os.path.join (Config().getValue("templateDir"), template), dest)
+        self.xml_tool.transform (template, dest)
 
     def rmDir(self, d):
         """ Remove recursively a directory, even if not empty, like rm -r
@@ -71,13 +71,15 @@
     """ Extend Compiler for RPM packaging
     """
 
-    __template = 'opkg-core-spec.xsl'
-    __dest = 'test.spec'
+    template = 'opkg-core-spec.xsl'
+    dest = 'test.spec'
 
     def compile(self, file):
         self.xmlInit (file)
         self.xmlValidate ()
-        self.xmlCompile(self.__template, os.path.join(self.getDestDir(), self.__dest))
+        self.xmlCompile(
+            os.path.join(Config().getValue("templateDir"), self.template),
+            os.path.join(self.getDestDir(), self.dest))
 
     def build(self):
         print "Not yet implemented"
@@ -86,8 +88,8 @@
     """ Extend Compiler for Debian packaging
     """
 
-    __deb_dir = 'debian'
-    __pkg_dir = 'opkg'
+    debDir = 'debian'
+    pkgDir = 'opkg'
 
     def compile(self, file):
         """ Creates debian package files
@@ -95,7 +97,10 @@
         self.xmlInit (file)
         self.xmlValidate ()
 
-        debiandir = os.path.join(self.getDestDir(), self.__pkg_dir, 'debian')
+        pkgName = self.xml_tool.getXmlDoc().find('/name').text.lower()
+        pkgDir = self.pkgDir+'-'+pkgName
+
+        debiandir = os.path.join(self.getDestDir(), pkgDir, 'debian')
         if (os.path.exists(debiandir)):
             self.rmDir(debiandir)
         os.makedirs(debiandir)
@@ -115,7 +120,7 @@
         """ Return list of files in Debian templates dir
         """
         ret = []
-        for p in os.listdir(os.path.join(Config().getValue("templateDir"), self.__deb_dir)):
+        for p in os.listdir(os.path.join(Config().getValue("templateDir"), self.debDir)):
             if not re.search("\.svn", p):
-                ret.append(os.path.join(Config().getValue("templateDir"), self.__deb_dir, p))
+                ret.append(os.path.join(Config().getValue("templateDir"), self.debDir, p))
         return ret

Modified: pkgsrc/tools/opkgc/Opkgc/OpkgcXml.py
===================================================================
--- pkgsrc/tools/opkgc/Opkgc/OpkgcXml.py	2007-03-22 14:19:24 UTC (rev 5750)
+++ pkgsrc/tools/opkgc/Opkgc/OpkgcXml.py	2007-03-22 15:46:14 UTC (rev 5751)
@@ -52,3 +52,5 @@
         xml_file.close()
         return xml_doc
 
+    def getXmlDoc(self):
+        return self.__xml_doc

Modified: pkgsrc/tools/opkgc/templates/debian/control.xslt
===================================================================
--- pkgsrc/tools/opkgc/templates/debian/control.xslt	2007-03-22 14:19:24 UTC (rev 5750)
+++ pkgsrc/tools/opkgc/templates/debian/control.xslt	2007-03-22 15:46:14 UTC (rev 5751)
@@ -6,17 +6,8 @@
 <xsl:template name="depends" >
   <xsl:param name="group" />
   
-  <xsl:for-each select="binary-package-list/pkg">
-    <xsl:if test="../filter/distribution/name = 'debian' or not(../filter/distribution)" >
-      <xsl:choose>
-	<xsl:when test="../filter/group = $group" >
-	  <xsl:call-template name="addpkg" />
-	</xsl:when>
-	<xsl:when test="$group = 'oscar_api' and not(../filter/group)" >
-	  <xsl:call-template name="addpkg" />
-	</xsl:when>
-      </xsl:choose>
-    </xsl:if>
+  <xsl:for-each select="binary-package-list/pkg[(../filter/distribution/name = 'debian' or not(../filter/distribution)) and (../filter/group = $group or (not(../filter/group) and $group = 'oscar_api'))]">
+    <xsl:call-template name="addpkg" />
   </xsl:for-each>
 </xsl:template>