Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (42461e2e1dd95dab262ea56040ad1656c95d6305)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (42461e2e1dd95dab262ea56040ad1656c95d6305)
  • Date: Fri, 10 Oct 2008 18:03:02 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

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

New commits:
commit 42461e2e1dd95dab262ea56040ad1656c95d6305
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

scons: => 1.1.0

diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index b6c3cd4..63853e3 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,8 +1,8 @@
SPELL=scons
- VERSION=1.0.1
-
SOURCE_HASH=sha512:f8f99fc0f169e92692a94343c287e15f569befe2a06c8e37795971722418d44f7d5f236f6895ec6eb9f0667ceb58abee7dec360e2114f137c6ba300974edcb0e
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:6bb66fe8927b69913409cd8d6466a7cb9325aeb90f7ebe55a87309c8e446ef37d72a9d7c516414e62d5606bd5d9f9a36f312b4c060b88128fde7dcc6821f8332
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=MIT
WEB_SITE=http://www.scons.org/
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index f79ca8e..863851d 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,8 @@
+2008-10-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.0; quoting paths
+ * PRE_BUILD: removed patch-applying; quoting paths
+ * scons-1.0.1-csig.patch: removed, fixed in 1.1.0
+
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
diff --git a/python-pypi/scons/PRE_BUILD b/python-pypi/scons/PRE_BUILD
index 942fc9c..5f216c5 100755
--- a/python-pypi/scons/PRE_BUILD
+++ b/python-pypi/scons/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
# fix man page install location
-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"
+sed -i "s/\('man', 'man1'\)/'share', \1/" setup.py
diff --git a/python-pypi/scons/scons-1.0.1-csig.patch
b/python-pypi/scons/scons-1.0.1-csig.patch
deleted file mode 100644
index 7222d19..0000000
--- a/python-pypi/scons/scons-1.0.1-csig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 Vlad Glagolev (42461e2e1dd95dab262ea56040ad1656c95d6305), Vlad Glagolev, 10/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page