Move the code-generation files to a "tools" subdirectory.

TEOS-10 · Apr 1, 2017 · a751cb9 · a751cb9
1 parent 3f94e07
commit a751cb9
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 120 deletions.
diff --git a/_utilities.py b/_utilities.py
diff --git a/src/_ufuncs.c b/src/_ufuncs.c
diff --git a/c_header_parser.py → tools/c_header_parser.py b/c_header_parser.py → tools/c_header_parser.py
@@ -3,12 +3,15 @@
 """
 
 import re
+import os
+
+basedir = os.path.join(os.path.dirname(__file__), '../')
 
 def get_signatures(strip_extern=True):
     """
     Return a list of C function declarations.
     """
-    fname = "src/c_gsw/gswteos-10.h"
+    fname = os.path.join(basedir, "src/c_gsw/gswteos-10.h")
 
     with open(fname) as f:
         for line in f:

diff --git a/docstring_parts.py → tools/docstring_parts.py b/docstring_parts.py → tools/docstring_parts.py
diff --git a/docstring_utils.py → tools/docstring_utils.py b/docstring_utils.py → tools/docstring_utils.py
diff --git a/make_ufuncs.py → tools/make_ufuncs.py b/make_ufuncs.py → tools/make_ufuncs.py
@@ -3,13 +3,16 @@
 into numpy ufuncs.  Also writes ufuncs.list as a record of the
 ufunc names.
 """
+import os
 
 from c_header_parser import (get_simple_sig_dict,
                             get_complex_scalar_dict_by_nargs_nreturns)
 
 blacklist = ['add_barrier']
 
-modfile_name = 'src/_ufuncs.c'
+basedir = os.path.join(os.path.dirname(__file__), '../')
+
+modfile_name = os.path.join(basedir, 'src/_ufuncs.c')
 
 modfile_head_top = """
 /*
@@ -27,7 +30,7 @@
 
 /* possible hack for MSVC: */
 #ifndef NAN
-#   static double NAN = 0.0/0.0;
+    static double NAN = 0.0/0.0;
 #endif
 
 #ifndef isnan

diff --git a/make_wrapped_ufuncs.py → tools/make_wrapped_ufuncs.py b/make_wrapped_ufuncs.py → tools/make_wrapped_ufuncs.py
@@ -3,6 +3,7 @@
 of make_ufuncs.py.
 """
 
+import os
 import re
 
 from _utilities import Bunch
@@ -14,9 +15,12 @@
                              fix_outputs_doc,
                              docstring_from_sections)
 
-wrapmod = 'gsw/_wrapped_ufuncs.py'
+basedir = os.path.join(os.path.dirname(__file__), '../')
 
-# Functions that are Matlab subroutines; we don't need to expose them.
+wrapmod = os.path.join(basedir, 'gsw/_wrapped_ufuncs.py')
+
+# Functions that are Matlab subroutines, or exclusive to
+# the C and not needed; we don't need to expose them.
 blacklist = {'ct_freezing_exact',
 'pt0_cold_ice_poly',
 'pt_from_pot_enthalpy_ice_poly_dh',

diff --git a/matlab_parser.py → tools/matlab_parser.py b/matlab_parser.py → tools/matlab_parser.py
@@ -1,8 +1,14 @@
+"""
+It may be necessary to edit the location of the GSW-Matlab directory.
+"""
+
 import os
 import glob
 import re
 
-gsw_matlab_dir = '../GSW-Matlab/Toolbox'
+basedir = os.path.join(os.path.dirname(__file__), '../')
+
+gsw_matlab_dir = os.path.join(basedir, '../GSW-Matlab/Toolbox')
 gsw_matlab_subdirs = ['library', 'thermodynamics_from_t']
 
 # pattern for functions returning one variable