The branch, v3-6-test has been updated
via f52c294 waf: change private libraries to use the same soname as
public libraries
via 0f4c89b buildtools: add the PRIVATE_EXTENSION for private libraries
via 0fec411 wafsamba: Allow newer or the same python module versions to
be installed, not older.
via ad73c72 buildtools/wafsamba: import 'sys' and 'Logs' if we use them
from c68f4af Remove all uses of "./" in pathnames - make canonical. This
will become important when we need to guarantee canonical names for hashing.
(cherry picked from commit f278cc1a1f253b6492ef60c2879bdae6a2730084)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit f52c2942ff2817f5521784a854460dd6b1f4484f
Author: Andrew Tridgell <tri...@samba.org>
Date: Wed Jan 19 11:04:05 2011 +1100
waf: change private libraries to use the same soname as public libraries
See
http://lists.samba.org/archive/samba-technical/2011-January/075816.html
for a description of the reason behind this change
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
Autobuild-User: Andrew Tridgell <tri...@samba.org>
Autobuild-Date: Wed Jan 19 02:21:06 CET 2011 on sn-devel-104
(cherry picked from commit 7d8e9706f7829feaef928424e76bd7df6e223762)
commit 0f4c89b0bebedeb8f0800a59a0bb02a7570f6d84
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Dec 8 12:02:51 2010 +0100
buildtools: add the PRIVATE_EXTENSION for private libraries
metze
(cherry picked from commit aee086c4d5a5b591814e7e78b3f24420a8ffff48)
commit 0fec411dcf8906afeeece01a6827ac4d01d85379
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 21 23:52:15 2010 +0100
wafsamba: Allow newer or the same python module versions to be installed,
not older.
Autobuild-User: Jelmer Vernooij <jel...@samba.org>
Autobuild-Date: Wed Dec 22 00:42:23 CET 2010 on sn-devel-104
(cherry picked from commit e43de85b97dfa584ba9cfb7b18ed302fddb767ae)
commit ad73c7262727e0c8a82c4b032ded3c63db34b006
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jan 5 12:16:15 2011 +0100
buildtools/wafsamba: import 'sys' and 'Logs' if we use them
We should avoid generating a backtrace in a normal
error case, just because sys.exit(1) isn't known.
metze
(cherry picked from commit e0a9b58de8bd86122d17c0330cb1f0330207c023)
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/pkgconfig.py | 2 +-
buildtools/wafsamba/samba_autoconf.py | 2 +-
buildtools/wafsamba/samba_bundled.py | 19 +++++++------------
buildtools/wafsamba/samba_deps.py | 2 +-
buildtools/wafsamba/samba_pidl.py | 2 +-
buildtools/wafsamba/wafsamba.py | 2 +-
buildtools/wafsamba/wscript | 2 +-
7 files changed, 13 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index 1a41c80..b09f681 100644
--- a/buildtools/wafsamba/pkgconfig.py
+++ b/buildtools/wafsamba/pkgconfig.py
@@ -1,6 +1,6 @@
# handle substitution of variables in pc files
-import Build
+import Build, sys, Logs
from samba_utils import *
def subst_at_vars(task):
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 03031a7..428471a 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -1,6 +1,6 @@
# a waf tool to add autoconf-like macros to the configure section
-import Build, os, Options, preproc, Logs
+import Build, os, sys, Options, preproc, Logs
import string
from Configure import conf
from samba_utils import *
diff --git a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index 4f6590e..2e3e130 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -1,21 +1,16 @@
# functions to support bundled libraries
from Configure import conf
-import Logs
+import sys, Logs
from samba_utils import *
def PRIVATE_NAME(bld, name, private_extension, private_library):
'''possibly rename a library to include a bundled extension'''
- if bld.env.DISABLE_SHARED or not private_extension:
- return name
- if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
- return name
- if private_library and bld.EXPAND_VARIABLES(bld.env.LIBDIR) !=
bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR):
- # Private libraries already have their own namespace in another way
- return name
- extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
- if extension:
- return name + '-' + extension
+
+ # we now use the same private name for libraries as the public name.
+ # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
+ # demonstration that this is the right thing to do
+ # also see
http://lists.samba.org/archive/samba-technical/2011-January/075816.html
return name
@@ -175,7 +170,7 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename,
minversion='0.0.0'):
except AttributeError:
found = False
else:
- found = tuple(minversion.split(".")) >= tuple(version.split("."))
+ found = tuple(version.split(".")) >= tuple(minversion.split("."))
if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
Logs.error('ERROR: Python module %s of version %s not found, and
bundling disabled' % (libname, minversion))
sys.exit(1)
diff --git a/buildtools/wafsamba/samba_deps.py
b/buildtools/wafsamba/samba_deps.py
index 91737d5..c405fee 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -1,6 +1,6 @@
# Samba automatic dependency handling and project rules
-import Build, os, re, Environment, Logs, time
+import Build, os, sys, re, Environment, Logs, time
from samba_utils import *
from samba_autoconf import *
from samba_bundled import BUILTIN_LIBRARY
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 902d4c6..bfe8a26 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -1,7 +1,7 @@
# waf build tool for building IDL files with pidl
from TaskGen import before
-import Build, os
+import Build, os, sys, Logs
from samba_utils import *
def SAMBA_PIDL(bld, pname, source,
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4e1b3e1..ec0f9be 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -1,7 +1,7 @@
# a waf tool to add autoconf-like macros to the configure section
# and for SAMBA_ macros for building libraries, binaries etc
-import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil,
Logs, Constants
+import Build, os, sys, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil,
Logs, Constants
from Configure import conf
from Logs import debug
from samba_utils import SUBST_VARS_RECURSIVE
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 0d91237..50ebd3f 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -2,7 +2,7 @@
# this is a base set of waf rules that everything else pulls in first
-import sys, wafsamba, Configure
+import sys, wafsamba, Configure, Logs
import Options, os, preproc
from samba_utils import *
from optparse import SUPPRESS_HELP
--
Samba Shared Repository
