apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r758212 - in /apr/apr/trunk: SConscript build/aprenv.py
Date Wed, 25 Mar 2009 10:56:48 GMT
Author: pquerna
Date: Wed Mar 25 10:56:44 2009
New Revision: 758212

URL: http://svn.apache.org/viewvc?rev=758212&view=rev
Log:
SCons:
 - build testall
 - stub out ldap build vars.

Modified:
    apr/apr/trunk/SConscript
    apr/apr/trunk/build/aprenv.py

Modified: apr/apr/trunk/SConscript
URL: http://svn.apache.org/viewvc/apr/apr/trunk/SConscript?rev=758212&r1=758211&r2=758212&view=diff
==============================================================================
--- apr/apr/trunk/SConscript (original)
+++ apr/apr/trunk/SConscript Wed Mar 25 10:56:44 2009
@@ -6,7 +6,28 @@
 (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

Modified: apr/apr/trunk/build/aprenv.py
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/aprenv.py?rev=758212&r1=758211&r2=758212&view=diff
==============================================================================
--- apr/apr/trunk/build/aprenv.py (original)
+++ apr/apr/trunk/build/aprenv.py Wed Mar 25 10:56:44 2009
@@ -53,6 +53,7 @@
     'strings',
     'strmatch',
     'util-misc',
+    'uri',
     'xlate',
     'xml'
 ]
@@ -682,9 +683,23 @@
 
     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"):



Mime
View raw message