sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

build: Be consistent with the name of smbtorture binaries

Browse Source 
This ensures that in both build systems, smbtorture3 is the source3 binary, and
smbtoture is our main smbtorture binary, built with waf.

Also included in this is the removal of bin/ndrdump4 as a special case.

This removes the last cases of binaries with different names in
each build system.

Andrew Bartlett

Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2012-11-21 16:32:38 +11:00 committed by Andreas Schneider
parent ef195a18aa
commit 8a2ef49dea
7 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/RHEL-CTDB/configure.rpm
View File

@ -66,7 +66,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--without-dnsupdate \ --without-dnsupdate \
--with-aio-support \ --with-aio-support \
--disable-merged-build \ --disable-merged-build \
--disable-smbtorture4 \ --disable-smbtorture \
--disable-external-libtalloc \ --disable-external-libtalloc \
--disable-external-libtdb \ --disable-external-libtdb \
$* $*

2
packaging/RHEL-CTDB/samba.spec.tmpl
View File

@ -184,7 +184,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-dnsupdate \ --without-dnsupdate \
--with-aio-support \ --with-aio-support \
--disable-merged-build \ --disable-merged-build \
--disable-smbtorture4 \ --disable-smbtorture \
--disable-external-libtalloc \ --disable-external-libtalloc \
--disable-external-libtdb --disable-external-libtdb

4
script/autobuild.py
View File

@ -39,10 +39,10 @@ tasks = {
"samba3" : [ ("autogen", "./autogen.sh", "text/plain"), "samba3" : [ ("autogen", "./autogen.sh", "text/plain"),
("configure", "./configure.developer ${PREFIX}", "text/plain"), ("configure", "./configure.developer ${PREFIX}", "text/plain"),
("make basics", "make basics", "text/plain"), ("make basics", "make basics", "text/plain"),
# we split 'make -j 4', 'make bin/smbtorture4' and 'make -j 4 everything' # we split 'make -j 4', 'make bin/smbtorture' and 'make -j 4 everything'
# because it makes it much easier to find errors. # because it makes it much easier to find errors.
("make", "make -j 4", "text/plain"), # don't use too many processes ("make", "make -j 4", "text/plain"), # don't use too many processes
("make bin/smbtorture4", "make bin/smbtorture4", "text/plain"), ("make bin/smbtorture", "make bin/smbtorture", "text/plain"),
("make everything", "make -j 4 everything", "text/plain"), ("make everything", "make -j 4 everything", "text/plain"),
("install", "make install", "text/plain"), ("install", "make install", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1", "text/plain"), ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),

14
source3/Makefile-smbtorture4 → source3/Makefile-smbtorture
View File

@ -1,7 +1,7 @@
WAF_BINARY=buildtools/bin/waf WAF_BINARY=buildtools/bin/waf
WAF=$(WAF_BINARY) WAF=$(WAF_BINARY)
WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
SAMBA4_BINARIES="smbtorture,ndrdump" SAMBA4_BINARIES="smbtorture"
samba4-configure: samba4-configure:
@(cd .. && \ @(cd .. && \
@ -10,17 +10,11 @@ samba4-configure:
.PHONY: samba4-configure .PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure samba4-config-compare bin/smbtorture: $(BINARY_PREREQS) samba4-configure samba4-config-compare
cd .. && $(WAF_BUILD) --targets=smbtorture cd .. && $(WAF_BUILD) --targets=smbtorture
cp ../bin/smbtorture bin/smbtorture4 cp ../bin/smbtorture bin/smbtorture
.PHONY: bin/smbtorture4 .PHONY: bin/smbtorture
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
cd .. && $(WAF_BUILD) --targets=ndrdump
cp ../bin/ndrdump bin/ndrdump4
.PHONY: bin/ndrdump4
samba4-config-compare: samba4-configure samba4-config-compare: samba4-configure
@echo "Comparing config.h from autoconf and waf" @echo "Comparing config.h from autoconf and waf"

17
source3/Makefile.in
View File

@ -220,7 +220,7 @@ BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \
bin/profiles bin/ntlm_auth bin/sharesec \ bin/profiles bin/ntlm_auth bin/sharesec \
bin/smbcquotas bin/eventlogadm bin/smbcquotas bin/eventlogadm
TORTURE_PROGS = bin/smbtorture bin/msgtest \ TORTURE_PROGS = bin/smbtorture3 bin/msgtest \
bin/locktest2 bin/nsstest bin/vfstest \ bin/locktest2 bin/nsstest bin/vfstest \
$(TALLOCTORT) bin/replacetort \ $(TALLOCTORT) bin/replacetort \
$(TDBTORTURE) $(PTHREADPOOLTEST) \ $(TDBTORTURE) $(PTHREADPOOLTEST) \
@ -1602,9 +1602,9 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@
gpext_modules:: $(GPEXT_MODULES) gpext_modules:: $(GPEXT_MODULES)
torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@ torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE@
smbtorture : SHOWFLAGS bin/smbtorture smbtorture3 : SHOWFLAGS bin/smbtorture3
masktest : SHOWFLAGS bin/masktest masktest : SHOWFLAGS bin/masktest
@ -1955,7 +1955,7 @@ bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LI
@$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ) bin/smbtorture3: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ)
@echo Linking $@ @echo Linking $@
@$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \ @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
@ -3347,13 +3347,10 @@ libnetapi_examples: libnetapi
clean_libnetapi_examples: clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean $(MAKE) -C lib/netapi/examples clean
.PHONY: bin/smbtorture4 bin/ndrdump4 .PHONY: bin/smbtorture
bin/smbtorture4: $(BINARY_PREREQS) bin/smbtorture: $(BINARY_PREREQS)
$(MAKE) -f Makefile-smbtorture4 bin/smbtorture4 $(MAKE) -f Makefile-smbtorture bin/smbtorture
bin/ndrdump4: $(BINARY_PREREQS)
$(MAKE) -f Makefile-smbtorture4 bin/ndrdump4
.PHONY: vfs_examples .PHONY: vfs_examples

22
source3/configure.in
View File

@ -203,13 +203,13 @@ AC_ARG_WITH(profiling-data,
) )
dnl Checks for programs. dnl Checks for programs.
AC_ARG_ENABLE(smbtorture4, AC_ARG_ENABLE(smbtorture,
[AS_HELP_STRING([--enable-smbtorture4], [Enable building smbtorture4 (default=auto)])]) [AS_HELP_STRING([--enable-smbtorture], [Enable building smbtorture (default=auto)])])
if test x$enable_smbtorture4 != xno; then if test x$enable_smbtorture != xno; then
smbtorture4_possible=yes smbtorture_possible=yes
else else
smbtorture4_possible=no smbtorture_possible=no
fi fi
AC_PROG_INSTALL AC_PROG_INSTALL
@ -220,11 +220,11 @@ AC_SAMBA_GNU_MAKE([true], [true])
# Check for perl # Check for perl
m4_include(../m4/check_perl.m4) m4_include(../m4/check_perl.m4)
AC_SAMBA_PERL([true], [smbtorture4_possible=no]) AC_SAMBA_PERL([true], [smbtorture_possible=no])
# Check for python # Check for python
m4_include(../m4/check_python.m4) m4_include(../m4/check_python.m4)
AC_SAMBA_PYTHON_DEVEL([true], [smbtorture4_possible=no]) AC_SAMBA_PYTHON_DEVEL([true], [smbtorture_possible=no])
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
@ -1710,7 +1710,7 @@ if test x"$BLDSHARED" != x"true"; then
SHLD="shared-libraries-disabled" SHLD="shared-libraries-disabled"
PICFLAG="${PIE_CFLAGS}" PICFLAG="${PIE_CFLAGS}"
SHLIBEXT="shared_libraries_disabled" SHLIBEXT="shared_libraries_disabled"
smbtorture4_possible=no smbtorture_possible=no
fi fi
AC_MSG_CHECKING([used PICFLAG]) AC_MSG_CHECKING([used PICFLAG])
@ -6519,9 +6519,9 @@ fi
m4_include(../lib/zlib/zlib.m4) m4_include(../lib/zlib/zlib.m4)
if test x$smbtorture4_possible = xyes; then if test x$smbtorture_possible = xyes; then
SMBTORTURE4="bin/smbtorture4" SMBTORTURE="bin/smbtorture"
AC_SUBST(SMBTORTURE4) AC_SUBST(SMBTORTURE)
fi fi
AC_SUBST(ZLIB_LIBS) AC_SUBST(ZLIB_LIBS)

4
source3/selftest/s3-selftest.sh
View File

@ -24,7 +24,7 @@ st_test_done() {
if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
( rm -f ${SELFTESTPREFIX}/st_done && \ ( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \ ${PERL} ${SELFTESTDIR}/selftest.pl \
--binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \ --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \
--prefix=${SELFTESTPREFIX} --target=samba3 \ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SELFTESTDIR}/skip \ --exclude=${SELFTESTDIR}/skip \
@ -38,7 +38,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
else else
( rm -f ${SELFTESTPREFIX}/st_done && \ ( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \ ${PERL} ${SELFTESTDIR}/selftest.pl \
--binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \ --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \
--prefix=${SELFTESTPREFIX} --target=samba3 \ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SELFTESTDIR}/skip \ --exclude=${SELFTESTDIR}/skip \