svn commit: samba r14332 - in branches/SAMBA_4_0/source: .
build/smb_build gtk/common lib param
jelmer at samba.org
jelmer at samba.org
Mon Mar 13 18:31:43 GMT 2006
Author: jelmer
Date: 2006-03-13 18:31:42 +0000 (Mon, 13 Mar 2006)
New Revision: 14332
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14332
Log:
Built in different paths when running locally (from ./bin/) in developer
mode (./configure.developer). This will change the hardcoded value of a few
paths (BINDIR, SWATDIR, EJSDIR, SETUPDIR, DATADIR, MODULESDIR). The regular
locations will be used when running 'make install'.
This enables developers to work on (shared built) modules, swat, ejs and
setup files without having to run 'make install' each time.
Added:
branches/SAMBA_4_0/source/lib/version.c
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/dynconfig.c
branches/SAMBA_4_0/source/dynconfig.h
branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
branches/SAMBA_4_0/source/param/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-13 17:45:04 UTC (rev 14331)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-13 18:31:42 UTC (rev 14332)
@@ -408,22 +408,22 @@
if ($self->{duplicate_build}) {
$self->output(<< "__EOD__"
#
-bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
+bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \$(builddir)/dynconfig-devel.o
\@echo Linking \$\@
\@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\
- \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
+ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \$(builddir)/dynconfig-devel.o
__EOD__
);
}
$self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
+$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \$(builddir)/dynconfig.o
\@echo Linking \$\@
\@\$(CC) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\
- \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
+ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \$(builddir)/dynconfig.o
__EOD__
);
Modified: branches/SAMBA_4_0/source/dynconfig.c
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.c 2006-03-13 17:45:04 UTC (rev 14331)
+++ branches/SAMBA_4_0/source/dynconfig.c 2006-03-13 18:31:42 UTC (rev 14332)
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "version.h"
/**
* @file dynconfig.c
@@ -42,9 +41,6 @@
* table? There's kind of a chicken-and-egg situation there...
**/
-/** Directory with super-user binaries */
-_PUBLIC_ const char *dyn_SBINDIR = SBINDIR;
-
/** Directory with generic binaries */
_PUBLIC_ const char *dyn_BINDIR = BINDIR;
@@ -91,45 +87,4 @@
_PUBLIC_ const char *dyn_JSDIR = JSDIR;
/** Where to find the winbindd socket */
-
_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
-
-_PUBLIC_ const char *samba_version_string(void)
-{
- const char *official_string = SAMBA_VERSION_OFFICIAL_STRING;
-#ifdef SAMBA_VERSION_RELEASE_NICKNAME
- const char *release_nickname = SAMBA_VERSION_RELEASE_NICKNAME;
-#else
- const char *release_nickname = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_SUFFIX
- const char *vendor_suffix = SAMBA_VERSION_VENDOR_SUFFIX;
-#else
- const char *vendor_suffix = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_PATCH
- const char *vendor_patch = SAMBA_VERSION_VENDOR_PATCH;
-#else
- const char *vendor_patch = NULL;
-#endif
- static char *samba_version;
- static BOOL init_samba_version;
-
- if (init_samba_version) {
- return samba_version;
- }
-
- samba_version = talloc_asprintf(talloc_autofree_context(),
- "%s%s%s%s%s%s%s%s",
- official_string,
- (vendor_suffix?"-":""),
- (vendor_suffix?vendor_suffix:""),
- (vendor_patch?"-":""),
- (vendor_patch?vendor_patch:""),
- (release_nickname?" (":""),
- (release_nickname?release_nickname:""),
- (release_nickname?")":""));
-
- init_samba_version = True;
- return samba_version;
-}
Modified: branches/SAMBA_4_0/source/dynconfig.h
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.h 2006-03-13 17:45:04 UTC (rev 14331)
+++ branches/SAMBA_4_0/source/dynconfig.h 2006-03-13 18:31:42 UTC (rev 14332)
@@ -25,7 +25,6 @@
* @brief Exported global configurations.
**/
-extern const char *dyn_SBINDIR;
extern const char *dyn_BINDIR;
extern const char *dyn_CONFIGFILE;
extern const char *dyn_NCALRPCDIR;
Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2006-03-13 17:45:04 UTC (rev 14331)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2006-03-13 18:31:42 UTC (rev 14332)
@@ -22,6 +22,7 @@
#include "includes.h"
#include "gtk/common/gtk-smb.h"
#include "gtk/common/select.h"
+#include "version.h"
void gtk_show_werror(GtkWidget *win, const char *message, WERROR err)
{
@@ -282,7 +283,7 @@
label1 = gtk_label_new (appname);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), label1, FALSE, FALSE, 0);
- label2 = gtk_label_new (samba_version_string());
+ label2 = gtk_label_new (SAMBA_VERSION_STRING);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), label2, FALSE, FALSE, 0);
label3 = gtk_label_new_with_mnemonic ("Part of Samba <http://www.samba.org/>");
Copied: branches/SAMBA_4_0/source/lib/version.c (from rev 13657, branches/SAMBA_4_0/source/lib/version.c)
Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk 2006-03-13 17:45:04 UTC (rev 14331)
+++ branches/SAMBA_4_0/source/param/config.mk 2006-03-13 18:31:42 UTC (rev 14332)
@@ -1,12 +1,12 @@
[SUBSYSTEM::CONFIG]
-OBJ_FILES = ../dynconfig.o \
- loadparm.o \
- params.o \
- generic.o
+OBJ_FILES = loadparm.o \
+ params.o \
+ generic.o \
+ ../lib/version.o
REQUIRED_SUBSYSTEMS = LIBBASIC
PRIVATE_PROTO_HEADER = param.h
-PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \
+PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
-DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
@@ -18,3 +18,21 @@
dynconfig.o: dynconfig.c Makefile
@echo Compiling $<
@$(CC) $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@
+
+# dynconfig defines used for binaries in bin/, when configure ran in developer
+# mode:
+
+DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
+ -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" -DLOCKDIR=\"$(LOCKDIR)\" \
+ -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(srcdir)/codepages\" \
+ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
+ -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
+ -DSWATDIR=\"$(srcdir)/../swat\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
+ -DMODULESDIR=\"$(builddir)/bin/modules\" \
+ -DJSDIR=\"$(srcdir)/scripting/libjs\" \
+ -DSETUPDIR=\"$(srcdir)/setup\" \
+ -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
+
+dynconfig-devel.o: dynconfig.c Makefile
+ @echo Compiling $<
+ @$(CC) $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@
More information about the samba-cvs
mailing list