svn commit: samba r3695 - in branches/SAMBA_4_0/source/build/smb_build: .

jelmer at samba.org jelmer at samba.org
Fri Nov 12 02:47:24 GMT 2004


Author: jelmer
Date: 2004-11-12 02:47:24 +0000 (Fri, 12 Nov 2004)
New Revision: 3695

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3695

Log:
Add intermediate functions to use when migrating from .m4+.mk to .pm files

Added:
   branches/SAMBA_4_0/source/build/smb_build/direct.pm
Modified:
   branches/SAMBA_4_0/source/build/smb_build/main.pm


Changeset:
Added: branches/SAMBA_4_0/source/build/smb_build/direct.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/direct.pm	2004-11-12 02:45:52 UTC (rev 3694)
+++ branches/SAMBA_4_0/source/build/smb_build/direct.pm	2004-11-12 02:47:24 UTC (rev 3695)
@@ -0,0 +1,63 @@
+# Subs for build system stuff without the .mk files
+# Copyright (C) 2004 Jelmer Vernooij <jelmer at samba.org>
+
+use strict;
+
+our $SMB_BUILD_CTX;
+
+sub Subsystem($$)
+{
+	my $name = shift;
+	my $data = shift;
+	$data->{NAME} = $name;
+	%{$SMB_BUILD_CTX->{INPUT}{SUBSYSTEM}{$name}} = %{$data};
+}
+
+sub Module($$)
+{
+	my $name = shift;
+	my $data = shift;
+	$data->{NAME} = $name;
+	%{$SMB_BUILD_CTX->{INPUT}{MODULES}{$name}} = %{$data};
+}
+
+sub ExternalLibrary($$)
+{
+	my $name = shift;
+	my $data = shift;
+	$data->{NAME} = $name;
+	%{$SMB_BUILD_CTX->{INPUT}{EXT_LIBS}{$name}} = %{$data};
+}
+
+sub Library($$)
+{
+	my $name = shift;
+	my $data = shift;
+	$data->{NAME} = $name;
+	%{$SMB_BUILD_CTX->{INPUT}{LIBRARIES}{$name}} = %{$data};
+}
+
+sub Binary($$)
+{
+	my $name = shift;
+	my $data = shift;
+	$data->{NAME} = $name;
+	%{$SMB_BUILD_CTX->{INPUT}{BINARIES}{$name}} = %{$data};
+}
+
+sub DisableModule($)
+{
+	$SMB_BUILD_CTX->{INPUT}{MODULES}{shift}{ENABLE} = "NO";
+}
+
+sub DisableBinary($)
+{
+	$SMB_BUILD_CTX->{INPUT}{BINARIES}{shift}{ENABLE} = "NO";
+}
+
+sub DisableLibrary($)
+{
+	$SMB_BUILD_CTX->{INPUT}{LIBRARIES}{shift}{ENABLE} = "NO";
+}
+
+1;

Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pm	2004-11-12 02:45:52 UTC (rev 3694)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm	2004-11-12 02:47:24 UTC (rev 3695)
@@ -12,14 +12,16 @@
 use input;
 use config_mk;
 use output;
+use direct;
 use dump;
 use strict;
 
 sub smb_build_main($)
 {
-	my $SMB_BUILD_CTX = shift;
+	our $SMB_BUILD_CTX = shift;
+
 	input::check($SMB_BUILD_CTX);
-
+	
 	depend::create_depend($SMB_BUILD_CTX);
 
 	output::create_output($SMB_BUILD_CTX);
@@ -30,6 +32,7 @@
 
 	dump::dump_ctx($SMB_BUILD_CTX);
 
+
 	return 0;
 }
 1;



More information about the samba-cvs mailing list