[pypy-svn] rev 1384 - pypy/trunk/doc/funding
tismer at codespeak.net
tismer at codespeak.net
Mon Sep 22 11:44:53 CEST 2003
Author: tismer
Date: Mon Sep 22 11:44:52 2003
New Revision: 1384
Added:
pypy/trunk/doc/funding/wp-tablebegin.asc
pypy/trunk/doc/funding/wp-tableend.asc
pypy/trunk/doc/funding/wp-template.htm
Modified:
pypy/trunk/doc/funding/B6.1_plan_introduction.txt
pypy/trunk/doc/funding/B6.wp01_interpreter_completion.txt
pypy/trunk/doc/funding/B6.wp02_cpython_to_python.txt
pypy/trunk/doc/funding/B6.wp03_translation_of_rpython.txt
pypy/trunk/doc/funding/B6.wp04_bootstrap_redesign.txt
pypy/trunk/doc/funding/B6.wp05_bootstrap_runtime.txt
pypy/trunk/doc/funding/B6.wp06_several_obj_impl.txt
pypy/trunk/doc/funding/B6.wp07_translator_optimisations.txt
pypy/trunk/doc/funding/B6.wp08_integrate_psyco.txt
pypy/trunk/doc/funding/B6.wp09_integrate_stackless.txt
pypy/trunk/doc/funding/B6.wp10_embedded_device.txt
pypy/trunk/doc/funding/B6.wp11_small_os.txt
pypy/trunk/doc/funding/crossreferences.asc
pypy/trunk/doc/funding/renamewp.py
Log:
Changed the layout of all working packages.
They now use some raw html inclusions, which produce
nearly exact the result that we want to see after import
of the HTML into Open Office.
Modified: pypy/trunk/doc/funding/B6.1_plan_introduction.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.1_plan_introduction.txt (original)
+++ pypy/trunk/doc/funding/B6.1_plan_introduction.txt Mon Sep 22 11:44:52 2003
@@ -95,22 +95,6 @@
optimisation of arbitrary but suitably restricted Python application or
parts thereof.
-**Part a): Code Analysis**
-
-Analyse code to produce the relevant typing information. Investigate
-if we can use the annotation object space only or if additional
-AST-based control flow analysis is needed. Give a formal definition
-of RPython.
-
-**Part b): Code Production**
-
-Produce low-level code out of the data gathered in Part a). Again
-investigate how this is best done (AST-guided translation or
-reverse-engineering of the low-level control flow gathered by the
-annotation object space). Compare different low-level environments that
-we could target (C, Pyrex, others?).
-
-
_`Bootstrapping` PyPy
------------------------------
@@ -248,7 +232,7 @@
memory size, which either limits the power of software that
is implemented for these platforms, or enforces use of
low-level approaches like C/C++ or Java.
-PyPy is especially suited to support such platform, since
+PyPy is especially suited to support such platforms, since
it can produce highly effective, compact code, while retaining
the abstraction and ease-of-use of Python.
@@ -279,13 +263,6 @@
WP09_ very much.
-Load Balancing in a Multi-Processor environment
----------------------------------------------------
-
-
-*XXX to be finished, collecting snippets*
-
-
Numerical Applications
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PyPy is extremely flexible, since it supports static
@@ -320,6 +297,12 @@
enabled to emit optimized code for that.
+Load Balancing in a Multi-Processor environment
+---------------------------------------------------
+
+*XXX to be finished, collecting snippets*
+
+
Infrastructure
------------------
Modified: pypy/trunk/doc/funding/B6.wp01_interpreter_completion.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp01_interpreter_completion.txt (original)
+++ pypy/trunk/doc/funding/B6.wp01_interpreter_completion.txt Mon Sep 22 11:44:52 2003
@@ -1,29 +1,34 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Development and Completion of the PyPy Interpreter
+.. |wp| replace:: WP01
+.. |start| replace:: 0
+.. |p1| replace:: X
+.. |m1| replace:: 3
+.. |p2| replace:: Y
+.. |m2| replace:: 3
+.. |p3| replace:: Z
+.. |m3| replace:: 3
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 01
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y Z
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 3 3 3
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Development and Completion of the PyPy Interpreter
-
The PyPy interpreter itself should be developed and completed
as a regular Python program. This package includes all
parts of CPython that we don't want to move to WP02_.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Description of work**
- Coordinate with WP02_ which parts of CPython
@@ -33,12 +38,18 @@
concepts that the standard object space is based on,
and how to hook in the bytecode compiler.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL01: First complete Python Implementation
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Milestones and Expected Result**
- Initial Prototype
+
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp02_cpython_to_python.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp02_cpython_to_python.txt (original)
+++ pypy/trunk/doc/funding/B6.wp02_cpython_to_python.txt Mon Sep 22 11:44:52 2003
@@ -1,30 +1,34 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Translation of CPython into regular Python
+.. |wp| replace:: WP02
+.. |start| replace:: 0
+.. |p1| replace:: X
+.. |m1| replace:: 3
+.. |p2| replace:: Y
+.. |m2| replace:: 3
+.. |p3| replace:: Z
+.. |m3| replace:: 3
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 02
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y Z
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 3 3 3
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Translation of CPython into regular Python
-
Translate all parts of CPython which we don't want to
implement in WP01_ into regular Python libraries.
Note: These ones should also work without PyPy, being just plain-Python
replacements for existing CPython functionality.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
@@ -34,14 +38,19 @@
become a regular Python program, instead of being built
into the interpreter.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL01: First complete Python Implementation
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Milestones and Expected Result**
- Initial Prototype
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp03_translation_of_rpython.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp03_translation_of_rpython.txt (original)
+++ pypy/trunk/doc/funding/B6.wp03_translation_of_rpython.txt Mon Sep 22 11:44:52 2003
@@ -1,31 +1,35 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Translation of RPython
+.. |wp| replace:: WP03
+.. |start| replace:: 0
+.. |p1| replace:: X
+.. |m1| replace:: 3
+.. |p2| replace:: Y
+.. |m2| replace:: 3
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 03
--------------------------------- --------------------------
-**Start date or starting event** end of WP02_/WP03_
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 3 3
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Translation of RPython
-
- Ability to translate arbitrary RPython source code (e.g.
the one produced in WP01_ into low-level code (C, Pyrex, Java, others).
- Creation of a stand-alone, not-PyPy-related tool for general
optimization of arbitrary but suitably restricted Python application or
parts thereof.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
@@ -48,12 +52,18 @@
- Provide some measure for the efficiency of the generated
code, in comparison to Standard Python.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Deliverables**
- DL02: Stand-alone Python Interpreter
- DL03: Tool for Analysis of restricted Python Programs
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
- Initial Complete Self-Contained PyPy Interpreter
Modified: pypy/trunk/doc/funding/B6.wp04_bootstrap_redesign.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp04_bootstrap_redesign.txt (original)
+++ pypy/trunk/doc/funding/B6.wp04_bootstrap_redesign.txt Mon Sep 22 11:44:52 2003
@@ -1,31 +1,37 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Specific Analysis and Redesign
+.. |wp| replace:: WP04
+.. |start| replace:: 0
+.. |p1| replace:: X
+.. |m1| replace:: 3
+.. |p2| replace:: Y
+.. |m2| replace:: 3
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 04
--------------------------------- --------------------------
-**Start date or starting event** WP03_
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 3 3
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Specific Analysis and Redesign
-
- Putting interpreter (WP01_, WP02_) and translator (WP03_) together.
- Enhancing the PyPy Design.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Part a): Specific Analysis and Redesign**
@@ -36,12 +42,14 @@
- Re-iterate this until we agree to have reached
an optimum solution.
-
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
-
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Milestones and Expected Result**
-
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp05_bootstrap_runtime.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp05_bootstrap_runtime.txt (original)
+++ pypy/trunk/doc/funding/B6.wp05_bootstrap_runtime.txt Mon Sep 22 11:44:52 2003
@@ -1,31 +1,34 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Low Level PyPy Runtime
+.. |wp| replace:: WP05
+.. |start| replace:: WP03_
+.. |p1| replace:: X
+.. |m1| replace:: 2
+.. |p2| replace:: Y
+.. |m2| replace:: 2
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 05
--------------------------------- --------------------------
-**Start date or starting event** WP03_
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Low Level PyPy Runtime
-
- Providing a Runtime Library for PyPy
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
-
In order to give a working environment to the translated RPython
program, we need to build the low-level-specific **run-time**
components of PyPy.
@@ -41,13 +44,17 @@
If producing C code is a target, important
parts can be directly re-used from CPython.
-
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
DL??? Runtime Library for PyPy
DL??? Passing all applicable elements of the standard test suite.
-**Milestones and Expected Result**
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp06_several_obj_impl.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp06_several_obj_impl.txt (original)
+++ pypy/trunk/doc/funding/B6.wp06_several_obj_impl.txt Mon Sep 22 11:44:52 2003
@@ -1,29 +1,33 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Several Object Implementations
+.. |wp| replace:: WP06
+.. |start| replace:: WP03_
+.. |p1| replace:: X
+.. |m1| replace:: 2
+.. |p2| replace:: Y
+.. |m2| replace:: 2
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 06
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Several Object Implementations
-
- Providing several object implementations for
- general optimisation
- application specific alternatives
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
@@ -50,11 +54,18 @@
* Create reports and merge the results back into the optimization effort.
As of general interest, submit the reports as publication.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Deliverables**
- DL??? to be defined. Publication.
- DL??? Passing all applicable elements of the standard test
suite for every tested alternative.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp07_translator_optimisations.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp07_translator_optimisations.txt (original)
+++ pypy/trunk/doc/funding/B6.wp07_translator_optimisations.txt Mon Sep 22 11:44:52 2003
@@ -1,28 +1,33 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Translator Optimisations
+.. |wp| replace:: WP07
+.. |start| replace:: WP03_
+.. |p1| replace:: X
+.. |m1| replace:: 4
+.. |p2| replace:: Y
+.. |m2| replace:: 4
+.. |p3| replace:: |e|
+.. |m3| replace:: |e|
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 07
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 4 4
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Translator Optimisations
-
- Identification and Implementation of Optimisations
through modifications of the Translator.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Description of work**
The following alternatives are mostly specific to a particular low-level run-time.
@@ -53,14 +58,20 @@
* Create reports and merge the results back into the optimization effort.
As of general interest, submit the reports as publication.
-Note that compatibility with legacy C extensions can be acheived by choosing,
+Note that compatibility with legacy C extensions can be achieved by choosing,
for each of the following issues, the same one as CPython did.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL??? to be defined. Publication.
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp08_integrate_psyco.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp08_integrate_psyco.txt (original)
+++ pypy/trunk/doc/funding/B6.wp08_integrate_psyco.txt Mon Sep 22 11:44:52 2003
@@ -1,32 +1,36 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Integration of Psyco
+.. |wp| replace:: WP08
+.. |start| replace:: WP07_
+.. |p1| replace:: AR
+.. |m1| replace:: 6
+.. |p2| replace:: Y
+.. |m2| replace:: 4
+.. |p3| replace:: Y
+.. |m3| replace:: 4
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 08
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** AR CT X
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 4 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Integration of Psyco
-
- Integration of Psyco's technology into PyPy.
- Optimization by Creating Specialized Machine Code at Run-time.
- Adressing new Processor Architectures
-**Description of work**
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+**Description of work**
- Determine which parts of Psyco need to be written in RPython.
@@ -42,11 +46,17 @@
e.g. identify when these technologies would guide specific choices among the
solutions developed in WP05_ and studying several solutions in WP06_.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL??? to be defined. Speed boost, architectures.
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp09_integrate_stackless.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp09_integrate_stackless.txt (original)
+++ pypy/trunk/doc/funding/B6.wp09_integrate_stackless.txt Mon Sep 22 11:44:52 2003
@@ -1,33 +1,37 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Integration of Stackless
+.. |wp| replace:: WP09
+.. |start| replace:: WP07_
+.. |p1| replace:: CT
+.. |m1| replace:: 6
+.. |p2| replace:: Y
+.. |m2| replace:: 4
+.. |p3| replace:: Y
+.. |m3| replace:: 4
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 09
--------------------------------- --------------------------
-**Start date or starting event** 0
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** AR CT X
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 4 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: Integration of Stackless
-
- Integration of Stackless's Technology into PyPy.
- Enable Massive Parallelism in a Single Thread
- Allow Pickling of a Running Program
-**Description of work**
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+**Description of work**
- Determine which parts of Stackless need to be written in RPython.
@@ -46,6 +50,8 @@
e.g. identify when these technologies would guide specific choices among the
solutions developed in WP05_ and studying several solutions in WP06_.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
@@ -54,3 +60,4 @@
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp10_embedded_device.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp10_embedded_device.txt (original)
+++ pypy/trunk/doc/funding/B6.wp10_embedded_device.txt Mon Sep 22 11:44:52 2003
@@ -1,20 +1,24 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: Integration of Stackless
+.. |wp| replace:: WP10
+.. |start| replace:: WP05_
+.. |p1| replace:: X
+.. |m1| replace:: 3
+.. |p2| replace:: Y
+.. |m2| replace:: 3
+.. |p3| replace:: Y
+.. |m3| replace:: 3
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 09
--------------------------------- --------------------------
-**Start date or starting event** not before WP05_
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y Z
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 2 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
@@ -25,6 +29,8 @@
embedded Devices
- Proving the flexibility of the PyPy idea
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
@@ -46,11 +52,17 @@
project is vital. Typically, very different trade-offs need to be
made on different environments.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL??? Python running on the embedded device.
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/B6.wp11_small_os.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.wp11_small_os.txt (original)
+++ pypy/trunk/doc/funding/B6.wp11_small_os.txt Mon Sep 22 11:44:52 2003
@@ -1,28 +1,31 @@
.. include:: crossreferences.asc
-Workpackage Description
-========================
+.. |title| replace:: A small Operating System for an Embedded Device
+.. |wp| replace:: WP11
+.. |start| replace:: WP10_
+.. |p1| replace:: CT
+.. |m1| replace:: 6
+.. |p2| replace:: Y
+.. |m2| replace:: 4
+.. |p3| replace:: Y
+.. |m3| replace:: 4
+.. |p4| replace:: |e|
+.. |m4| replace:: |e|
+.. |p5| replace:: |e|
+.. |m5| replace:: |e|
+.. |p6| replace:: |e|
+.. |m6| replace:: |e|
-================================ ==========================
-**Workpackage number** 11
--------------------------------- --------------------------
-**Start date or starting event** not before WP05_
-================================ ==========================
-
-================================= ======= ======= ======= ======= ======= ======= ======= =======
-**Participant id** X Y Z
---------------------------------- ------- ------- ------- ------- ------- ------- ------- -------
-**Person-months per participant** 2 2 2
-================================= ======= ======= ======= ======= ======= ======= ======= =======
+.. include:: wp-toptable.asc
+.. include:: wp-tablebegin.asc
**Objectives**
-Title: A small Operating System for an Embedded Device
-
-
- Building all parts of a small Operating System
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Description of work**
@@ -53,11 +56,17 @@
- Test the implementation both on the simulator and on the real hardware.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
**Deliverables**
- DL??? Python implements the whole OS of the embedded device.
- DL??? Passing all applicable elements of the standard test suite.
+.. include:: wp-tableend.asc
+.. include:: wp-tablebegin.asc
+
**Milestones and Expected Result**
+.. include:: wp-tableend.asc
Modified: pypy/trunk/doc/funding/crossreferences.asc
==============================================================================
--- pypy/trunk/doc/funding/crossreferences.asc (original)
+++ pypy/trunk/doc/funding/crossreferences.asc Mon Sep 22 11:44:52 2003
@@ -9,3 +9,5 @@
.. _WP09: B6.wp09_integrate_stackless.html
.. _WP10: B6.wp10_embedded_device.html
.. _WP11: B6.wp11_small_os.html
+
+.. |e| unicode:: 0x20 .. doesn't work with plain spaces
\ No newline at end of file
Modified: pypy/trunk/doc/funding/renamewp.py
==============================================================================
--- pypy/trunk/doc/funding/renamewp.py (original)
+++ pypy/trunk/doc/funding/renamewp.py Mon Sep 22 11:44:52 2003
@@ -24,8 +24,8 @@
sys.exit(1)
del wpfiles[oldS]
wpfiles[newS] = newName
- workfiles = wpfiles.values()
- workfiles.append(mkxref.REF_FILE)
+ workfiles = os.listdir(".")
+ workfiles = [fname for fname in workfiles if os.path.splitext(fname)[-1].lower() == ".txt"]
find = oldS+"_"
repl = newS+"_"
for fname in workfiles:
Added: pypy/trunk/doc/funding/wp-tablebegin.asc
==============================================================================
--- (empty file)
+++ pypy/trunk/doc/funding/wp-tablebegin.asc Mon Sep 22 11:44:52 2003
@@ -0,0 +1,11 @@
+
+.. start a surounding single table cell with a minimum height.
+
+.. raw:: html
+
+ <P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0.11cm"><BR><BR>
+ </P>
+ <TABLE WIDTH=658 BORDER=1 BORDERCOLOR="#000000" CELLPADDING=7 CELLSPACING=0>
+ <COL WIDTH=642>
+ <TR>
+ <TD WIDTH=642 HEIGHT=154 VALIGN=TOP>
Added: pypy/trunk/doc/funding/wp-tableend.asc
==============================================================================
--- (empty file)
+++ pypy/trunk/doc/funding/wp-tableend.asc Mon Sep 22 11:44:52 2003
@@ -0,0 +1,8 @@
+
+.. end a single surrounding table.
+
+.. raw:: html
+
+ </TD>
+ </TR>
+ </TABLE>
Added: pypy/trunk/doc/funding/wp-template.htm
==============================================================================
--- (empty file)
+++ pypy/trunk/doc/funding/wp-template.htm Mon Sep 22 11:44:52 2003
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
+ <TITLE></TITLE>
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.0 (Win32)">
+ <META NAME="AUTHOR" CONTENT="Christian Tismer">
+ <META NAME="CREATED" CONTENT="20030921;22285200">
+ <META NAME="CHANGEDBY" CONTENT="Christian Tismer">
+ <META NAME="CHANGED" CONTENT="20030922;11391578">
+ <STYLE>
+ <!--
+ @page { size: 21cm 29.7cm; margin: 2cm }
+ TD P { margin-bottom: 0cm }
+ P { margin-bottom: 0.21cm }
+ -->
+ </STYLE>
+</HEAD>
+<BODY LANG="en-US" DIR="LTR">
+<P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0.11cm; page-break-before: always">
+<FONT COLOR="#000000">|title|</FONT></P>
+<TABLE WIDTH=658 BORDER=1 BORDERCOLOR="#000000" CELLPADDING=7 CELLSPACING=0 RULES=NONE>
+ <COL WIDTH=222>
+ <COL WIDTH=56>
+ <COL WIDTH=56>
+ <COL WIDTH=56>
+ <COL WIDTH=56>
+ <COL WIDTH=56>
+ <COL WIDTH=55>
+ <TR VALIGN=TOP>
+ <TD WIDTH=222>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000"><B>Workpackage number </B></FONT>
+ </P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|wp|</FONT></P>
+ </TD>
+ <TD COLSPAN=3 WIDTH=197>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000"><B>Start date or starting
+ event:</B></FONT></P>
+ </TD>
+ <TD COLSPAN=2 WIDTH=126>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|start|</FONT></P>
+ </TD>
+ </TR>
+ <TR VALIGN=TOP>
+ <TD WIDTH=222>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000"><B>Participant id</B></FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p1|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p2|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p3|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p4|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p5|</FONT></P>
+ </TD>
+ <TD WIDTH=55>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|p6|</FONT></P>
+ </TD>
+ </TR>
+ <TR VALIGN=TOP>
+ <TD WIDTH=222 HEIGHT=3>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000"><B>Person-months per
+ participant:</B></FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m1|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m2|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m3|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m4|</FONT></P>
+ </TD>
+ <TD WIDTH=56>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m5|</FONT></P>
+ </TD>
+ <TD WIDTH=55>
+ <P ALIGN=JUSTIFY><FONT COLOR="#000000">|m6|</FONT></P>
+ </TD>
+ </TR>
+</TABLE>
+<P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0.11cm"><BR><BR>
+</P>
+<TABLE WIDTH=658 BORDER=1 BORDERCOLOR="#000000" CELLPADDING=7 CELLSPACING=0>
+ <COL WIDTH=642>
+ <TR>
+ <TD WIDTH=642 HEIGHT=154 VALIGN=TOP>
+ <P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm"><BR>
+ </P>
+ </TD>
+ </TR>
+</TABLE>
+<P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0.11cm"><BR><BR>
+</P>
+<P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0.11cm">Note
+that this file is intentionally named ending in “.htm”,
+because I used to remove all the generated crap by “del
+*.html”.</P>
+</BODY>
+</HTML>
\ No newline at end of file
More information about the Pypy-commit
mailing list