Skip to content

/ Zope / gocept svn checkins / Archive / 2007 / 2007-02 / Re: [gocept svn checkins] SVN: r4444 - buildout-recipes/gocept.cmmi/tags/gocept.cmmi-0.9

[ << ] [ >> ]

[ SVN: r4442 - gocept.js.dojo/trunk/src/gocept/js/do... ] [ SVN: r4453 - gtimelog/trunk / Michael Howitz ... ]

Re: [gocept svn checkins] SVN: r4444 - buildout-recipes/gocept.cmmi/tags/gocept.cmmi-0.9
Christian Theune <ct(at)gocept.com>
2007-02-14 23:08:54 [ FULL ]
Am Mittwoch, den 14.02.2007, 22:30 +0100 schrieb Thomas Lotze:[...]

Ich habe mir angewoehnt die tags nur noch "0.9" zu nennen, machts noch
etwas flacher.

Theuni
[...]
Attachments:  
signature.asc application/pgp-signature 190 Bytes

Re: [Team] Re: [gocept svn checkins] SVN: r4444 - buildout-recipes/gocept.cmmi/tags/gocept.cmmi-0.9
Christian Zagrodnick <cz(at)gocept.com>
2007-02-15 07:52:41 [ FULL ]
On 14.02.2007, at 23:08, Christian Theune wrote:
[...][...][...]

Joah. Das reicht bei SVN imo auch. muss ich wohl bei gelegenheit mal  
mein release script anpassen ;)

[...]
Attachments:  
PGP.sig application/pgp-signature 187 Bytes

Re: [gocept svn checkins] SVN: r4452 - gocept.icon
"Christian Theune" <ct(at)gocept.com>
2007-02-16 22:13:46 [ FULL ]
> Author: roman[...]

Wow. =)

Ich glaub das Paket hat die kuerzeste Lifetime eines Paketes in unserem
Repository gehabt. *g

SVN: r4459 - buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi
Thomas Lotze <tl(at)gocept.com>
2007-02-21 22:56:16 [ FULL ]
Author: thomas
Date: Wed Feb 21 22:56:14 2007
New Revision: 4459

Modified:
   buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py
Log:
switching from os.system to subprocess.call

Modified: buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py
==============================================================================
--- buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py	(original)
+++ buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py	Wed Feb 21
22:56:14 2007
(at)(at) -16,16 +16,11 (at)(at)
 import os.path
 import tempfile
 import shutil
+import subprocess
 
 import gocept.download
 
 
-# This function was taken from zc.recipe.cmmi:
-def system(command):
-    if os.system(command):
-        raise SystemError("Failed", command)
-
-
 class Recipe(object):
     """zc.buildout recipe for building a software package from source.
 
(at)(at) -58,11 +53,7 (at)(at)
     def install(self):
         build_dir = tempfile.mkdtemp("buildout-" + self.name)
 
-        # The extra options treatment was taken from zc.recipe.cmmi:
-        extra_options = self.options.get('extra-options', '')
-        # get rid of any newlines that may be in the options so they
-        # do not get passed through to the commandline
-        extra_options = ' '.join(extra_options.split())
+        extra_options = self.options.get('extra-options', '').split()
 
         try:
             dl_options = self.options.copy()
(at)(at) -82,9 +73,9 (at)(at)
         here = os.getcwd()
         os.chdir(build_dir)
         try:
-            system("./configure --prefix=%s %s" % (location, extra_options))
-            system("make")
-            system("make install")
+            call(["./configure", "--prefix=" + location] + extra_options)
+            call(["make"])
+            call(["make", "install"])
         finally:
             os.chdir(here)
 
(at)(at) -94,3 +85,8 (at)(at)
 
     def update(self):
         pass
+
+
+def call(command, environ):
+    if subprocess.call(command, env=environ):
+        raise SystemError("Failed", command)

SVN: r4460 - buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi
Thomas Lotze <tl(at)gocept.com>
2007-02-21 22:57:25 [ FULL ]
Author: thomas
Date: Wed Feb 21 22:57:24 2007
New Revision: 4460

Modified:
   buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py
Log:
adding an extra-vars option to influence the environment of the cmmi
subprocesses

Modified: buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py
==============================================================================
--- buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py	(original)
+++ buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py	Wed Feb 21
22:57:24 2007
(at)(at) -26,7 +26,12 (at)(at)
 
     Configuration options:
 
-        extra-options
+        extra-options: A string appended to the configure command line.
+
+        extra-vars: Additional environment variables for the cmmi process,
+                    specified as name=value pairs, each on its own line.
+                    Values may be double-quoted to protect whitespace.
+                    Variables with empty values are removed entirely.
 
     Options passed to gocept.download:
 
(at)(at) -54,6 +59,8 (at)(at)
         build_dir = tempfile.mkdtemp("buildout-" + self.name)
 
         extra_options = self.options.get('extra-options', '').split()
+        environ = os.environ.copy()
+        update_environ(environ, self.options.get("extra-vars", ""))
 
         try:
             dl_options = self.options.copy()
(at)(at) -73,9 +80,10 (at)(at)
         here = os.getcwd()
         os.chdir(build_dir)
         try:
-            call(["./configure", "--prefix=" + location] + extra_options)
-            call(["make"])
-            call(["make", "install"])
+            call(["./configure", "--prefix=" + location] + extra_options,
+                 environ)
+            call(["make"], environ)
+            call(["make", "install"], environ)
         finally:
             os.chdir(here)
 
(at)(at) -87,6 +95,19 (at)(at)
         pass
 
 
+def update_environ(environ, extra_vars):
+    for line in extra_vars.splitlines():
+        if line.strip():
+            name, value = line.split('=', 1)
+            name, value = name.strip(), value.strip()
+            if value[0] == value[-1] == '"':
+                value = value[1:-1]
+            if value:
+                environ[name] = value
+            elif name in environ:
+                del environ[name]
+
+
 def call(command, environ):
     if subprocess.call(command, env=environ):
         raise SystemError("Failed", command)

SVN: r4461 - in buildout-recipes/gocept.cmmi/tags/0.9.1: . src/gocept/cmmi
Thomas Lotze <tl(at)gocept.com>
2007-02-21 23:04:00 [ FULL ]
Author: thomas
Date: Wed Feb 21 23:03:57 2007
New Revision: 4461

Added:
   buildout-recipes/gocept.cmmi/tags/0.9.1/
      - copied from r4458, buildout-recipes/gocept.cmmi/trunk/
   buildout-recipes/gocept.cmmi/tags/0.9.1/src/gocept/cmmi/__init__.py
      - copied unchanged from r4460,
buildout-recipes/gocept.cmmi/trunk/src/gocept/cmmi/__init__.py
Modified:
   buildout-recipes/gocept.cmmi/tags/0.9.1/setup.py
Log:
tagging gocept.cmmi-0.9.1

Modified: buildout-recipes/gocept.cmmi/tags/0.9.1/setup.py
==============================================================================
--- buildout-recipes/gocept.cmmi/trunk/setup.py	(original)
+++ buildout-recipes/gocept.cmmi/tags/0.9.1/setup.py	Wed Feb 21 23:03:57 2007
(at)(at) -3,7 +3,7 (at)(at)
 name = "gocept.cmmi"
 setup(
     name = name,
-    version = "dev",
+    version = "0.9.1",
     author = "Thomas Lotze",
     author_email = "tl(at)gocept.com",
     description = \

MailBoxer