Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ffa04260d8c9203cfbd18e554a2fb8412aab1962)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ffa04260d8c9203cfbd18e554a2fb8412aab1962)
  • Date: Sun, 14 Sep 2008 17:27:12 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

python-pypi/scons/DETAILS | 4 +--
python-pypi/scons/HISTORY | 5 ++++
python-pypi/scons/PRE_BUILD | 5 +++-
python-pypi/scons/scons-1.0.1-csig.patch | 33
+++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit ffa04260d8c9203cfbd18e554a2fb8412aab1962
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

scons: backport a bugfix, needed for libffado install, for example

commit 63c1e529c663228f12c959c9267248f251539ff9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

scons: update to 1.0.1

diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index bb3f0b8..b6c3cd4 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
SPELL=scons
- VERSION=1.0.0
-
SOURCE_HASH=sha512:edffa6ac6ac82185d34f28ab3e185fcd0a13809a69ede7788218f9a4d5d6827cc02a793b3a26044b1c4b7e4a7b765939da188aeb7026c621ef658e2a43f6c5c2
+ VERSION=1.0.1
+
SOURCE_HASH=sha512:f8f99fc0f169e92692a94343c287e15f569befe2a06c8e37795971722418d44f7d5f236f6895ec6eb9f0667ceb58abee7dec360e2114f137c6ba300974edcb0e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index 9c90a0e..f79ca8e 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,8 @@
+2008-09-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: 1.0.1
+ * PRE_BUILD, scons-1.0.1-csig.patch: fix a nasty bug for installing
+ enables cast of libffado, will be obsoleted by upcoming 1.1 release
+
2008-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/python-pypi/scons/PRE_BUILD b/python-pypi/scons/PRE_BUILD
index c6f32d1..942fc9c 100755
--- a/python-pypi/scons/PRE_BUILD
+++ b/python-pypi/scons/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# fix man page install location
-sed -i "s/\('man', 'man1'\)/'share', \1/" setup.py
+sed -i "s/\('man', 'man1'\)/'share', \1/" setup.py &&
+# fix scons: *** DirNodeInfo instance has no attribute 'csig'
+# remove that on 1.1 release!
+patch -Np1 < "$SCRIPT_DIRECTORY/scons-1.0.1-csig.patch"
diff --git a/python-pypi/scons/scons-1.0.1-csig.patch
b/python-pypi/scons/scons-1.0.1-csig.patch
new file mode 100644
index 0000000..7222d19
--- /dev/null
+++ b/python-pypi/scons/scons-1.0.1-csig.patch
@@ -0,0 +1,33 @@
+Index: src/engine/SCons/Node/FS.py
+===================================================================
+--- src/engine/SCons/Node/FS.py (Revision 3336)
++++ src/engine/SCons/Node/FS.py (Revision 3337)
+@@ -1593,10 +1593,25 @@
+ return None
+
+ def get_contents(self):
+- """Return aggregate contents of all our children."""
+- contents = map(lambda n: n.get_contents(), self.children())
+- return string.join(contents, '')
++ """Return content signatures and names of all our children
++ separated by new-lines. Ensure that the nodes are sorted."""
++ contents = []
++ name_cmp = lambda a, b: cmp(a.name, b.name)
++ sorted_children = self.children()[:]
++ sorted_children.sort(name_cmp)
++ for node in sorted_children:
++ contents.append('%s %s\n' % (node.get_csig(), node.name))
++ return string.join(contents, '')
+
++ def get_csig(self):
++ """Compute the content signature for Directory nodes. In
++ general, this is not needed and the content signature is not
++ stored in the DirNodeInfo. However, if get_contents on a Dir
++ node is called which has a child directory, the child
++ directory should return the hash of its contents."""
++ contents = self.get_contents()
++ return SCons.Util.MD5signature(contents)
++
+ def do_duplicate(self, src):
+ pass
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ffa04260d8c9203cfbd18e554a2fb8412aab1962), Thomas Orgis, 09/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page