Skip to content
Snippets Groups Projects
Commit 907b6f38 authored by Izzard, Robert Dr (Maths & Physics)'s avatar Izzard, Robert Dr (Maths & Physics)
Browse files

use new API function to output JSON

clean up loading of .h files

fix setup.py to not define macros that break .h file loading
parent d95a587d
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ output/* ...@@ -16,6 +16,7 @@ output/*
*.nfs* *.nfs*
*.swp *.swp
.python-version .python-version
\#*
__pycache__/ __pycache__/
.ipynb_checkpoints/ .ipynb_checkpoints/
...@@ -5,17 +5,16 @@ ...@@ -5,17 +5,16 @@
/* /*
* Include binary_C's API * Include binary_C's API
*/ */
#include "binary_c_API.h"
#include "binary_c.h" #include "binary_c.h"
#include "binary_c_API_prototypes.h" //#include "binary_c_API.h"
//#include "binary_c_API_prototypes.h"
/* Binary_c's python API prototypes */ /* Binary_c's python API prototypes */
int run_system(char * argstring, int run_system(char * argstring,
long int custom_logging_func_memaddr, long int custom_logging_func_memaddr,
long int store_memaddr, long int store_memaddr,
long int persistent_data_memaddr, long int persistent_data_memaddr,
int write_logfile, int write_logfile,
int population, int population,
char ** const buffer, char ** const buffer,
char ** const error_buffer, char ** const error_buffer,
...@@ -26,7 +25,7 @@ int run_system(char * argstring, ...@@ -26,7 +25,7 @@ int run_system(char * argstring,
/* =================================================================== */ /* =================================================================== */
int return_arglines(char ** const outstring, int return_arglines(char ** const outstring,
char ** const errorstring, char ** const errorstring,
size_t * const nbytes); size_t * const nbytes);
int return_help_info(char * argstring, int return_help_info(char * argstring,
......
...@@ -26,8 +26,8 @@ def license(): ...@@ -26,8 +26,8 @@ def license():
def check_version(installed_binary_c_version, required_binary_c_versions): def check_version(installed_binary_c_version, required_binary_c_versions):
"""Function to check the installed version and compare it to the required version""" """Function to check the installed version and compare it to the required version"""
message = """ message = """
The binary_c version that is installed ({}) does not match the binary_c versions ({}) The binary_c version that is installed ({}) does not match the binary_c versions ({})
that this release of the binary_c python module requires. that this release of the binary_c python module requires.
""".format( """.format(
installed_binary_c_version, required_binary_c_versions installed_binary_c_version, required_binary_c_versions
) )
...@@ -115,7 +115,6 @@ for x in DEFINES: ...@@ -115,7 +115,6 @@ for x in DEFINES:
# add API header file # add API header file
API_h = os.path.join(BINARY_C_DIR, "src", "API", "binary_c_API.h") API_h = os.path.join(BINARY_C_DIR, "src", "API", "binary_c_API.h")
BINARY_C_DEFINE_MACROS.extend([("BINARY_C_API_H", API_h)])
############################################################ ############################################################
# Setting all directories and LIBRARIES to their final values # Setting all directories and LIBRARIES to their final values
...@@ -188,9 +187,9 @@ setup( ...@@ -188,9 +187,9 @@ setup(
version="0.2", version="0.2",
description=""" description="""
This is a python API for binary_c (versions {}) by David Hendriks, Rob Izzard and collaborators. This is a python API for binary_c (versions {}) by David Hendriks, Rob Izzard and collaborators.
Based on the initial set up by Jeff andrews. Based on the initial set up by Jeff andrews.
It is tested and designed to work for versions {}, we can't guarantee proper functioning for other versions It is tested and designed to work for versions {}, we can't guarantee proper functioning for other versions
If you want to use a different version of binary_c, download and install a different version of this package If you want to use a different version of binary_c, download and install a different version of this package
""".format( """.format(
str(REQUIRED_BINARY_C_VERSIONS), str(REQUIRED_BINARY_C_VERSIONS) str(REQUIRED_BINARY_C_VERSIONS), str(REQUIRED_BINARY_C_VERSIONS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment