1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Commit Graph

31 Commits

Author SHA1 Message Date
Alexander Bokovoy
c898f18f80 source3/build/charset.py: update to handle waf 2.0.4
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2018-09-05 06:37:23 +02:00
Joe Guo
c9f2fdea1d PEP8: fix W391: blank line at end of file
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:31 +02:00
Joe Guo
cabb299749 PEP8: fix E703: statement ends with a semicolon
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
211c9a5f85 PEP8: fix E302: expected 2 blank lines, found 1
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:29 +02:00
Joe Guo
32266d2d48 PEP8: fix E225: missing whitespace around operator
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:28 +02:00
Joe Guo
eba81f7fa9 PEP8: fix E115: expected an indented block (comment)
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:26 +02:00
Joe Guo
086daf5f36 PEP8: fix E101: indentation contains mixed spaces and tabs
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:25 +02:00
Christian Ambach
15b2d1a658 waf: improve iconv checks
there are broken iconv implementations around (e.g. on AIX) that you
can compile against but that refuse any mapping requests

make sure we do the same as the autoconf-based build did and
fall back to our own code

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10308

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2014-01-03 05:04:44 +01:00
Günther Deschner
56db9c9f27 s3-waf: remove s3-waf specific dynconfig.
This merge finally makes --with-logfilebase=foo and friends work appropriately.

Andrews, Andreas, please check.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Jun 28 17:54:42 CEST 2011 on sn-devel-104
2011-06-28 17:54:41 +02:00
Andrew Bartlett
125a2ff262 lib/util/charset: Remove 'display charset'
As discussed in 'CH_DISPLAY and gettext' on the samba-technical list:
http://lists.samba.org/archive/samba-technical/2011-June/078190.html

Setting this to a value other than 'unix charset' does not make sense,
as any system where the filesytem charset does not equal the terminal
charset will already have problems with programs as simple as 'ls'.
It also means that our output could not be pasted as our input in
interactive programs or onto our command line, as we never did
translate in the DISPLAY -> UNIX direction.

The d_printf() calls are retained in case we need to revisit this, and
to support display_set_stderr().

Andrew Bartlett
2011-06-23 13:47:27 +02:00
Andrew Bartlett
3e85b960fa dynconfig: Have only one dynconfig.o in the common code. 2011-04-27 22:22:26 +10:00
Andrew Bartlett
d309499b9e s3-build Remove distinct LOCALEDIR subsystem
This is no different to the rest of dynconfig, and so should be dealt
with there.

Andrew Bartlett
2011-04-13 15:51:52 +10:00
Andrew Tridgell
c8b2b10976 s3-waf: use SAMBA3_*() build rules in source3/build
this brings the s3 waf build much closer to the proposed s3build top
level build, using the same bld.SAMBA3_*() rules

There are a few renames of subsystems in here, with a 3 suffix where
it would create a conflict.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-18 16:46:41 +11:00
Günther Deschner
62e1c80cf5 s3-waf: add PKGCONFIGDIR.
Guenther
2011-01-25 11:42:46 +01:00
Günther Deschner
286c3d6d8e s3-waf: add NMBDSOCKETDIR variable.
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jan  7 16:33:55 CET 2011 on sn-devel-104
2011-01-07 16:33:55 +01:00
Günther Deschner
f405384ad8 s3-waf: make the --with-Xdir options work more like in the classic build.
Also remove duplicates and sort the tables.

Still not sure if I understand the reason of processing the flags table after
the diroptions table, as every option you give it via configure was overwritten
immediately.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jan  7 00:57:10 CET 2011 on sn-devel-104
2011-01-07 00:57:10 +01:00
Günther Deschner
260ad23727 s3-waf: add more diroptions.
Guenther
2010-09-23 16:43:07 -07:00
Günther Deschner
8ba3eacf6b s3-waf: remove duplicate CONFIGFILE from dynconfig.py which caused sysconfigdir
to be ignored.

Guenther
2010-09-23 15:33:43 -07:00
Günther Deschner
de49623d4b s3-waf: fix LOCALEDIR usage.
Guenther
2010-09-23 01:32:43 -07:00
Günther Deschner
c9e17edfc6 s3-waf: add net.
Guenther
2010-09-20 10:48:24 -07:00
Andrew Tridgell
e86b212739 s3-waf: fixed SWATDIR to match old build 2010-05-20 22:16:14 +02:00
Kai Blin
2261e8c087 s3-waf: Fix the minimal build
When using the internal zlib and popt, the dependencies and includes
have to be adapted a bit
2010-05-20 22:16:14 +02:00
Kai Blin
3728186202 s3-waf dynconfig: s3 configfile default is $LIBDIR/smb.conf 2010-05-20 22:16:13 +02:00
Andrew Tridgell
419873f2ee s3-waf: All sorts of nasty hacks to finally get smbd to build/link
Pair-Programmed-With: Kai Blin <kai@samba.org>
2010-05-20 22:16:13 +02:00
Kai Blin
5f87d5a3d0 s3-waf: Added support dynconfig cflags
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
2010-05-20 22:16:12 +02:00
Andrew Tridgell
f9eae32f4b s4-waf: mark the wscript files as python so vim/emacs knows how to highlight them 2010-04-06 20:27:11 +10:00
Andrew Tridgell
0b47bda816 s3-waf: charsets needs to be quoted as strings in config.h
Pair-Programmed-With: Kai Blin <kai@samba.org>
2010-04-06 20:27:08 +10:00
Andrew Tridgell
6b3a72dd45 s3-waf: fixed tests for charsets
Pair-Programmed-With: Kai
2010-04-06 20:27:08 +10:00
Kai Blin
ecafbd3ec8 s3-waf: check for default charsets 2010-04-06 20:27:07 +10:00
Andrew Tridgell
b2f01b54d2 s3-waf: modulesdir is in the base set of options now 2010-04-06 20:27:06 +10:00
Andrew Tridgell
e642c5a155 s3-waf: added build subdir for dynconfig generation 2010-04-06 20:27:04 +10:00