From: Stefan Behnel Date: Mon, 21 Jul 2008 18:23:14 +0000 (+0200) Subject: install Includes directory as Cython/Includes X-Git-Tag: 0.9.8.1~112 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4896ddf8e6d6c467d37231956a15d75162213705;p=cython.git install Includes directory as Cython/Includes --HG-- rename : Includes/__cython__.pxd => Cython/Includes/__cython__.pxd rename : Includes/numpy.pxd => Cython/Includes/numpy.pxd rename : Includes/python.pxd => Cython/Includes/python.pxd rename : Includes/python2.5.pxd => Cython/Includes/python2.5.pxd rename : Includes/python_bool.pxd => Cython/Includes/python_bool.pxd rename : Includes/python_complex.pxd => Cython/Includes/python_complex.pxd rename : Includes/python_dict.pxd => Cython/Includes/python_dict.pxd rename : Includes/python_exc.pxd => Cython/Includes/python_exc.pxd rename : Includes/python_float.pxd => Cython/Includes/python_float.pxd rename : Includes/python_function.pxd => Cython/Includes/python_function.pxd rename : Includes/python_instance.pxd => Cython/Includes/python_instance.pxd rename : Includes/python_int.pxd => Cython/Includes/python_int.pxd rename : Includes/python_iterator.pxd => Cython/Includes/python_iterator.pxd rename : Includes/python_list.pxd => Cython/Includes/python_list.pxd rename : Includes/python_long.pxd => Cython/Includes/python_long.pxd rename : Includes/python_mapping.pxd => Cython/Includes/python_mapping.pxd rename : Includes/python_mem.pxd => Cython/Includes/python_mem.pxd rename : Includes/python_method.pxd => Cython/Includes/python_method.pxd rename : Includes/python_module.pxd => Cython/Includes/python_module.pxd rename : Includes/python_number.pxd => Cython/Includes/python_number.pxd rename : Includes/python_object.pxd => Cython/Includes/python_object.pxd rename : Includes/python_parse.pxd => Cython/Includes/python_parse.pxd rename : Includes/python_ref.pxd => Cython/Includes/python_ref.pxd rename : Includes/python_sequence.pxd => Cython/Includes/python_sequence.pxd rename : Includes/python_set.pxd => Cython/Includes/python_set.pxd rename : Includes/python_string.pxd => Cython/Includes/python_string.pxd rename : Includes/python_tuple.pxd => Cython/Includes/python_tuple.pxd rename : Includes/python_type.pxd => Cython/Includes/python_type.pxd rename : Includes/stdio.pxd => Cython/Includes/stdio.pxd rename : Includes/stdlib.pxd => Cython/Includes/stdlib.pxd --- diff --git a/Includes/__cython__.pxd b/Cython/Includes/__cython__.pxd similarity index 100% rename from Includes/__cython__.pxd rename to Cython/Includes/__cython__.pxd diff --git a/Includes/numpy.pxd b/Cython/Includes/numpy.pxd similarity index 100% rename from Includes/numpy.pxd rename to Cython/Includes/numpy.pxd diff --git a/Includes/python.pxd b/Cython/Includes/python.pxd similarity index 100% rename from Includes/python.pxd rename to Cython/Includes/python.pxd diff --git a/Includes/python2.5.pxd b/Cython/Includes/python2.5.pxd similarity index 100% rename from Includes/python2.5.pxd rename to Cython/Includes/python2.5.pxd diff --git a/Includes/python_bool.pxd b/Cython/Includes/python_bool.pxd similarity index 100% rename from Includes/python_bool.pxd rename to Cython/Includes/python_bool.pxd diff --git a/Includes/python_complex.pxd b/Cython/Includes/python_complex.pxd similarity index 100% rename from Includes/python_complex.pxd rename to Cython/Includes/python_complex.pxd diff --git a/Includes/python_dict.pxd b/Cython/Includes/python_dict.pxd similarity index 100% rename from Includes/python_dict.pxd rename to Cython/Includes/python_dict.pxd diff --git a/Includes/python_exc.pxd b/Cython/Includes/python_exc.pxd similarity index 100% rename from Includes/python_exc.pxd rename to Cython/Includes/python_exc.pxd diff --git a/Includes/python_float.pxd b/Cython/Includes/python_float.pxd similarity index 100% rename from Includes/python_float.pxd rename to Cython/Includes/python_float.pxd diff --git a/Includes/python_function.pxd b/Cython/Includes/python_function.pxd similarity index 100% rename from Includes/python_function.pxd rename to Cython/Includes/python_function.pxd diff --git a/Includes/python_instance.pxd b/Cython/Includes/python_instance.pxd similarity index 100% rename from Includes/python_instance.pxd rename to Cython/Includes/python_instance.pxd diff --git a/Includes/python_int.pxd b/Cython/Includes/python_int.pxd similarity index 100% rename from Includes/python_int.pxd rename to Cython/Includes/python_int.pxd diff --git a/Includes/python_iterator.pxd b/Cython/Includes/python_iterator.pxd similarity index 100% rename from Includes/python_iterator.pxd rename to Cython/Includes/python_iterator.pxd diff --git a/Includes/python_list.pxd b/Cython/Includes/python_list.pxd similarity index 100% rename from Includes/python_list.pxd rename to Cython/Includes/python_list.pxd diff --git a/Includes/python_long.pxd b/Cython/Includes/python_long.pxd similarity index 100% rename from Includes/python_long.pxd rename to Cython/Includes/python_long.pxd diff --git a/Includes/python_mapping.pxd b/Cython/Includes/python_mapping.pxd similarity index 100% rename from Includes/python_mapping.pxd rename to Cython/Includes/python_mapping.pxd diff --git a/Includes/python_mem.pxd b/Cython/Includes/python_mem.pxd similarity index 100% rename from Includes/python_mem.pxd rename to Cython/Includes/python_mem.pxd diff --git a/Includes/python_method.pxd b/Cython/Includes/python_method.pxd similarity index 100% rename from Includes/python_method.pxd rename to Cython/Includes/python_method.pxd diff --git a/Includes/python_module.pxd b/Cython/Includes/python_module.pxd similarity index 100% rename from Includes/python_module.pxd rename to Cython/Includes/python_module.pxd diff --git a/Includes/python_number.pxd b/Cython/Includes/python_number.pxd similarity index 100% rename from Includes/python_number.pxd rename to Cython/Includes/python_number.pxd diff --git a/Includes/python_object.pxd b/Cython/Includes/python_object.pxd similarity index 100% rename from Includes/python_object.pxd rename to Cython/Includes/python_object.pxd diff --git a/Includes/python_parse.pxd b/Cython/Includes/python_parse.pxd similarity index 100% rename from Includes/python_parse.pxd rename to Cython/Includes/python_parse.pxd diff --git a/Includes/python_ref.pxd b/Cython/Includes/python_ref.pxd similarity index 100% rename from Includes/python_ref.pxd rename to Cython/Includes/python_ref.pxd diff --git a/Includes/python_sequence.pxd b/Cython/Includes/python_sequence.pxd similarity index 100% rename from Includes/python_sequence.pxd rename to Cython/Includes/python_sequence.pxd diff --git a/Includes/python_set.pxd b/Cython/Includes/python_set.pxd similarity index 100% rename from Includes/python_set.pxd rename to Cython/Includes/python_set.pxd diff --git a/Includes/python_string.pxd b/Cython/Includes/python_string.pxd similarity index 100% rename from Includes/python_string.pxd rename to Cython/Includes/python_string.pxd diff --git a/Includes/python_tuple.pxd b/Cython/Includes/python_tuple.pxd similarity index 100% rename from Includes/python_tuple.pxd rename to Cython/Includes/python_tuple.pxd diff --git a/Includes/python_type.pxd b/Cython/Includes/python_type.pxd similarity index 100% rename from Includes/python_type.pxd rename to Cython/Includes/python_type.pxd diff --git a/Includes/stdio.pxd b/Cython/Includes/stdio.pxd similarity index 100% rename from Includes/stdio.pxd rename to Cython/Includes/stdio.pxd diff --git a/Includes/stdlib.pxd b/Cython/Includes/stdlib.pxd similarity index 100% rename from Includes/stdlib.pxd rename to Cython/Includes/stdlib.pxd diff --git a/setup.py b/setup.py index 5feab3d1..481079f0 100644 --- a/setup.py +++ b/setup.py @@ -11,11 +11,14 @@ if sys.platform == "win32": setup_args = {} if sys.version_info < (2,4): - compiler_dir = os.path.join(get_python_lib(prefix=''), 'Cython/Compiler') + cython_dir = os.path.join(get_python_lib(prefix=''), 'Cython') + compiler_dir = os.path.join(cython_dir, 'Compiler') setup_args['data_files'] = [ - {compiler_dir : ['Cython/Compiler/Lexicon.pickle']}] + {compiler_dir : ['Cython/Compiler/Lexicon.pickle'], + cython_dir : ['Cython/Includes/*.pxd']}] else: - setup_args['package_data'] = {'Cython.Compiler' : ['Lexicon.pickle']} + setup_args['package_data'] = {'Cython.Compiler' : ['Lexicon.pickle'], + 'Cython' : ['Includes/*.pxd']} if os.name == "posix": scripts = ["bin/cython"]