diff options
| author | Paul Querna <pquerna@apache.org> | 2009-03-25 10:56:44 +0000 |
|---|---|---|
| committer | Paul Querna <pquerna@apache.org> | 2009-03-25 10:56:44 +0000 |
| commit | 6716a32ad6bbf487f4262854efbca0d397433e63 (patch) | |
| tree | 00e4b7bdf8738afc40244e3b6ab770da1e33e230 | |
| parent | 5642b0b0d1b8d1089f864c1ba2c9f9c05d190670 (diff) | |
| download | apr-6716a32ad6bbf487f4262854efbca0d397433e63.tar.gz | |
SCons:
- build testall
- stub out ldap build vars.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@758212 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | SConscript | 23 | ||||
| -rw-r--r-- | build/aprenv.py | 15 |
2 files changed, 37 insertions, 1 deletions
diff --git a/SConscript b/SConscript index 0518feccf..e90c0d627 100644 --- a/SConscript +++ b/SConscript @@ -6,7 +6,28 @@ files = env.core_lib_files() (major, minor, patch) = env.APRVersion() libapr = env.SharedLibrary('apr-%d' % (major), files) +tests = Split(""" + abts.c testutil.c + testtime.c teststr.c testvsn.c testipsub.c testshm.c + testmmap.c testud.c testtable.c testsleep.c testpools.c + testfmt.c testfile.c testdir.c testfileinfo.c testrand.c + testdso.c testoc.c testdup.c testsockets.c testproc.c + testpoll.c testlock.c testsockopt.c testpipe.c + testthread.c testhash.c testargs.c testnames.c testuser.c + testpath.c testenv.c testprocmutex.c testfnmatch.c + testatomic.c testflock.c testsock.c testglobalmutex.c + teststrnatcmp.c testfilecopy.c testtemp.c testlfs.c + testcond.c testuri.c testmemcache.c testdate.c + testxlate.c testdbd.c testrmm.c testldap.c testmd4.c + teststrmatch.c testpass.c testcrypto.c testqueue.c + testbuckets.c testxml.c testdbm.c testuuid.c testmd5.c + testreslist.c +""") -targets = [libapr] +tenv = env.Clone() +tenv.AppendUnique(LIBS = libapr) +testall = tenv.Program('testall', source = ["test/"+t for t in tests]) + +targets = [libapr, testall] Return("targets")
\ No newline at end of file diff --git a/build/aprenv.py b/build/aprenv.py index c11819b03..ac9af3606 100644 --- a/build/aprenv.py +++ b/build/aprenv.py @@ -53,6 +53,7 @@ _simple_dirs = [ 'strings', 'strmatch', 'util-misc', + 'uri', 'xlate', 'xml' ] @@ -682,9 +683,23 @@ class APREnv(Environment): subst['@have_apr_iconv@'] = 0 subst['@have_iconv@'] = 0 + + # ldap stuff, remove soon. + subst['@apu_has_ldap@'] = 0 + + subst['@apu_has_ldap_netscape@'] = 0 + subst['@apu_has_ldap_solaris@'] = 0 + subst['@apu_has_ldap_novell@'] = 0 + subst['@apu_has_ldap_mozilla@'] = 0 + subst['@apu_has_ldap_openldap@'] = 0 + subst['@apu_has_ldap_microsoft@'] = 0 + subst['@apu_has_ldap_tivoli@'] = 0 + subst['@apu_has_ldap_zos@'] = 0 + subst['@apu_has_ldap_other@'] = 0 self.SubstFile('include/apr.h', 'include/apr.h.in', SUBST_DICT = subst) self.SubstFile('include/apu.h', 'include/apu.h.in', SUBST_DICT = subst) + self.SubstFile('include/apr_ldap.h', 'include/apr_ldap.h.in', SUBST_DICT = subst) self.SubstFile('include/apu_want.h', 'include/apu_want.h.in', SUBST_DICT = subst) self.SubstFile('include/private/apu_select_dbm.h', 'include/private/apu_select_dbm.h.in', SUBST_DICT = subst) if hasattr(conf, "config_h_text"): |