[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-1498-g89bfca2
Jelmer Vernooij
jelmer at samba.org
Sat May 10 20:27:09 GMT 2008
The branch, v4-0-test has been updated
via 89bfca2da2b614e979a20c9a293b798ed7ae15ae (commit)
via cce1659d3382495d84cd086bd105903211c1c1de (commit)
via 42eb6b33462228467e65a51bbf624c481802b090 (commit)
via cca75ae22d225dda2e96907daa3c24a35bb281cd (commit)
via edfd02e59bba86b977bd60848f57a614691fff7a (commit)
via 13bbd420681519894a4036729c43273912c9b402 (commit)
via 0690ce5211e659d5b8670d533fde77cf97048884 (commit)
via 760378e0294dd0cd4523a83448328478632d7e3d (commit)
via 71110c8e7d58f42312938d0a8d0b216cbc313885 (commit)
via 4e0b94d648e955b950c50d2ac19e17b06ee1f818 (commit)
via 977dbdeaf363c8905ed9fd0570eba4be80582833 (commit)
via 3c9af5c1155b55204145c13622481fc68b876cc5 (commit)
via ca8d4260ada9f74ebc406714ca70d20be09b194b (commit)
via df899e14cb6cdf9725bedc085649bc1ac8749205 (commit)
via c165b34805aa6a82e579afda9f4244c0c68d52b4 (commit)
via cc02f76f24af7de1b821e3591f0618f923c052de (commit)
via bfb4d847005567da43e93987add1a7b171b7b192 (commit)
via 9caa9d85d1ab86bb575a5359d57919b801737a40 (commit)
via 9bdfff0f6f45ffa19bcc996d65d84138f2a02bcf (commit)
via b5c293f05303460aceb8e29a1be68945fac9071a (commit)
via 5d6ce4767b4c81f7fc69600cec6d83c0fbd6a355 (commit)
via f2e49744717eb46bbfafeea9e2eb412a38a142e7 (commit)
via 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291 (commit)
via cffaf5f6030b5d9b6d4d802b557fd8ea7afd043d (commit)
via 45d252fd9b3df4f1221a23cece78b673a55dfc7c (commit)
via 28aff6fafbb3d8796dd6aaac92500254cf50253e (commit)
via ac27a1451dfe5c0c957e93fdc84602c3c1c7deac (commit)
via 3b7940d531a30098ca9a09e9c83dc4d223d1fe8f (commit)
via 2bf43c7932d886b0db3e1c2f5a4b8697435b0c5c (commit)
via 4994b81b50085c2f6d3c39be3db86ffe97f1db58 (commit)
via e4da851bd7e7620bbf99efe20a496b1be78ba4e2 (commit)
via 391fea450b2e6664fcd4e4419858997c6094cf3e (commit)
via 9d751319bd4ca1c26c8bd01cbdfdaf6c2d949981 (commit)
via 49ef8d0c197fa61dc5c524e4a0f569af72d3c0e9 (commit)
via 171d97f657d92f24a9b2d6be0f1404c21b665869 (commit)
via 9bc22a4cd39a96d757be844d0f32a8042d233612 (commit)
via 10cf48591e8d6bfb750a6ff187f04ea24a1f8cd7 (commit)
via bb16e51e60df296fa7b89eeeba6b80908099dda6 (commit)
via 99e61dade2bd9ae2a5dfe17f766528012c09e46c (commit)
via 2e0d65edcf4a7130ea410e870160811a6423bd53 (commit)
via 2a0f8458ab712ce64ce3f5d6fe30ca6fe3e16df2 (commit)
via 906148bf87ae278c6f6232675bd6aaf4d1e33e6c (commit)
via a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6 (commit)
via df4eb19ff910a1e403f9512a9d9f396c76282085 (commit)
via 3e02fcfd3fb6683f51417ba39f4ec177494eff3e (commit)
via d6b2eaeff970f84b6e4da430ea6d00009931d41d (commit)
via 744d9fd8731321abea37b0cb14ca75e1b4654722 (commit)
via 0ac0ea660ab63eca764149f1d2828d0238a57289 (commit)
via c45b97c4714dd0565949732394c9c1e8eedbb99a (commit)
via 584a69acc5ccc0e9be0cb2687578c62bfa1e797d (commit)
via 89f7c74924965071981bbe7e05ff69847b0a3a03 (commit)
via a611ff91018a6d67beaea214def9aeeaacc2bfef (commit)
via 023025e4de119aa234f885aa6e5594660bd8f358 (commit)
via 673fb9c1855f9d61d4d311bcd5e3fea0210fe6ed (commit)
via b0408abb08648c0155d8f5da5fb299b1acbc09b6 (commit)
via f7d0f0582e8712fd8d005906803de8fe041e875f (commit)
via a660ab262e7202baccf16cb8b2bc47cb8efacc34 (commit)
via 1448639ec7cc7f4512a0fd07b4c2e0df51e781e3 (commit)
via 803ebd6479ae388ae65de8de7fb88600452d47df (commit)
via 4dab354b626a02e9a5f5cac0d374d18e22718e18 (commit)
via c01c841cf953550b21a6a84b0cb036bdfd436e13 (commit)
via 4e2ba19d525da53592890380ae3570fc5bb0bfb9 (commit)
via ad258e86353250fd447d461c94649c1541b37844 (commit)
via ef00f6b5817107738dc44367838095896af4e77d (commit)
via 59bf804ef64d87fa76fe41063f91c35cf805a779 (commit)
via b5695abdc6fe90c8a348ac8510a1bad6f6bbdede (commit)
via dee1cb6b08aa0a3e24372e052729121c11280971 (commit)
via a924c9cf6b4f52ff6b403c683d32b7826e72c3d7 (commit)
via b2cd934d4d37516fe65a3b9c44d7c92622fecf99 (commit)
via 4046ec8be08bb940ec60390c4f2e1719e14b858d (commit)
via ca510136d2c4cae8f520c76df6aaadb5d412bea1 (commit)
via e8bfca15a33365e9bfbdd8422f0aa7353e16446e (commit)
via 5dda8b1eba628c40f0ddad93b73c0a749ac3e908 (commit)
via 01a0d3e74404d382c3cb74dbe385a4e9115b9b74 (commit)
via 7fe2d6666e6a1ae6a9453ccbe9a0a9136f028e55 (commit)
via d817bcdc290cb03a16f10a11250ae35c1d36c848 (commit)
via f05d5f839e18e078a59ccd262fbffaa2eb4e3672 (commit)
via 7398bc1a9f0d3cf30db3187a3849dbea6b846bb2 (commit)
via 1e710575c408ca57b52d0548f2fa4ea713ded03c (commit)
via 9e9d98d75d52846bca88ec7d12b91b140b069868 (commit)
via 0b133a30a23757cf463ff22dff6372ae5e11d4c7 (commit)
via 6d9fa75a9273d2622642bfe93b2fa470aa95949a (commit)
via 1353e3e46a699b77f04fb0e69900bec9b15e0d48 (commit)
via c43b0d43cde11991723eff53fefdc38ca036a67e (commit)
via 778e37480fb83c750ef76a625a5df74df276c65d (commit)
via c8b00610428208266d3cad69d70f01c8f4d3a85b (commit)
via b136ee5d344b1f1b2de697afd6815b8c3cb770ba (commit)
via 40476bce2e9b4ac6363fe27f1409eee1a3ed4157 (commit)
via ca8e347baf67a2f5cdffd7ea1677dab75687b037 (commit)
via 1a646af0647f021d99473a8991c35e616a423ea6 (commit)
via 3074a9c713910f1cec8d252a36fa51aefc308c9a (commit)
via bc11e3ef1c34923f5b13571926617a840ad554fe (commit)
via 4d190270463f8db475c152f5502c9de01765d904 (commit)
via 3116142b6116a84c63b4805901775826b1ca0af7 (commit)
via d31987461984aebf8c6f2513e83c92757c0f83c7 (commit)
via ef532a715e8d05652bc7b320d6d0b88a93599b33 (commit)
via d3725224cfe0a10e99b0012f4e0e79ea427962de (commit)
via 0efa80f30b4f3287a204af450a43dcdfa9baad8a (commit)
via 412c1c2c1eabec25fb9d6506ece06032da798ebe (commit)
via a43f6d37bce85748e9cf2675e5beced5db26f1c3 (commit)
via 7a11659c18b5d13c5397e8121ef4e35e188a8402 (commit)
via dadae70042600f13f6f9bfcf2d045a797e2b9e69 (commit)
via 8214fb600ec626a8dd01ef3e2af1f4a8bf27dcb2 (commit)
via 6d3c45889fd20dba5f77466f1e4452a47b442ae4 (commit)
via 7ec39624392fd0a0e64326e06acf9d42c86d06f9 (commit)
via 919976f393274c6dfe5394eef79f2f3b38f1ffa9 (commit)
via 36cc584374d32c7875333fa5abd97b31e83291aa (commit)
via 6cc7bc1586e892e8470cb3f18a7afa2029a0399d (commit)
via 20800de0581de1f8be57755df5cc05ffad34ada9 (commit)
via 8e1396d5666b1c9306e04cf98d1c89fa13199c7d (commit)
via 7eaa96169f0a32110194560ff27ed89120160efc (commit)
via 62abd38725ecbe149075a5e2097a08981cd156cf (commit)
via 8e716d139003d3e743dd99d93f76da4cfa7d48b3 (commit)
via c1b2b5f9f479e202f30f245a47d2743a592deeb8 (commit)
via 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1 (commit)
via 8e9856412befc0ea94536dd492588f232347564a (commit)
via 9166e48944819041ed5db6dbd432fc660660c5ce (commit)
via 16fd90d7a99ae8eaf2accf3c8b3ec55b2223f9cd (commit)
via 9a0f6a0012243a74702c723dec808c99c58c772e (commit)
from ce9d759497ea49e54e9d96422ad07368e2925872 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 89bfca2da2b614e979a20c9a293b798ed7ae15ae
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat May 10 22:26:14 2008 +0200
Remove copy of torture file.
commit cce1659d3382495d84cd086bd105903211c1c1de
Merge: 42eb6b33462228467e65a51bbf624c481802b090 ce9d759497ea49e54e9d96422ad07368e2925872
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat May 10 21:29:42 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit 42eb6b33462228467e65a51bbf624c481802b090
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat May 10 20:59:17 2008 +0200
Clean up some git merges gone wrong.
commit cca75ae22d225dda2e96907daa3c24a35bb281cd
Merge: edfd02e59bba86b977bd60848f57a614691fff7a fbfbc1f163520b3b9a4a3bf8bdddf26749cc7255
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat May 10 20:44:59 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit edfd02e59bba86b977bd60848f57a614691fff7a
Merge: 13bbd420681519894a4036729c43273912c9b402 a90971ea0c43ce3b42b95aef5973139576b51959
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat May 10 18:08:00 2008 +0200
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts:
source/auth/config.mk
source/auth/gensec/config.mk
source/torture/smbtorture.c
commit 13bbd420681519894a4036729c43273912c9b402
Merge: 0690ce5211e659d5b8670d533fde77cf97048884 5f3a70f285ad8a412105c0e498e486f93fc279bc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Apr 25 10:04:20 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
commit 0690ce5211e659d5b8670d533fde77cf97048884
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Apr 24 15:22:07 2008 +0100
Distinguish between private and public dependencies in the dot file.
commit 760378e0294dd0cd4523a83448328478632d7e3d
Merge: 71110c8e7d58f42312938d0a8d0b216cbc313885 b6b7171f70114bd27ca8db09964c65cacb9cea92
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Apr 8 03:45:06 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
commit 71110c8e7d58f42312938d0a8d0b216cbc313885
Merge: 4e0b94d648e955b950c50d2ac19e17b06ee1f818 ee9ad77009ef5e36655a49c41730a4a963ba9d43
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 28 01:00:13 2008 +0100
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3
commit 4e0b94d648e955b950c50d2ac19e17b06ee1f818
Merge: 977dbdeaf363c8905ed9fd0570eba4be80582833 cd275862c65542ea1118cfb76d7d1b082427098a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 28 00:59:54 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit 977dbdeaf363c8905ed9fd0570eba4be80582833
Merge: 3c9af5c1155b55204145c13622481fc68b876cc5 f47df5761571dd5c36789fb2e225a1125ca0e8f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 28 00:44:14 2008 +0100
Merge v4.0-test
commit 3c9af5c1155b55204145c13622481fc68b876cc5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 10 12:36:42 2008 +0100
No longer accept VERSION and SO_VERSION in perl code.
commit ca8d4260ada9f74ebc406714ca70d20be09b194b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 9 02:53:54 2008 +0100
Move PC_FILE out of the perl code.
commit df899e14cb6cdf9725bedc085649bc1ac8749205
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 9 01:42:42 2008 +0100
Remove extra line for partial linkage objects, simplify binary handling.
commit c165b34805aa6a82e579afda9f4244c0c68d52b4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 9 01:22:32 2008 +0100
Fix the build, symlinks.
commit cc02f76f24af7de1b821e3591f0618f923c052de
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 9 01:00:33 2008 +0100
Remove unused variables.
commit bfb4d847005567da43e93987add1a7b171b7b192
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 9 00:49:39 2008 +0100
Move more code out of perl build system.
commit 9caa9d85d1ab86bb575a5359d57919b801737a40
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 19:01:48 2008 +0100
Remove correct libraries.
commit 9bdfff0f6f45ffa19bcc996d65d84138f2a02bcf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 18:56:45 2008 +0100
Remove dependency on config.
commit b5c293f05303460aceb8e29a1be68945fac9071a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 17:42:46 2008 +0100
Allow parentheses in commands.
commit 5d6ce4767b4c81f7fc69600cec6d83c0fbd6a355
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 17:42:27 2008 +0100
Fix dependencies.
commit f2e49744717eb46bbfafeea9e2eb412a38a142e7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 17:02:40 2008 +0100
Fix the build.
commit 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 15:28:12 2008 +0100
Push SOVERSION and VERSION out of perl code.
commit cffaf5f6030b5d9b6d4d802b557fd8ea7afd043d
Merge: 45d252fd9b3df4f1221a23cece78b673a55dfc7c 0641a43cd6fd081cac0275f5bde2ad70fa6a71bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 8 15:27:32 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit 45d252fd9b3df4f1221a23cece78b673a55dfc7c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 23:59:34 2008 +0100
Use make macro for module installation.
commit 28aff6fafbb3d8796dd6aaac92500254cf50253e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 23:32:16 2008 +0100
Use GNU make.
commit ac27a1451dfe5c0c957e93fdc84602c3c1c7deac
Merge: 3b7940d531a30098ca9a09e9c83dc4d223d1fe8f 5fdca988c687f58fe2fddd3c8eff5f461207065b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 23:02:36 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit 3b7940d531a30098ca9a09e9c83dc4d223d1fe8f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 20:33:12 2008 +0100
Fix the build.
commit 2bf43c7932d886b0db3e1c2f5a4b8697435b0c5c
Merge: 4994b81b50085c2f6d3c39be3db86ffe97f1db58 e384aac5c8156c7f056c70b1caab0778f8fc52b6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 18:59:03 2008 +0100
Merge branch 'v4-0-test' into v4-0-gmake3
commit 4994b81b50085c2f6d3c39be3db86ffe97f1db58
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 18:14:52 2008 +0100
Remove unused code, simplify alias handling.
commit e4da851bd7e7620bbf99efe20a496b1be78ba4e2
Merge: 391fea450b2e6664fcd4e4419858997c6094cf3e d92597d29caf76e1c8d0858f066d7a30143392e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 7 18:03:54 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit 391fea450b2e6664fcd4e4419858997c6094cf3e
Merge: 9d751319bd4ca1c26c8bd01cbdfdaf6c2d949981 b0ecd8f8d2c1ebf23957921f4852e90b556812fc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 14:16:57 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
commit 9d751319bd4ca1c26c8bd01cbdfdaf6c2d949981
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 14:09:11 2008 +0100
Remove extra empty lines in data.mk.
commit 49ef8d0c197fa61dc5c524e4a0f569af72d3c0e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 13:06:08 2008 +0100
Fix the build.
commit 171d97f657d92f24a9b2d6be0f1404c21b665869
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 10:43:41 2008 +0100
Fix syntax.
commit 9bc22a4cd39a96d757be844d0f32a8042d233612
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 10:30:14 2008 +0100
Fix syntax.
commit 10cf48591e8d6bfb750a6ff187f04ea24a1f8cd7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 01:37:18 2008 +0100
Deal with subsystems with no settings, several other minor fixes.
commit bb16e51e60df296fa7b89eeeba6b80908099dda6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 01:26:19 2008 +0100
Fix some paths.
commit 99e61dade2bd9ae2a5dfe17f766528012c09e46c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 4 00:43:24 2008 +0100
Fix includes.
commit 2e0d65edcf4a7130ea410e870160811a6423bd53
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 23:22:22 2008 +0100
Remove useless ifs.
commit 2a0f8458ab712ce64ce3f5d6fe30ca6fe3e16df2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 23:21:35 2008 +0100
Fix typo.
commit 906148bf87ae278c6f6232675bd6aaf4d1e33e6c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 18:57:20 2008 +0100
Fix some syntax errors.
commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 18:25:28 2008 +0100
Move object file lists to the Makefile.
commit df4eb19ff910a1e403f9512a9d9f396c76282085
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 11:02:25 2008 +0100
Fix syntax.
commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e
Merge: d6b2eaeff970f84b6e4da430ea6d00009931d41d 272eb765b81e3eab216a07249334f9b7d20e530b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 3 10:50:53 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/makefile.pm
source/librpc/config.mk
commit d6b2eaeff970f84b6e4da430ea6d00009931d41d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Feb 29 15:28:26 2008 +0100
Remove duplicate functions.
commit 744d9fd8731321abea37b0cb14ca75e1b4654722
Merge: 0ac0ea660ab63eca764149f1d2828d0238a57289 b57f09f526f0783345be3d1de2540c35478d7af2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Feb 29 15:21:33 2008 +0100
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dynconfig.mk
source/scripting/python/config.mk
commit 0ac0ea660ab63eca764149f1d2828d0238a57289
Merge: c45b97c4714dd0565949732394c9c1e8eedbb99a 0aff54a12e20d5e91fcdec7aaec103fb9a371a23
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Feb 29 12:45:46 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/scripting/python/config.mk
commit c45b97c4714dd0565949732394c9c1e8eedbb99a
Merge: 584a69acc5ccc0e9be0cb2687578c62bfa1e797d a9fe1b785dd59acbfab4eb90256e7a0cb0f4da6e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 27 13:19:07 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
commit 584a69acc5ccc0e9be0cb2687578c62bfa1e797d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 17:56:07 2008 +0100
Fix module aliases.
commit 89f7c74924965071981bbe7e05ff69847b0a3a03
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 17:17:52 2008 +0100
Move public header accumulation out of the perl code.
commit a611ff91018a6d67beaea214def9aeeaacc2bfef
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 16:55:08 2008 +0100
Ignore autogenerated file.
commit 023025e4de119aa234f885aa6e5594660bd8f358
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 16:51:50 2008 +0100
Fix pydoctor.
commit 673fb9c1855f9d61d4d311bcd5e3fea0210fe6ed
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 16:36:24 2008 +0100
Support building .so versions of the modules.
commit b0408abb08648c0155d8f5da5fb299b1acbc09b6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 16:02:51 2008 +0100
use make macro for python.
commit f7d0f0582e8712fd8d005906803de8fe041e875f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 15:19:45 2008 +0100
Fix manpage paths.
commit a660ab262e7202baccf16cb8b2bc47cb8efacc34
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 15:11:47 2008 +0100
Move manpage management out of the perl build system.
commit 1448639ec7cc7f4512a0fd07b4c2e0df51e781e3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 14:54:31 2008 +0100
Fix include.
commit 803ebd6479ae388ae65de8de7fb88600452d47df
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 14:48:11 2008 +0100
Move common rules code to separate directory.
commit 4dab354b626a02e9a5f5cac0d374d18e22718e18
Merge: c01c841cf953550b21a6a84b0cb036bdfd436e13 8a26a6e8f11aca5119b15e304213548ad608dc5b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 13:07:55 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
commit c01c841cf953550b21a6a84b0cb036bdfd436e13
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 03:28:44 2008 +0100
Revert cflags hack.
commit 4e2ba19d525da53592890380ae3570fc5bb0bfb9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 02:54:34 2008 +0100
Use make to generate fragments rather than the perl code.
commit ad258e86353250fd447d461c94649c1541b37844
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 02:45:12 2008 +0100
Move more code out of perl.
commit ef00f6b5817107738dc44367838095896af4e77d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 01:20:55 2008 +0100
Fix the build (again).
commit 59bf804ef64d87fa76fe41063f91c35cf805a779
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 00:40:40 2008 +0100
Fix the build.
commit b5695abdc6fe90c8a348ac8510a1bad6f6bbdede
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 23:16:24 2008 +0100
Remove legacy code for public prototype headers.
commit dee1cb6b08aa0a3e24372e052729121c11280971
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 23:09:56 2008 +0100
Remove public prototype headers. Generating both public and private prototype headers is tricky with gmake and it's easy to break backwards compatibility for the public API with them.
commit a924c9cf6b4f52ff6b403c683d32b7826e72c3d7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 22:58:14 2008 +0100
Remove binaries:: in favor of SBIN_PROGS, BIN_PROGS.
commit b2cd934d4d37516fe65a3b9c44d7c92622fecf99
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 22:10:59 2008 +0100
Use more make constructions for shared library bits.
commit 4046ec8be08bb940ec60390c4f2e1719e14b858d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 21:34:13 2008 +0100
Use make's $(call) feature.
commit ca510136d2c4cae8f520c76df6aaadb5d412bea1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 20:40:37 2008 +0100
Fix use of realpath, fix init functions for ldb.
commit e8bfca15a33365e9bfbdd8422f0aa7353e16446e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 20:39:29 2008 +0100
Update smb_build README.
commit 5dda8b1eba628c40f0ddad93b73c0a749ac3e908
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 20:39:16 2008 +0100
Remove obsolete comment.
commit 01a0d3e74404d382c3cb74dbe385a4e9115b9b74
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 19:11:04 2008 +0100
Merge env.pm into makefile.pm.
commit 7fe2d6666e6a1ae6a9453ccbe9a0a9136f028e55
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:51:39 2008 +0100
Move configure output details out of perl code.
commit d817bcdc290cb03a16f10a11250ae35c1d36c848
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:44:52 2008 +0100
Remove workaround for some non-GNU makes.
commit f05d5f839e18e078a59ccd262fbffaa2eb4e3672
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:29:04 2008 +0100
Include CFLAGS overrides in make file.
commit 7398bc1a9f0d3cf30db3187a3849dbea6b846bb2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:19:01 2008 +0100
Remove more unnecessary generated code.
commit 1e710575c408ca57b52d0548f2fa4ea713ded03c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:14:03 2008 +0100
Use more GNU-make specific variables.
commit 9e9d98d75d52846bca88ec7d12b91b140b069868
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:05:47 2008 +0100
Move automatic dependencies code out of perl code.
commit 0b133a30a23757cf463ff22dff6372ae5e11d4c7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 17:33:28 2008 +0100
Fix standalone ldb build modules.
commit 6d9fa75a9273d2622642bfe93b2fa470aa95949a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 17:20:33 2008 +0100
Allow absolute paths to be specified to mkproto.pl.
commit 1353e3e46a699b77f04fb0e69900bec9b15e0d48
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:59:34 2008 +0100
Use $@ where possible.
commit c43b0d43cde11991723eff53fefdc38ca036a67e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:53:38 2008 +0100
Use realpath for now to work around .. tricks.
commit 778e37480fb83c750ef76a625a5df74df276c65d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:48:35 2008 +0100
Remove unused include.
commit c8b00610428208266d3cad69d70f01c8f4d3a85b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:39:46 2008 +0100
Remove the now unused cflags script.
commit b136ee5d344b1f1b2de697afd6815b8c3cb770ba
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:28:55 2008 +0100
Use addprefix where possible rather than perl expansion of files.
commit 40476bce2e9b4ac6363fe27f1409eee1a3ed4157
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 15:06:51 2008 +0100
Fix the build.
commit ca8e347baf67a2f5cdffd7ea1677dab75687b037
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 14:02:40 2008 +0100
Integrate asn1 compilation into asn1 compiler.
commit 1a646af0647f021d99473a8991c35e616a423ea6
Merge: 3074a9c713910f1cec8d252a36fa51aefc308c9a df576d69c6981a4879a0e9447069fcfacb3588db
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 12:58:09 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/header.pm
source/build/smb_build/makefile.pm
source/lib/ldb/include/ldb_private.h
commit 3074a9c713910f1cec8d252a36fa51aefc308c9a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 22:50:44 2008 +0100
Remove duplicate code.
commit bc11e3ef1c34923f5b13571926617a840ad554fe
Merge: 4d190270463f8db475c152f5502c9de01765d904 16b4af184187f29f1f710609ee37029a3f15a294
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 22:25:19 2008 +0100
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
commit 4d190270463f8db475c152f5502c9de01765d904
Merge: 3116142b6116a84c63b4805901775826b1ca0af7 1da14d5efe63b97719c81fcf4851c5b79609776b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 13:33:35 2008 +0100
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
commit 3116142b6116a84c63b4805901775826b1ca0af7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 13:18:42 2008 +0100
Provide variable with current directory.
commit d31987461984aebf8c6f2513e83c92757c0f83c7
Merge: ef532a715e8d05652bc7b320d6d0b88a93599b33 0d8ddae4964dc50e981e12b6a93235a50a0607ff
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 11:59:02 2008 +0100
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
commit ef532a715e8d05652bc7b320d6d0b88a93599b33
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 20:24:47 2008 +0100
Simpler handling of sonameflag.
commit d3725224cfe0a10e99b0012f4e0e79ea427962de
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 19:43:10 2008 +0100
Merge unused function.
commit 0efa80f30b4f3287a204af450a43dcdfa9baad8a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 19:37:03 2008 +0100
Properly escape quotes in init functions.
commit 412c1c2c1eabec25fb9d6506ece06032da798ebe
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 19:19:02 2008 +0100
Move logic to makefile
commit a43f6d37bce85748e9cf2675e5beced5db26f1c3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 18:38:02 2008 +0100
Move responsibilities of build.h to makefile.
commit 7a11659c18b5d13c5397e8121ef4e35e188a8402
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:55:04 2008 +0100
Remove some unused code.
commit dadae70042600f13f6f9bfcf2d045a797e2b9e69
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:45:37 2008 +0100
Avoid creating a whole bunch of files in bin/modules.
commit 8214fb600ec626a8dd01ef3e2af1f4a8bf27dcb2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:40:45 2008 +0100
Remove some unused code.
commit 6d3c45889fd20dba5f77466f1e4452a47b442ae4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:34:50 2008 +0100
Use make list concatenation support to create list of object files for subsystems/libraries.
commit 7ec39624392fd0a0e64326e06acf9d42c86d06f9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:18:23 2008 +0100
Use make to generate list of python files, remove unused variable.
commit 919976f393274c6dfe5394eef79f2f3b38f1ffa9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:15:50 2008 +0100
Remove unused ALL_OBJS variable.
commit 36cc584374d32c7875333fa5abd97b31e83291aa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:14:03 2008 +0100
Use make to create lists of plugins, remove duplicate variable.
commit 6cc7bc1586e892e8470cb3f18a7afa2029a0399d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:12:01 2008 +0100
Use make to create lists of pc files and prototype headers.
commit 20800de0581de1f8be57755df5cc05ffad34ada9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 17:01:27 2008 +0100
Use make to generate list of prototype headers.
commit 8e1396d5666b1c9306e04cf98d1c89fa13199c7d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:58:26 2008 +0100
Use make to generate lists of libraries.
commit 7eaa96169f0a32110194560ff27ed89120160efc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:48:36 2008 +0100
Generate manpage list with make.
commit 62abd38725ecbe149075a5e2097a08981cd156cf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:38:01 2008 +0100
Create SBIN_PROGS and BIN_PROGS lists from within make.
commit 8e716d139003d3e743dd99d93f76da4cfa7d48b3
Merge: c1b2b5f9f479e202f30f245a47d2743a592deeb8 98d6095b9605ff4db61394719f29b3e38349c59f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:33:13 2008 +0100
Merge branch 'v4-0-trivial' into v4-0-gmake3
commit c1b2b5f9f479e202f30f245a47d2743a592deeb8
Merge: 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1 8f1270dd5c7688f023cf24215fa229da213e760c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:24:37 2008 +0100
Merge branch 'v4-0-trivial' into v4-0-gmake3
commit 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:15:21 2008 +0100
use gmake to handle .py file copies.
commit 8e9856412befc0ea94536dd492588f232347564a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:08:32 2008 +0100
Rely on GNU make to build static libraries.
commit 9166e48944819041ed5db6dbd432fc660660c5ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 16:02:47 2008 +0100
Revert "Allow LDB to be a static library again."
This reverts commit 16fd90d7a99ae8eaf2accf3c8b3ec55b2223f9cd.
commit 16fd90d7a99ae8eaf2accf3c8b3ec55b2223f9cd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 15:40:55 2008 +0100
Allow LDB to be a static library again.
commit 9a0f6a0012243a74702c723dec808c99c58c772e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 16 15:40:42 2008 +0100
Add static header for gencache.
-----------------------------------------------------------------------
Summary of changes:
source/auth/gensec/gensec.c | 1 -
source/auth/ntlm/auth.c | 1 -
source/build/m4/public.m4 | 4 +-
source/build/make/rules.mk | 1 -
source/build/smb_build/config_mk.pm | 3 +-
source/build/smb_build/dot.pl | 4 +-
source/build/smb_build/header.pm | 82 --------------
source/build/smb_build/main.pl | 20 ++--
source/build/smb_build/makefile.pm | 180 ++++++-------------------------
source/build/smb_build/output.pm | 2 +-
source/cldap_server/config.mk | 2 +-
source/dsdb/config.mk | 2 +-
source/dsdb/samdb/ldb_modules/config.mk | 56 +++++-----
source/kdc/config.mk | 2 +-
source/ldap_server/config.mk | 2 +-
source/lib/events/events.c | 3 -
source/lib/ldb/common/ldb_modules.c | 1 -
source/lib/ldb/config.mk | 14 ++--
source/lib/nss_wrapper/config.mk | 1 +
source/lib/registry/interface.c | 1 -
source/lib/registry/local.c | 1 -
source/librpc/config.mk | 7 +-
source/nbt_server/config.mk | 2 +-
source/ntptr/ntptr_base.c | 1 -
source/ntvfs/ntvfs_base.c | 1 -
source/ntvfs/sysdep/config.mk | 3 +-
source/ntvfs/sysdep/sys_notify.c | 1 -
source/param/config.mk | 6 +
source/param/share.c | 1 -
source/rpc_server/config.mk | 26 +++---
source/rpc_server/dcerpc_server.c | 1 -
source/rpc_server/service_rpc.c | 3 +-
source/scripting/ejs/config.mk | 4 +-
source/scripting/ejs/smbcalls.c | 1 -
source/scripting/python/config.mk | 4 +-
source/scripting/python/modules.c | 3 -
source/smb_server/config.mk | 2 +-
source/smbd/process_model.c | 1 -
source/smbd/server.c | 3 +-
source/torture/config.mk | 2 +-
source/torture/smbtorture.c | 1 -
source/torture/torture.c | 72 ------------
source/web_server/config.mk | 2 +-
source/winbind/config.mk | 2 +-
source/wrepl_server/config.mk | 2 +-
45 files changed, 124 insertions(+), 410 deletions(-)
delete mode 100644 source/build/smb_build/header.pm
delete mode 100644 source/torture/torture.c
Changeset truncated at 500 lines:
diff --git a/source/auth/gensec/gensec.c b/source/auth/gensec/gensec.c
index c82b719..0edb34d 100644
--- a/source/auth/gensec/gensec.c
+++ b/source/auth/gensec/gensec.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "auth/auth.h"
#include "lib/events/events.h"
-#include "build.h"
#include "librpc/rpc/dcerpc.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
diff --git a/source/auth/ntlm/auth.c b/source/auth/ntlm/auth.c
index dc4303d..0f1ef3c 100644
--- a/source/auth/ntlm/auth.c
+++ b/source/auth/ntlm/auth.c
@@ -23,7 +23,6 @@
#include "auth/auth.h"
#include "auth/ntlm/auth_proto.h"
#include "lib/events/events.h"
-#include "build.h"
#include "param/param.h"
/***************************************************************************
diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 1eae998..ba8251e 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -37,13 +37,13 @@ ENABLE = YES
"
])
-dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldflags)
+dnl SMB_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags)
AC_DEFUN([SMB_LIBRARY],
[
MAKE_SETTINGS="$MAKE_SETTINGS
$1_CFLAGS = $6
$1_LDFLAGS = $7
-$1_ENABLE = YES
+n1_ENABLE = YES
$1_OBJ_FILES = $2
"
diff --git a/source/build/make/rules.mk b/source/build/make/rules.mk
index 1fc5e23..f5d57ed 100644
--- a/source/build/make/rules.mk
+++ b/source/build/make/rules.mk
@@ -215,7 +215,6 @@ include/includes.d: include/includes.h
echo "$(COMPILE)" 1>&2 && exit 1
-
.c.ho:
@echo "Compiling $< with host compiler"
@-mkdir -p `dirname $@`
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 307c391..81c3363 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -244,7 +244,6 @@ sub run_config_mk($$$$)
$infragment = 1;
next;
}
-
# Assignment
if ($line =~ /^([a-zA-Z0-9_]+)[\t ]*=(.*)$/) {
@@ -254,7 +253,7 @@ sub run_config_mk($$$$)
next;
}
- die("$parsing_file:$linenum: Bad line while parsing $parsing_file");
+ die("$parsing_file:$linenum: Bad line");
}
$makefile .= "# }END $parsing_file\n";
diff --git a/source/build/smb_build/dot.pl b/source/build/smb_build/dot.pl
index e50ee50..b30c320 100755
--- a/source/build/smb_build/dot.pl
+++ b/source/build/smb_build/dot.pl
@@ -26,10 +26,10 @@ sub generate($$$)
foreach my $part (values %{$depend}) {
next if (defined($only) and not contains($only,$part->{NAME}));
foreach my $elem (@{$part->{PUBLIC_DEPENDENCIES}}) {
- $res .= "\t\"$part->{NAME}\" -> \"$elem\"; /* public */\n";
+ $res .= "\t\"$part->{NAME}\" -> \"$elem\" [style=filled]; /* public */\n";
}
foreach my $elem (@{$part->{PRIVATE_DEPENDENCIES}}) {
- $res .= "\t\"$part->{NAME}\" -> \"$elem\"; /* private */\n";
+ $res .= "\t\"$part->{NAME}\" -> \"$elem\" [style=dotted]; /* private */\n";
}
}
diff --git a/source/build/smb_build/header.pm b/source/build/smb_build/header.pm
deleted file mode 100644
index dfb7c62..0000000
--- a/source/build/smb_build/header.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-# SMB Build System
-# - create output for build.h
-#
-# Copyright (C) Stefan (metze) Metzmacher 2004
-# Copyright (C) Jelmer Vernooij 2005
-# Released under the GNU GPL
-
-package header;
-use strict;
-
-sub _add_define_section($)
-{
- my $DEFINE = shift;
- my $output = "";
-
- $output .= "
-/* $DEFINE->{COMMENT} */
-#define $DEFINE->{KEY} $DEFINE->{VAL}
-";
-
- return $output;
-}
-
-sub _prepare_build_h($)
-{
- my $depend = shift;
- my @defines = ();
- my $output = "";
-
- foreach my $key (values %$depend) {
- my $DEFINE = ();
- next if ($key->{TYPE} ne "LIBRARY" and
- $key->{TYPE} ne "MODULE" and
- $key->{TYPE} ne "SUBSYSTEM" and
- $key->{TYPE} ne "BINARY");
- next unless defined($key->{INIT_FUNCTIONS});
-
- my $name = $key->{NAME};
- $name =~ s/-/_/g;
- $DEFINE->{COMMENT} = "$key->{TYPE} $key->{NAME} INIT";
- $DEFINE->{KEY} = "STATIC_$name\_MODULES";
- $DEFINE->{VAL} = "\\\n";
- foreach (@{$key->{INIT_FUNCTIONS}}) {
- $DEFINE->{VAL} .= "\t$_, \\\n";
- }
-
- die("Invalid sentinel") unless ($key->{INIT_FUNCTION_SENTINEL});
- $DEFINE->{VAL} .= "\t$key->{INIT_FUNCTION_SENTINEL} \n";
-
- push(@defines,$DEFINE);
- }
-
- #
- # loop over all BUILD_H define sections
- #
- foreach (@defines) { $output .= _add_define_section($_); }
-
- return $output;
-}
-
-###########################################################
-# This function creates include/build.h from the SMB_BUILD
-# context
-#
-# create_build_h($SMB_BUILD_CTX)
-#
-# $SMB_BUILD_CTX - the global SMB_BUILD context
-#
-# $output - the resulting output buffer
-sub create_smb_build_h($$)
-{
- my ($CTX, $file) = @_;
-
- open(BUILD_H,">$file") || die ("Can't open `$file'\n");
- print BUILD_H "/* autogenerated by build/smb_build/main.pl */\n";
- print BUILD_H _prepare_build_h($CTX);
- close(BUILD_H);
-
- print __FILE__.": creating $file\n";
-}
-
-1;
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 1489784..d31bea7 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -6,7 +6,6 @@
# Released under the GNU GPL
use smb_build::makefile;
-use smb_build::header;
use smb_build::input;
use smb_build::config_mk;
use smb_build::output;
@@ -50,21 +49,18 @@ foreach my $key (values %$OUTPUT) {
foreach my $key (values %$OUTPUT) {
next unless defined $key->{OUTPUT_TYPE};
+ $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
- $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
- if (defined($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}});
if ($key->{TYPE} eq "LIBRARY" and
${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
$shared_libs_used = 1;
}
- $mkenv->SharedModulePrimitives($key) if ($key->{TYPE} eq "MODULE" or
- $key->{TYPE} eq "PYTHON") and
- grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
+ if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
+ $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n");
+ }
$mkenv->CFlags($key);
}
@@ -80,15 +76,15 @@ foreach my $key (values %$OUTPUT) {
$mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
- $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or
- $key->{TYPE} eq "PYTHON") and
- grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
+ $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" and
+ grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}));
+ $mkenv->PythonModule($key) if ($key->{TYPE} eq "PYTHON");
$mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
+ $mkenv->InitFunctions($key) if defined($key->{INIT_FUNCTIONS});
}
$mkenv->write("data.mk");
-header::create_smb_build_h($OUTPUT, "include/build.h");
summary::show($OUTPUT, \%config::config);
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 8f3f170..495c8fb 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -72,17 +72,7 @@ sub _prepare_mk_files($)
push (@tmp, $_);
}
- $self->output("
-ifneq (\$(MAKECMDGOALS),clean)
-ifneq (\$(MAKECMDGOALS),distclean)
-ifneq (\$(MAKECMDGOALS),realdistclean)
-");
$self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
- $self->output("
-endif
-endif
-endif
-");
}
sub array2oneperline($)
@@ -112,94 +102,41 @@ sub _prepare_list($$$)
$self->output("$ctx->{NAME}_$var =$tmplist\n");
}
-sub SharedModulePrimitives($$)
+sub PythonModule($$)
{
my ($self,$ctx) = @_;
-
- #FIXME
+
+ $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+ $self->_prepare_list($ctx, "DEPEND_LIST");
+ $self->_prepare_list($ctx, "LINK_FLAGS");
+
+ $self->output("\$(eval \$(call python_c_module_template,$ctx->{LIBRARY_REALNAME},\$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS)))\n");
}
sub SharedModule($$)
{
my ($self,$ctx) = @_;
- my $init_obj = "";
-
my $sane_subsystem = lc($ctx->{SUBSYSTEM});
$sane_subsystem =~ s/^lib//;
- if ($ctx->{TYPE} eq "PYTHON") {
- $self->output("PYTHON_DSOS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
- } else {
- $self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
- $self->output("installplugins:: $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
- $self->output("\t\@echo Installing $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
- $self->output("\t\@mkdir -p \$(DESTDIR)\$(modulesdir)/$sane_subsystem/\n");
- $self->output("\t\@cp $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
- if (defined($ctx->{ALIASES})) {
- foreach (@{$ctx->{ALIASES}}) {
- $self->output("\t\@rm -f \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n");
- $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n");
- }
- }
-
- $self->output("uninstallplugins::\n");
- $self->output("\t\@echo Uninstalling \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
- $self->output("\t\@-rm \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
+ $self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
+ $self->output("\$(eval \$(call shared_module_install_template,$sane_subsystem, $ctx->{LIBRARY_REALNAME}))\n");
- if (defined($ctx->{ALIASES})) {
- foreach (@{$ctx->{ALIASES}}) {
- $self->output("\t\@-rm \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n");
- }
- }
- }
-
- $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
- if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON" and
- $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
- my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
- $init_fn =~ s/\(\*\)/init_module/;
- my $proto_fn = $ctx->{INIT_FUNCTION_TYPE};
- $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
-
- $self->output(<< "__EOD__"
-bin/$ctx->{NAME}_init_module.c:
- \@echo Creating \$\@
- \@echo \"#include \\\"includes.h\\\"\" > \$\@
- \@echo \"$proto_fn;\" >> \$\@
- \@echo \"_PUBLIC_ $init_fn\" >> \$\@
- \@echo \"{\" >> \$\@
- \@echo \" return $ctx->{INIT_FUNCTION}();\" >> \$\@
- \@echo \"}\" >> \$\@
- \@echo \"\" >> \$\@
-__EOD__
-);
- $init_obj = "bin/$ctx->{NAME}_init_module.o";
+ if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
+ $self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n");
}
- $self->output(<< "__EOD__"
-#
+ $self->output("\$(eval \$(call shared_module_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS)))\n");
-$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
- \@echo Linking \$\@
- \@mkdir -p $ctx->{SHAREDDIR}
- \@\$(MDLD) \$(LDFLAGS) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
- \$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
- \$($ctx->{NAME}_LINK_FLAGS)
-__EOD__
-);
if (defined($ctx->{ALIASES})) {
- foreach (@{$ctx->{ALIASES}}) {
- $self->output("\t\@rm -f $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
- $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
- }
+ $self->output("\$(eval \$(foreach alias,". join(' ', @{$ctx->{ALIASES}}) . ",\$(call shared_module_alias_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME},$sane_subsystem,\$(alias))))\n");
}
- $self->output("\n");
}
sub StaticLibraryPrimitives($$)
@@ -224,59 +161,33 @@ sub SharedLibrary($$)
{
my ($self,$ctx) = @_;
- if (!defined($ctx->{LIBRARY_SONAME})) {
- $ctx->{LIBRARY_SONAME} = "";
- }
-
- $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
+ $self->output("SHARED_LIBS += $ctx->{RESULT_SHARED_LIBRARY}\n");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
- $self->output(<< "__EOD__"
-$ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
- \@echo Linking \$\@
- \@mkdir -p \$(\@D)
- \@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
- \$($ctx->{NAME}\_FULL_OBJ_LIST) \\
- \$($ctx->{NAME}_LINK_FLAGS) \\
- \$(if \$(SONAMEFLAG), \$(SONAMEFLAG)$ctx->{LIBRARY_SONAME})
-__EOD__
-);
- if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
- $self->output("ifneq (\$($ctx->{NAME}_VERSION),\$($ctx->{NAME}_SOVERSION))\n");
- $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}\n");
- $self->output("endif\n");
- }
- $self->output("ifdef $ctx->{NAME}_SOVERSION\n");
- $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}\n");
- $self->output("endif\n");
+ $self->output("\$(eval \$(call shared_library_template,$ctx->{RESULT_SHARED_LIBRARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS),$ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME},$ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}))\n");
}
sub MergedObj($$)
{
my ($self, $ctx) = @_;
- return unless defined($ctx->{OUTPUT});
-
- $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
- $self->output(<< "__EOD__"
-#
-$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_FILES)
- \@echo Partially linking \$@
- \@mkdir -p \$(\@D)
- \$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_FILES)
+ $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
+}
-__EOD__
-);
+sub InitFunctions($$)
+{
+ my ($self, $ctx) = @_;
+ $self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-DSTATIC_$ctx->{NAME}_MODULES=\"\$($ctx->{NAME}_INIT_FUNCTIONS)$ctx->{INIT_FUNCTION_SENTINEL}\"\n");
}
sub StaticLibrary($$)
{
my ($self,$ctx) = @_;
- $self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
-
+ $self->output("STATIC_LIBS += $ctx->{RESULT_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
+ $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
}
@@ -285,37 +196,21 @@ sub Binary($$)
my ($self,$ctx) = @_;
unless (defined($ctx->{INSTALLDIR})) {
+ $self->output("BINARIES += $ctx->{TARGET_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
- $self->output("SBIN_PROGS += bin/$ctx->{BINARY}\n");
+ $self->output("SBIN_PROGS += $ctx->{RESULT_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
- $self->output("BIN_PROGS += bin/$ctx->{BINARY}\n");
+ $self->output("BIN_PROGS += $ctx->{RESULT_BINARY}\n");
}
- $self->output("binaries:: $ctx->{TARGET_BINARY}\n");
-
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
-$self->output(<< "__EOD__"
-$ctx->{RESULT_BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
- \@echo Linking \$\@
-__EOD__
- );
-
if (defined($ctx->{USE_HOSTCC}) && $ctx->{USE_HOSTCC} eq "YES") {
- $self->output(<< "__EOD__"
- \@\$(HOSTLD) \$(HOSTLD_FLAGS) -L\${builddir}/bin/static -o \$\@ \$(INSTALL_LINK_FLAGS) \\
- \$\($ctx->{NAME}_LINK_FLAGS)
-__EOD__
- );
+$self->output("\$(call host_binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
} else {
- $self->output(<< "__EOD__"
- \@\$(BNLD) \$(BNLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
- \$\($ctx->{NAME}_LINK_FLAGS)
-
-__EOD__
- );
+$self->output("\$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
}
}
@@ -324,10 +219,7 @@ sub PythonFiles($$)
my ($self,$ctx) = @_;
foreach (@{$ctx->{PYTHON_FILES}}) {
- my $target = "bin/python/".basename($_);
- my $source = "\$(addprefix $ctx->{BASEDIR}/, $_)";
- $self->output("$target: $source\n\n");
- $self->output("PYTHON_PYS += $target\n");
+ $self->output("\$(eval \$(call python_py_module_template," . basename($_) . ",\$(addprefix $ctx->{BASEDIR}/, $_)))\n");
}
}
@@ -335,25 +227,17 @@ sub ProtoHeader($$)
{
my ($self,$ctx) = @_;
- my $priv = "$ctx->{BASEDIR}/$ctx->{PRIVATE_PROTO_HEADER}";
--
Samba Shared Repository
More information about the samba-cvs
mailing list