[pypy-svn] r5648 - pypy/trunk/doc/funding
pedronis at codespeak.net
pedronis at codespeak.net
Sat Jul 24 18:35:14 CEST 2004
Author: pedronis
Date: Sat Jul 24 18:35:13 2004
New Revision: 5648
Modified:
pypy/trunk/doc/funding/B0.0_preamble.txt
pypy/trunk/doc/funding/B6.7.wp02_maintenance.txt
pypy/trunk/doc/funding/B6.7.wp03_synchronisation.txt
pypy/trunk/doc/funding/B6.7.wp04_core.txt
pypy/trunk/doc/funding/B6.7.wp05_translation.txt
pypy/trunk/doc/funding/B6.7.wp06_core_optimisations.txt
pypy/trunk/doc/funding/B6.7.wp07_translator_optimisations.txt
pypy/trunk/doc/funding/B6.7.wp08_dynamic_optimisation.txt
pypy/trunk/doc/funding/B6.7.wp13_integration_config.txt
pypy/trunk/doc/funding/B6.7.wp14_documentation.txt
pypy/trunk/doc/funding/table4.py
Log:
port back changes that gave part_b_2004_07_22.sxw (i.e parking MMs to DFKI).
Modified: pypy/trunk/doc/funding/B0.0_preamble.txt
==============================================================================
--- pypy/trunk/doc/funding/B0.0_preamble.txt (original)
+++ pypy/trunk/doc/funding/B0.0_preamble.txt Sat Jul 24 18:35:13 2004
@@ -70,12 +70,6 @@
6 Logilab Logilab
---------------- --------------------------------------------- -----------------------
7 ChangeMaker ChangeMaker
----------------- --------------------------------------------- -----------------------
-8 Krekel Krekel
----------------- --------------------------------------------- -----------------------
-9 Martelli Martelli
----------------- --------------------------------------------- -----------------------
-10 Tismer Tismer
================ ============================================= =======================
:DELETE:BEGIN
Modified: pypy/trunk/doc/funding/B6.7.wp02_maintenance.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp02_maintenance.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp02_maintenance.txt Sat Jul 24 18:35:13 2004
@@ -3,7 +3,7 @@
.. |title| replace:: Infrastructure and Tools
.. |wp| replace:: WP02
.. |start| replace:: 0
-.. |p1| replace:: Krekel
+.. |p1| replace:: DFKI
.. |m1| replace:: 8
.. |p2| replace:: |e|
.. |m2| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp03_synchronisation.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp03_synchronisation.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp03_synchronisation.txt Sat Jul 24 18:35:13 2004
@@ -5,7 +5,7 @@
.. |start| replace:: 0
.. |p1| replace:: USH
.. |m1| replace:: 3
-.. |p2| replace:: Tismer
+.. |p2| replace:: DFKI
.. |m2| replace:: 6
.. |p3| replace:: |e|
.. |m3| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp04_core.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp04_core.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp04_core.txt Sat Jul 24 18:35:13 2004
@@ -5,14 +5,14 @@
.. |start| replace:: 0
.. |p1| replace:: Strakt
.. |m1| replace:: 6
-.. |p2| replace:: Tismer
-.. |m2| replace:: 4
-.. |p3| replace:: DFKI
-.. |m3| replace:: 4
-.. |p4| replace:: Logilab
-.. |m4| replace:: 5
-.. |p5| replace:: Krekel
-.. |m5| replace:: 4
+.. |p2| replace:: DFKI
+.. |m2| replace:: 12
+.. |p3| replace:: Logilab
+.. |m3| replace:: 5
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
.. |p6| replace:: |e|
.. |m6| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp05_translation.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp05_translation.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp05_translation.txt Sat Jul 24 18:35:13 2004
@@ -6,13 +6,13 @@
.. |p1| replace:: STRAKT
.. |m1| replace:: 15
.. |p2| replace:: DFKI
-.. |m2| replace:: 2
+.. |m2| replace:: 6
.. |p3| replace:: USH
.. |m3| replace:: 8
-.. |p4| replace:: Tismer
-.. |m4| replace:: 2
-.. |p5| replace:: Krekel
-.. |m5| replace:: 2
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
.. |p6| replace:: |e|
.. |m6| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp06_core_optimisations.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp06_core_optimisations.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp06_core_optimisations.txt Sat Jul 24 18:35:13 2004
@@ -5,7 +5,7 @@
.. |start| replace:: 9
.. |p1| replace:: USH
.. |m1| replace:: 12
-.. |p2| replace:: Tismer
+.. |p2| replace:: DFKI
.. |m2| replace:: 1
.. |p3| replace:: |e|
.. |m3| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp07_translator_optimisations.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp07_translator_optimisations.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp07_translator_optimisations.txt Sat Jul 24 18:35:13 2004
@@ -3,12 +3,12 @@
.. |title| replace:: Translator Optimisations
.. |wp| replace:: WP07
.. |start| replace:: 9
-.. |p1| replace:: Tismer
-.. |m1| replace:: 9
-.. |p2| replace:: Krekel
-.. |m2| replace:: 6
-.. |p3| replace:: USH
-.. |m3| replace:: 3
+.. |p1| replace:: DFKI
+.. |m1| replace:: 15
+.. |p2| replace:: USH
+.. |m2| replace:: 3
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
.. |p4| replace:: |e|
.. |m4| replace:: |e|
.. |p5| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp08_dynamic_optimisation.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp08_dynamic_optimisation.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp08_dynamic_optimisation.txt Sat Jul 24 18:35:13 2004
@@ -5,10 +5,10 @@
.. |start| replace:: 9
.. |p1| replace:: STRAKT
.. |m1| replace:: 17
-.. |p2| replace:: Tismer
-.. |m2| replace:: 2
-.. |p3| replace:: USH
-.. |m3| replace:: 6
+.. |p2| replace:: USH
+.. |m2| replace:: 6
+.. |p3| replace:: DFKI
+.. |m3| replace:: 2
.. |p4| replace:: |e|
.. |m4| replace:: |e|
.. |p5| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp13_integration_config.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp13_integration_config.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp13_integration_config.txt Sat Jul 24 18:35:13 2004
@@ -3,12 +3,12 @@
.. |title| replace:: Integration and Configuration
.. |wp| replace:: WP13
.. |start| replace:: 18
-.. |p1| replace:: Krekel
-.. |m1| replace:: 4
+.. |p1| replace:: DFKI
+.. |m1| replace:: 8
.. |p2| replace:: Logilab
.. |m2| replace:: 4
-.. |p3| replace:: DFKI
-.. |m3| replace:: 4
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
.. |p4| replace:: |e|
.. |m4| replace:: |e|
.. |p5| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp14_documentation.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp14_documentation.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp14_documentation.txt Sat Jul 24 18:35:13 2004
@@ -5,7 +5,7 @@
.. |start| replace:: 0
.. |p1| replace:: CM
.. |m1| replace:: 11
-.. |p2| replace:: Martelli
+.. |p2| replace:: DFKI
.. |m2| replace:: 12
.. |p3| replace:: |e|
.. |m3| replace:: |e|
Modified: pypy/trunk/doc/funding/table4.py
==============================================================================
--- pypy/trunk/doc/funding/table4.py (original)
+++ pypy/trunk/doc/funding/table4.py Sat Jul 24 18:35:13 2004
@@ -1,6 +1,8 @@
cols =[21, 14, 14,
#14,
- 14, 14, 14, 14, 14, 13, 14]
+ 14, 14, 14,
+ #14, 14, 13,
+ 14]
col_titles =['',
'DFKI',
@@ -9,9 +11,9 @@
'Strakt',
'Logilab',
'CM',
- 'Krekel',
- 'Martelli',
- 'Tismer',
+ #'Krekel',
+ #'Martelli',
+ #'Tismer',
'Total']
row_titles = [
@@ -76,19 +78,19 @@
('Research and', 'Innovation'):
None,
('WP2: Infrastructure', 'and Tools'):
- { 'DFKI': 0, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 8, 'Martelli': 0, 'Tismer': 0, },
+ { 'DFKI': 8, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP3: Synchronisation', 'with Standard Python'):
- { 'DFKI': 0, 'USH': 3, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 6, },
+ { 'DFKI': 6, 'USH': 3, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP4: PyPy Core',):
- { 'DFKI': 4, 'USH': 0, 'PBF': 0, 'Strakt': 6, 'Logilab': 5, 'CM': 0, 'Krekel': 4, 'Martelli': 0, 'Tismer': 4, },
+ { 'DFKI': 12, 'USH': 0, 'PBF': 0, 'Strakt': 6, 'Logilab': 5, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP5: PyPy Translation',):
- { 'DFKI': 2, 'USH': 8, 'PBF': 0, 'Strakt': 15, 'Logilab': 0, 'CM': 0, 'Krekel': 2, 'Martelli': 0, 'Tismer': 2, },
+ { 'DFKI': 6, 'USH': 8, 'PBF': 0, 'Strakt': 15, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP6: Core', 'Optimisations'):
- { 'DFKI': 0, 'USH': 12, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 1, },
+ { 'DFKI': 1, 'USH': 12, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP7: Translator', 'Optimisations'):
- { 'DFKI': 0, 'USH': 3, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 6, 'Martelli': 0, 'Tismer': 9, },
+ { 'DFKI': 15, 'USH': 3, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP8: Dynamic', 'Optimisations'):
- { 'DFKI': 0, 'USH': 6, 'PBF': 0, 'Strakt': 17, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 2, },
+ { 'DFKI': 2, 'USH': 6, 'PBF': 0, 'Strakt': 17, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP9: Search and Logic',):
{ 'DFKI': 10, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 9, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP10: Aspects and', 'Contracts'):
@@ -98,9 +100,9 @@
('WP12: Security,', 'Distribution and', 'Persistence'):
{ 'DFKI': 0, 'USH': 3, 'PBF': 0, 'Strakt': 10, 'Logilab': 0, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP13: Integration and', 'Configuration'):
- { 'DFKI': 4, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 4, 'CM': 0, 'Krekel': 4, 'Martelli': 0, 'Tismer': 0, },
+ { 'DFKI': 8, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 4, 'CM': 0, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('WP14: Documentaion', 'and Dissemination'):
- { 'DFKI': 0, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 11, 'Krekel': 0, 'Martelli': 12, 'Tismer': 0, },
+ { 'DFKI': 12, 'USH': 0, 'PBF': 0, 'Strakt': 0, 'Logilab': 0, 'CM': 11, 'Krekel': 0, 'Martelli': 0, 'Tismer': 0, },
('Total Research and', 'Innovation'):
(),
('Management',):
More information about the Pypy-commit
mailing list