[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Apr 7 15:01:08 MDT 2010
The branch, master has been updated
via e5bb6d5... s4-waf: Fix 'waf dist' app name.
via 472860c... Move configure_check_unused script to root scriptdir, as it is useful for both s3 and s4.
via 36474e5... s4: Remove unused pkg-config replacement in perl.
via 0473926... update-external: Support updating dnspython.
from 7ccd680... s3: Fix bug 7327 -- Build fails while building without kerberos
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e5bb6d56df9b8816665fd42a04531ef19b30be17
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 7 22:52:28 2010 +0200
s4-waf: Fix 'waf dist' app name.
commit 472860c9a7485e37627900cb450dca605051e07a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 7 22:17:34 2010 +0200
Move configure_check_unused script to root scriptdir, as it is useful
for both s3 and s4.
commit 36474e58676574d426f4f8a3a067be52fa78cc9f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 7 22:15:27 2010 +0200
s4: Remove unused pkg-config replacement in perl.
commit 0473926a5b448c1a0b397d079c353f8406588c0d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 7 22:13:34 2010 +0200
update-external: Support updating dnspython.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_dist.py | 2 +-
lib/update-external.sh | 5 +
.../script => script}/configure_check_unused.pl | 0
source4/script/pkg-config | 145 --------------------
4 files changed, 6 insertions(+), 146 deletions(-)
rename {source4/script => script}/configure_check_unused.pl (100%)
delete mode 100755 source4/script/pkg-config
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index e01bebe..68fdf08 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -19,7 +19,7 @@ def add_tarfile(tar, fname, abspath):
def dist(appname='',version=''):
- if not isinstance(appname, str):
+ if not appname:
# this copes with a mismatch in the calling arguments for dist()
appname = Utils.g_module.APPNAME
version = Utils.g_module.VERSION
diff --git a/lib/update-external.sh b/lib/update-external.sh
index 53748d8..fc2443b 100755
--- a/lib/update-external.sh
+++ b/lib/update-external.sh
@@ -13,4 +13,9 @@ echo "Updating testtools..."
bzr export "$WORKDIR/testtools" lp:testtools
rsync -avz --delete "$WORKDIR/testtools/" "$TARGETDIR/testtools/"
+echo "Updating dnspython..."
+git clone git://www.dnspython.org/dnspython.git "$WORKDIR/dnspython"
+rm -rf "$WORKDIR/dnspython/.git"
+rsync -avz --delete "$WORKDIR/dnspython/" "$TARGETDIR/dnspython/"
+
rm -rf "$WORKDIR"
diff --git a/source4/script/configure_check_unused.pl b/script/configure_check_unused.pl
similarity index 100%
rename from source4/script/configure_check_unused.pl
rename to script/configure_check_unused.pl
diff --git a/source4/script/pkg-config b/source4/script/pkg-config
deleted file mode 100755
index 458cac6..0000000
--- a/source4/script/pkg-config
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/perl
-# Simple pkg-config implementation in perl
-# jelmer at samba.org, November 2006
-
-use strict;
-use Getopt::Long;
-
-my @dirs = split(/:/, $ENV{PKG_CONFIG_PATH});
-
-my $opt_help = 0;
-my $opt_libs = 0;
-my $opt_cflags = 0;
-my $opt_static = 0;
-
-my $result = GetOptions (
- 'help|h|?' => \$opt_help,
- 'static' => \$opt_static,
- 'libs' => \$opt_libs,
- 'cflags' => \$opt_cflags
- );
-
-if (not $result) {
- exit(1);
-}
-
-if ($opt_help) {
- print "pkg-config replacement in perl\n";
- print "Copyright (C) 2006 Jelmer Vernooij <jelmer\@samba.org>\n";
- print "\n";
- print "Usage: pkg-config [OPTIONS] PACKAGE...\n";
- print " --help Print this help message\n";
- print " --static Print flags for static libraries\n";
- print " --libs Print linker flags\n";
- print " --cflags Print C compiler flags\n";
- print "\n";
- exit(0);
-}
-
-sub find_path($)
-{
- my $name = shift;
- foreach my $dir (@dirs) {
- if (-f "$dir/$name-uninstalled.pc") {
- return "$dir/$name-uninstalled.pc";
- }
- }
- foreach my $dir (@dirs) {
- if (-f "$dir/$name.pc" ) {
- return "$dir/$name.pc";
- }
- }
- die("No such package `$name'");
-}
-
-sub ReplaceVars($$)
-{
- my ($expr, $vars) = @_;
-
- $_ = $expr;
-
- while (/(.*)\${([^}]+)}(.*)/) {
- $_ = "$1$vars->{$2}$3";
- }
-
- return $_;
-}
-
-sub Parse($)
-{
- my $name = shift;
- my $path = find_path($name);
- my %variables = ();
- my %fields = ();
- my $lineno = 0;
- open(IN, "<$path") or die("Unable to open $path: $!");
- foreach (<IN>) {
- $lineno+=1;
- next if (/^#.*/);
- if (/^([A-Za-z.]+): (.*)$/) {
- $fields{$1} = ReplaceVars($2, \%variables);
- } elsif (/^([A-Za-z_]+)=(.*)$/) {
- $variables{$1} = ReplaceVars($2, \%variables);
- } elsif (/^[ \t]*$/) {
- } else {
- warn("$path:$lineno: parse error");
- }
- }
- close(IN);
- return \%fields;
-}
-
-sub Cflags($)
-{
- my $name = shift;
- my $fields = Parse($name);
- my @cflags = split(/ /, $fields->{Cflags});
- foreach (split(/[, ]/, $fields->{Requires})) {
- push (@cflags, Cflags($_));
- }
- return @cflags;
-}
-
-sub Libs($)
-{
- my $name = shift;
- my $fields = Parse($name);
- my @libs = split(/ /, $fields->{Libs});
- foreach (split(/[, ]/, $fields->{Requires})) {
- push (@libs, Libs($_));
- }
- if ($opt_static) {
- foreach (split(/[ ,]/, $fields->{"Requires.private"})) {
- push (@libs, Libs($_));
- }
- }
- return @libs;
-}
-
-my @out = ();
-
-foreach my $pkg (@ARGV)
-{
- push (@out, Libs($pkg)) if ($opt_libs);
- push (@out, Cflags($pkg)) if ($opt_cflags);
-}
-
-sub nub
-{
- my @list = @_;
- my @ret = ();
- my %seen = ();
- foreach (@list) {
- next if (defined($seen{$_}));
- push (@ret, $_);
- $seen{$_} = 1;
- }
- return @ret;
-}
-
-if ($#out >= 0) {
- @out = nub(@out);
- print join(' ', @out) . "\n";
-}
-
-exit 0;
--
Samba Shared Repository
More information about the samba-cvs
mailing list