[Numpy-svn] r4194 - in branches/numpy.scons: . numpy/core

numpy-svn at scipy.org numpy-svn at scipy.org
Mon Oct 15 02:46:47 EDT 2007 

Author: cdavid
Date: 2007-10-15 01:46:27 -0500 (Mon, 15 Oct 2007)
New Revision: 4194

Modified:
   branches/numpy.scons/
   branches/numpy.scons/numpy/core/scons_support.py
Log:
Fix overwrite of template strings (multiarray and ufunc) in code generators


Property changes on: branches/numpy.scons
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-10-15 13:33:52.779999971 +0900
committer: David Cournapeau <david at ar.media.kyoto-u.ac.jp>
properties: 
	branch-nick: numpy.scons

   + timestamp: 2007-10-15 14:46:24.947000027 +0900
committer: David Cournapeau <david at ar.media.kyoto-u.ac.jp>
properties: 
	branch-nick: numpy.scons

Name: bzr:file-ids
   - numpy/core/code_generators/__init__.py	__init__.py-20071015043250-76z2lcbwxnxy1x8k-1

   + 
Name: bzr:revision-id:v3-trunk0
   - 3737 david at david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david at david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david at david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david at david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david at ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david at ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david at david-laptop-20070922101656-61kfi2faucemr2rl
3745 david at david-laptop-20070922113708-ror18thshang1cpu
3747 david at david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david at david-laptop-20070922154007-usit009fr6vp377j
3750 david at david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david at david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david at ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david at ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david at ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david at ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david at david-laptop-20070924153247-yftud00bynilxv69
3757 david at david-laptop-20070924163545-pish34x9fq2h66aj
3758 david at david-laptop-20070924164633-iiyygcaw81ji3n34
3759 david at david-laptop-20070924170201-y14v2yzikdpvamfp
3760 david at david-laptop-20070924171208-5bmitorzf49d1aa2
3761 david at david-laptop-20070925014444-ns9v90gotnxt39mq
3769 david at david-laptop-20070925145952-4osi81tvch7v6luj
3773 david at ar.media.kyoto-u.ac.jp-20070926073429-2kdc6yf1o210aer0
3774 david at ar.media.kyoto-u.ac.jp-20070926084356-938djoytjap90rmo
3775 david at ar.media.kyoto-u.ac.jp-20070926085329-3gquq3gu2k8rgzb0
3776 david at ar.media.kyoto-u.ac.jp-20071009084906-9kradhwpu7su633x
3777 david at ar.media.kyoto-u.ac.jp-20071009093339-q5nf5me6ikdi48k6
3778 david at david-laptop-20071009152108-xh5cltii0h6zjk9b
3779 david at david-laptop-20071009154954-v5se05gbq60opo1z
3780 david at david-laptop-20071009223102-vz2sgf5i6pncxsd8
3781 david at david-laptop-20071009225259-13m6enwqk4w9uihe
3782 david at ar.media.kyoto-u.ac.jp-20071010021710-liz2jvw0ggbxrtgi
3783 david at ar.media.kyoto-u.ac.jp-20071010032218-8qzxvdmith85a056
3784 david at ar.media.kyoto-u.ac.jp-20071010032323-lgbxfd788h402kn0
3792 david at ar.media.kyoto-u.ac.jp-20071011033223-s14976refgeaw00h
3793 david at ar.media.kyoto-u.ac.jp-20071011033241-rrzlo2vu6w0tkdwf
3794 david at ar.media.kyoto-u.ac.jp-20071011071251-c5pxigyynpck262d
3795 david at ar.media.kyoto-u.ac.jp-20071012040323-8ka0mgkx1t8r9fcl
3796 david at ar.media.kyoto-u.ac.jp-20071012042801-44pmvc5o1u6p6wi7
3797 david at ar.media.kyoto-u.ac.jp-20071012071207-nfpsuyfoq0ooy7xf
3798 david at ar.media.kyoto-u.ac.jp-20071012073426-8o9tejzovgk7qzi4
3799 david at ar.media.kyoto-u.ac.jp-20071012074103-1fzviuk1sunv0b9n
3800 david at ar.media.kyoto-u.ac.jp-20071012074129-t5nu6f96wie8fd1y
3801 david at ar.media.kyoto-u.ac.jp-20071012100715-sq8hhctu5tynlx4m
3802 david at david-laptop-20071013043839-hc3yfsbn0t7gsuhe
3803 david at david-laptop-20071013123319-vf4b7yhadz9nxasc
3804 david at david-laptop-20071014063148-0bsktlh609c3rpv7
3805 david at david-laptop-20071014064841-liamaqiv3af71r3g
3806 david at david-laptop-20071014064900-j4yzxzuveukuyj2l
3807 david at david-laptop-20071014124401-n3a37y67u5imyo83
3808 david at david-laptop-20071014161201-hdljwkhh4ep0f9k2
3809 david at david-laptop-20071014164521-c6i415hcz6hfrxxp
3810 david at david-laptop-20071015032315-g9fsm9zqk6fanyjz
3811 david at ar.media.kyoto-u.ac.jp-20071015043352-a24r1whpwiwiso80

   + 3737 david at david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david at david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david at david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david at david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david at ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david at ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david at david-laptop-20070922101656-61kfi2faucemr2rl
3745 david at david-laptop-20070922113708-ror18thshang1cpu
3747 david at david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david at david-laptop-20070922154007-usit009fr6vp377j
3750 david at david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david at david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david at ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david at ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david at ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david at ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david at david-laptop-20070924153247-yftud00bynilxv69
3757 david at david-laptop-20070924163545-pish34x9fq2h66aj
3758 david at david-laptop-20070924164633-iiyygcaw81ji3n34
3759 david at david-laptop-20070924170201-y14v2yzikdpvamfp
3760 david at david-laptop-20070924171208-5bmitorzf49d1aa2
3761 david at david-laptop-20070925014444-ns9v90gotnxt39mq
3769 david at david-laptop-20070925145952-4osi81tvch7v6luj
3773 david at ar.media.kyoto-u.ac.jp-20070926073429-2kdc6yf1o210aer0
3774 david at ar.media.kyoto-u.ac.jp-20070926084356-938djoytjap90rmo
3775 david at ar.media.kyoto-u.ac.jp-20070926085329-3gquq3gu2k8rgzb0
3776 david at ar.media.kyoto-u.ac.jp-20071009084906-9kradhwpu7su633x
3777 david at ar.media.kyoto-u.ac.jp-20071009093339-q5nf5me6ikdi48k6
3778 david at david-laptop-20071009152108-xh5cltii0h6zjk9b
3779 david at david-laptop-20071009154954-v5se05gbq60opo1z
3780 david at david-laptop-20071009223102-vz2sgf5i6pncxsd8
3781 david at david-laptop-20071009225259-13m6enwqk4w9uihe
3782 david at ar.media.kyoto-u.ac.jp-20071010021710-liz2jvw0ggbxrtgi
3783 david at ar.media.kyoto-u.ac.jp-20071010032218-8qzxvdmith85a056
3784 david at ar.media.kyoto-u.ac.jp-20071010032323-lgbxfd788h402kn0
3792 david at ar.media.kyoto-u.ac.jp-20071011033223-s14976refgeaw00h
3793 david at ar.media.kyoto-u.ac.jp-20071011033241-rrzlo2vu6w0tkdwf
3794 david at ar.media.kyoto-u.ac.jp-20071011071251-c5pxigyynpck262d
3795 david at ar.media.kyoto-u.ac.jp-20071012040323-8ka0mgkx1t8r9fcl
3796 david at ar.media.kyoto-u.ac.jp-20071012042801-44pmvc5o1u6p6wi7
3797 david at ar.media.kyoto-u.ac.jp-20071012071207-nfpsuyfoq0ooy7xf
3798 david at ar.media.kyoto-u.ac.jp-20071012073426-8o9tejzovgk7qzi4
3799 david at ar.media.kyoto-u.ac.jp-20071012074103-1fzviuk1sunv0b9n
3800 david at ar.media.kyoto-u.ac.jp-20071012074129-t5nu6f96wie8fd1y
3801 david at ar.media.kyoto-u.ac.jp-20071012100715-sq8hhctu5tynlx4m
3802 david at david-laptop-20071013043839-hc3yfsbn0t7gsuhe
3803 david at david-laptop-20071013123319-vf4b7yhadz9nxasc
3804 david at david-laptop-20071014063148-0bsktlh609c3rpv7
3805 david at david-laptop-20071014064841-liamaqiv3af71r3g
3806 david at david-laptop-20071014064900-j4yzxzuveukuyj2l
3807 david at david-laptop-20071014124401-n3a37y67u5imyo83
3808 david at david-laptop-20071014161201-hdljwkhh4ep0f9k2
3809 david at david-laptop-20071014164521-c6i415hcz6hfrxxp
3810 david at david-laptop-20071015032315-g9fsm9zqk6fanyjz
3811 david at ar.media.kyoto-u.ac.jp-20071015043352-a24r1whpwiwiso80
3812 david at ar.media.kyoto-u.ac.jp-20071015054624-f8ecd3xiq5t64bjx


Modified: branches/numpy.scons/numpy/core/scons_support.py
===================================================================
--- branches/numpy.scons/numpy/core/scons_support.py	2007-10-15 06:45:52 UTC (rev 4193)
+++ branches/numpy.scons/numpy/core/scons_support.py	2007-10-15 06:46:27 UTC (rev 4194)
@@ -1,5 +1,9 @@
-from code_generators.generate_array_api import types, h_template, c_template
-from code_generators.generate_ufunc_api import h_template, c_template
+from code_generators.generate_array_api import \
+        types, h_template as multiarray_h_template, \
+        c_template as multiarray_c_template
+from code_generators.generate_ufunc_api import \
+        h_template as ufunc_h_template, \
+        c_template as ufunc_c_template
 import code_generators.genapi as genapi
 
 import SCons.Errors
@@ -55,13 +59,13 @@
 
     # Write to header
     fid = open(h_file, 'w')
-    s = h_template % ('\n'.join(module_list), '\n'.join(extension_list))
+    s = multiarray_h_template % ('\n'.join(module_list), '\n'.join(extension_list))
     fid.write(s)
     fid.close()
 
     # Write to c-code
     fid = open(c_file, 'w')
-    s = c_template % '\n'.join(init_list)
+    s = multiarray_c_template % '\n'.join(init_list)
     fid.write(s)
     fid.close()
 
@@ -126,13 +130,13 @@
 
     # Write to header
     fid = open(h_file, 'w')
-    s = h_template % ('\n'.join(module_list), '\n'.join(extension_list))
+    s = ufunc_h_template % ('\n'.join(module_list), '\n'.join(extension_list))
     fid.write(s)
     fid.close()
 
     # Write to c-code
     fid = open(c_file, 'w')
-    s = c_template % '\n'.join(init_list)
+    s = ufunc_c_template % '\n'.join(init_list)
     fid.write(s)
     fid.close()

More information about the Numpy-svn mailing list