apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r910960 - in /apr/apr/branches/1.3.x: ./ build/gen-build.py test/NWGNUaprtest test/NWGNUglobalmutexchild test/NWGNUmod_test test/NWGNUproc_child test/NWGNUreadchild test/NWGNUsockchild test/NWGNUtestatmc test/NWGNUtryread
Date Wed, 17 Feb 2010 13:17:49 GMT
Author: jorton
Date: Wed Feb 17 13:17:49 2010
New Revision: 910960

URL: http://svn.apache.org/viewvc?rev=910960&view=rev
Log:
Merge r910419 from trunk:

* sorted requires python >= 2.4. We only require python 2.3 and do not
  have any better by default on RHEL 4.
  So sort the values by other means.

Submitted by: rpluem
Reviewed by: jorton

Modified:
    apr/apr/branches/1.3.x/   (props changed)
    apr/apr/branches/1.3.x/build/gen-build.py
    apr/apr/branches/1.3.x/test/NWGNUaprtest   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUmod_test   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUproc_child   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUreadchild   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUsockchild   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUtestatmc   (props changed)
    apr/apr/branches/1.3.x/test/NWGNUtryread   (props changed)

Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,2 +1,2 @@
 /apr/apr/branches/1.4.x:783970
-/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627,809854,829490,831641,905040,908427
+/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627,809854,829490,831641,905040,908427,910419

Modified: apr/apr/branches/1.3.x/build/gen-build.py
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/gen-build.py?rev=910960&r1=910959&r2=910960&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/gen-build.py (original)
+++ apr/apr/branches/1.3.x/build/gen-build.py Wed Feb 17 13:17:49 2010
@@ -180,7 +180,9 @@
     for hdr in deps.keys():
       deps.update(h_deps.get(hdr, {}))
 
-    f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(sorted(deps.values()))))
+    vals = deps.values()
+    vals.sort()
+    f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(vals)))
 
   objects.sort()
 

Propchange: apr/apr/branches/1.3.x/test/NWGNUaprtest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnuaprtest:783970
-/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnuaprtest:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnuglobalmutexchild:783970
-/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnuglobalmutexchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUmod_test
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnumod_test:783970
-/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnumod_test:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUproc_child
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnuproc_child:783970
-/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnuproc_child:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUreadchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnureadchild:783970
-/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnureadchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUsockchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnusockchild:783970
-/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnusockchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUtestatmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnutestatmc:783970
-/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnutestatmc:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588

Propchange: apr/apr/branches/1.3.x/test/NWGNUtryread
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:17:49 2010
@@ -1,3 +1,3 @@
 /apr/apr/branches/1.4.x/test/nwgnutryread:783970
-/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854,829490,831641,908427
+/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854,829490,831641,908427,910419
 /apr/apr/trunk/test/nwgnutryread:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588



Mime
View raw message