[pypy-svn] rev 1624 - pypy/trunk/doc/funding

[tismer at codespeak.net]

Author: tismer
Date: Wed Oct  8 16:48:56 2003
New Revision: 1624

Added:
   pypy/trunk/doc/funding/B7.0_other_issues.txt   (props changed)
      - copied unchanged from rev 1623, pypy/trunk/doc/funding/B7.0_gender_ethical.txt
Removed:
   pypy/trunk/doc/funding/B7.0_gender_ethical.txt
   pypy/trunk/doc/funding/B7.2_other_issues.txt
Modified:
   pypy/trunk/doc/funding/B6.1_plan_introduction.txt
   pypy/trunk/doc/funding/crossreferences.asc
   pypy/trunk/doc/funding/mkxref.py
Log:
merged chapter 7 into a single document

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	Wed Oct  8 16:48:56 2003
@@ -66,7 +66,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   The PyPy interpreter itself should be developed and completed
   as a regular Python/RPython program. This package includes all
-  parts of CPython that we don't want to move to WP22_.
+  parts of CPython that we don't want to move to WPXXX22.
   Further investigation is needed concerning the 
   multimethod concepts of the standard object space,
   and how to hook in the bytecode compiler.
@@ -75,7 +75,7 @@
 WPXXX22: Porting CPython C-sourcecode to regular Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   Port all parts of CPython which we don't want to
-  implement in WP21_ into regular Python libraries.
+  implement in WPXXX21 into regular Python libraries.
   These ones should also work without PyPy, being just plain-Python
   replacements for existing CPython functionality.
   This includes the bytecode compiler, which definitely should
@@ -98,7 +98,7 @@
   be adjusted during WPXXX31.
   
   The goal is to be able to translate arbitrary RPython source code (e.g. 
-  the one produced in WP21_ into low-level code (C, Pyrex, Java, others). 
+  the one produced in WPXXX21 into low-level code (C, Pyrex, Java, others). 
   This includes making a stand-alone, not-PyPy-related tool for general
   optimisation of arbitrary but suitably restricted Python application or
   parts thereof.
@@ -106,7 +106,7 @@
 Bootstrapping PyPy
 ~~~~~~~~~~~~~~~~~~~
 
-The goal is to put interpreter (WP21_, WP22_) and translator
+The goal is to put interpreter (WPXXX21, WPXXX22) and translator
 (WPXXX31) together.
 
 The interpreter is written as an RPython program. The translator

Deleted: /pypy/trunk/doc/funding/B7.0_gender_ethical.txt
==============================================================================
--- /pypy/trunk/doc/funding/B7.0_gender_ethical.txt	Wed Oct  8 16:48:56 2003
+++ (empty file)
@@ -1,53 +0,0 @@
-Other Issues
-==================
-
-:DELETE:BEGIN
-
-B.7 Other issues
-            
-B.7.1. If there are ethical or gender issues associated with the
-subject of the proposal, show they have been adequately taken into
-account - indicate which national and international regulations are
-applicable and explain how they will be respected. Explore potential
-ethical aspects of the implementation of project results. Include the
-Ethical issues form given below.
-
-:DELETE:END
-
-Ethical Considerations
------------------------
-
-FIXME write this.
-
-:DELETE:BEGIN
-
-B.7.2 Are there other EC-policy related issues, and are they taken
-into account? Demonstrate a readiness to engage with actors beyond the
-research to help spread awareness and knowledge and to explore the
-wider societal implications of the proposed work; if relevant set out
-synergies with education at all levels.
-            
-(No recommended length ­ depends on the number of such other 
- issues which the project involves).
-
-:DELETE:END
-
-Gender Issues
-----------------
-
-FIXME write this
-
-Safety Issues
-----------------
-
-FIXME write this
-
-Conservation Regulations
---------------------------
-
-FIXME write this
-
-Other Policy related Issues
------------------------------
-
-FIXME write this

Deleted: /pypy/trunk/doc/funding/B7.2_other_issues.txt
==============================================================================
--- /pypy/trunk/doc/funding/B7.2_other_issues.txt	Wed Oct  8 16:48:56 2003
+++ (empty file)
@@ -1,8 +0,0 @@
-B.7.2 Are there other EC-policy related issues, and are they taken
-into account? Demonstrate a readiness to engage with actors beyond the
-research to help spread awareness and knowledge and to explore the
-wider societal implications of the proposed work; if relevant set out
-synergies with education at all levels.
-            
-(No recommended length ­ depends on the number of such other 
- issues which the project involves).

Modified: pypy/trunk/doc/funding/crossreferences.asc
==============================================================================
--- pypy/trunk/doc/funding/crossreferences.asc	(original)
+++ pypy/trunk/doc/funding/crossreferences.asc	Wed Oct  8 16:48:56 2003
@@ -6,15 +6,12 @@
 .. _WP06: B6.7.wp06_dynamic_optimization.html
 .. _WP07: B6.7.wp07_translator_optimisations.html
 .. _WP08: B6.7.wp08_core_optimisations.html
-.. _WP09: B6.7.wp09_language_research.html
-.. _WP10: 
+.. _WP09: B6.7.wp09_language_extensions.html
+.. _WP10: B6.7.wp10_app_language_ext.html
 .. _WP11: B6.7.wp11_validations.html
 .. _WP12: B6.7.wp12_integration_config.html
-.. _WP13: 
+.. _WP13: B6.7.wp13_existing_apps.html
 .. _WP14: B6.7.wp14_documentation.html
-.. _WP21: B6.7.wp21_interpreter_completion.html
-.. _WP22: B6.7.wp22_cpython_to_python.html
 .. _WP90: B6.7.wp90_constraint_prog.html
-.. attention:: **2 files missing: WP10 WP13**
 
 .. |e| unicode:: 0x20 .. doesn't work with plain spaces
\ No newline at end of file

Modified: pypy/trunk/doc/funding/mkxref.py
==============================================================================
--- pypy/trunk/doc/funding/mkxref.py	(original)
+++ pypy/trunk/doc/funding/mkxref.py	Wed Oct  8 16:48:56 2003
@@ -27,7 +27,7 @@
                 res["WP"+num] = newfname
     return res
 
-REF_FILE = "B6.4_workpackage_list.txt"
+REF_FILE = "B6.5_workpackage_list.txt"
 
 def get_wps_from_file():
     # read the file and find all WPnn_ references