The branch, v4-0-test has been updated
via cf59ec4cc3c3dca9275236bf45caf56632bf983a (commit)
via 67f15cd484dbf7b49e6c5cb2566ad95d05b66b5b (commit)
via 1ec6870966bcd25b1932da675386d3ad5bcd9b6f (commit)
via ea3d3b52504b45f45aca434ea4376906f65ead12 (commit)
via a932a2e37d1aa86cca769398721318b3942fad83 (commit)
via 2c2a589183067d7fced4ace33380bd1af610924a (commit)
via 3519aae1845f2a15330184625d541ce0f0cac56b (commit)
via 17d2f682e94154ee654de59b88816437f4e7f093 (commit)
via e0afbc3778ca7c6dc087e2b9f4992a131ec66a75 (commit)
from d54421a9eeadbd76791917c5e3c460c897259ede (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit cf59ec4cc3c3dca9275236bf45caf56632bf983a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Mon Feb 25 15:48:35 2008 +0100
Remove unused include.
commit 67f15cd484dbf7b49e6c5cb2566ad95d05b66b5b
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 17:18:23 2008 +0100
Use make to generate list of python files, remove unused variable.
commit 1ec6870966bcd25b1932da675386d3ad5bcd9b6f
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 17:14:03 2008 +0100
Use make to create lists of plugins, remove duplicate variable.
commit ea3d3b52504b45f45aca434ea4376906f65ead12
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 16:48:36 2008 +0100
Generate manpage list with make.
commit a932a2e37d1aa86cca769398721318b3942fad83
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 17:12:01 2008 +0100
Use make to create lists of pc files and prototype headers.
commit 2c2a589183067d7fced4ace33380bd1af610924a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 16:58:26 2008 +0100
Use make to generate lists of libraries.
commit 3519aae1845f2a15330184625d541ce0f0cac56b
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 16:58:26 2008 +0100
Use make to generate lists of libraries.
commit 17d2f682e94154ee654de59b88816437f4e7f093
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 17:01:27 2008 +0100
Use make to generate list of prototype headers.
commit e0afbc3778ca7c6dc087e2b9f4992a131ec66a75
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 16:38:01 2008 +0100
Create SBIN_PROGS and BIN_PROGS lists from within make.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/cflags.pm | 2 -
source/build/smb_build/main.pl | 2 +-
source/build/smb_build/makefile.pm | 52 +++++++++++------------------------
3 files changed, 18 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/cflags.pm b/source/build/smb_build/cflags.pm
index a4ab90a..ad6cd42 100755
--- a/source/build/smb_build/cflags.pm
+++ b/source/build/smb_build/cflags.pm
@@ -23,8 +23,6 @@ sub create_cflags($$$$) {
open(CFLAGS_TXT,">$file") || die ("Can't open `$file'\n");
- print CFLAGS_TXT "include mkconfig.mk\n";
-
my $src_ne_build = ($srcdir ne $builddir) ? 1 : 0;
foreach my $key (values %{$CTX}) {
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 3ed0327..9690c46 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -56,7 +56,7 @@ foreach my $key (values %$OUTPUT) {
$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/,
@{$key->{OUTPUT_TYPE}});
if (defined($key->{PC_FILE})) {
- push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}");
+ $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n");
}
$mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/,
@{$key->{OUTPUT_TYPE}});
diff --git a/source/build/smb_build/makefile.pm
b/source/build/smb_build/makefile.pm
index fa2d788..96ab789 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -21,17 +21,6 @@ sub new($$$)
bless($self, $myname);
- $self->{manpages} = [];
- $self->{sbin_progs} = [];
- $self->{bin_progs} = [];
- $self->{static_libs} = [];
- $self->{python_dsos} = [];
- $self->{python_pys} = [];
- $self->{shared_libs} = [];
- $self->{headers} = [];
- $self->{plugins} = [];
- $self->{pc_files} = [];
- $self->{proto_headers} = [];
$self->{output} = "";
$self->{mkfile} = $mkfile;
@@ -129,10 +118,9 @@ sub SharedModule($$)
$sane_subsystem =~ s/^lib//;
if ($ctx->{TYPE} eq "PYTHON") {
- push (@{$self->{python_dsos}},
- "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+ $self->output("PYTHON_DSOS +=
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
} else {
- push (@{$self->{plugins}},
"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+ $self->output("PLUGINS +=
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
$self->output("installplugins::
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
$self->output("[EMAIL PROTECTED] Installing
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as
\$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
$self->output("[EMAIL PROTECTED] -p
\$(DESTDIR)\$(modulesdir)/$sane_subsystem/\n");
@@ -220,7 +208,7 @@ sub SharedLibrary($$)
{
my ($self,$ctx) = @_;
- push (@{$self->{shared_libs}}, $ctx->{RESULT_SHARED_LIBRARY}) if
(defined($ctx->{SO_VERSION}));
+ $self->output("SHARED_LIBS +=
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n") if (defined($ctx->{SO_VERSION}));
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -276,7 +264,7 @@ sub StaticLibrary($$)
return unless (defined($ctx->{OBJ_FILES}));
- push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if
($ctx->{TYPE} eq "LIBRARY");
+ $self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if
($ctx->{TYPE} eq "LIBRARY");
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
@@ -288,9 +276,15 @@ sub Header($$)
{
my ($self,$ctx) = @_;
+ return if ($#{$ctx->{PUBLIC_HEADERS}} == -1);
+
+ $self->output("PUBLIC_HEADERS +=");
+
foreach (@{$ctx->{PUBLIC_HEADERS}}) {
- push (@{$self->{headers}}, output::add_dir_str($ctx->{BASEDIR},
$_));
+ $self->output(" " . output::add_dir_str($ctx->{BASEDIR}, $_));
}
+
+ $self->output("\n");
}
sub Binary($$)
@@ -301,9 +295,9 @@ sub Binary($$)
unless (defined($ctx->{INSTALLDIR})) {
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
- push (@{$self->{sbin_progs}}, $ctx->{RESULT_BINARY});
+ $self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
- push (@{$self->{bin_progs}}, $ctx->{RESULT_BINARY});
+ $self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n");
}
$self->output("binaries:: $ctx->{TARGET_BINARY}\n");
@@ -342,7 +336,7 @@ sub PythonFiles($$)
my $target = "bin/python/".basename($_);
my $source = output::add_dir_str($ctx->{BASEDIR}, $_);
$self->output("$target: $source\n\n");
- push (@{$self->{python_pys}}, $target);
+ $self->output("PYTHON_PYS += $target\n");
}
}
@@ -350,8 +344,7 @@ sub Manpage($$)
{
my ($self,$ctx) = @_;
- my $path = output::add_dir_str($ctx->{BASEDIR}, $ctx->{MANPAGE});
- push (@{$self->{manpages}}, $path);
+ $self->output("MANPAGES += " . output::add_dir_str($ctx->{BASEDIR},
$ctx->{MANPAGE}) . "\n");
}
sub ProtoHeader($$)
@@ -372,7 +365,7 @@ sub ProtoHeader($$)
$comment .= " and ";
$target.= " ";
}
- push (@{$self->{proto_headers}}, $priv);
+ $self->output("PROTO_HEADERS += $priv\n");
} else {
$ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
$priv = output::add_dir_str($ctx->{BASEDIR},
$ctx->{PRIVATE_PROTO_HEADER});
@@ -382,7 +375,7 @@ sub ProtoHeader($$)
$pub = output::add_dir_str($ctx->{BASEDIR},
$ctx->{PUBLIC_PROTO_HEADER});
$comment .= $pub;
$target .= $pub;
- push (@{$self->{proto_headers}}, $pub);
+ $self->output("PROTO_HEADERS += $pub\n");
} else {
$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
$pub = output::add_dir_str($ctx->{BASEDIR},
$ctx->{PUBLIC_PROTO_HEADER});
@@ -397,18 +390,7 @@ sub write($$)
{
my ($self, $file) = @_;
- $self->output("MANPAGES = " . array2oneperline($self->{manpages})."\n");
- $self->output("BIN_PROGS = " . array2oneperline($self->{bin_progs}) .
"\n");
- $self->output("SBIN_PROGS = " . array2oneperline($self->{sbin_progs}) .
"\n");
- $self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs})
. "\n");
- $self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs})
. "\n");
- $self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos})
. "\n");
- $self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) .
"\n");
- $self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers})
. "\n");
- $self->output("PC_FILES = " . array2oneperline($self->{pc_files}) .
"\n");
$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) .
"\n");
- $self->output("PROTO_HEADERS = " .
array2oneperline($self->{proto_headers}) . "\n");
- $self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
$self->_prepare_mk_files();
--
Samba Shared Repository
