Mercurial > hg > Members > aka > jupyter_CbC_kernel
changeset 73:b6b613c2a28a
alter package structure, moving resources under parent module.
| author | Cody Horst <chorst@uw.edu> |
|---|---|
| date | Tue, 23 Jan 2018 22:34:24 -0800 |
| parents | 40c903dde893 |
| children | 8206b62b7016 |
| files | MANIFEST.in jupyter_c_kernel/resources/master.c resources/master.c setup.py |
| diffstat | 4 files changed, 34 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MANIFEST.in Tue Jan 23 22:34:24 2018 -0800 @@ -0,0 +1,1 @@ +include jupyter_c_kernel/resources/master.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jupyter_c_kernel/resources/master.c Tue Jan 23 22:34:24 2018 -0800 @@ -0,0 +1,31 @@ +#include <stdlib.h> +#include <stdio.h> +#include <dlfcn.h> + +typedef int (*main_t)(int, char **, char **); + +int main(int argc, char **argv, char **envp) +{ + char *error = NULL; + + setbuf(stdout, NULL); + setbuf(stderr, NULL); + if (argc < 2) { + fprintf(stderr, "USAGE: %s PROGRAM\nWhere PROGRAM is the user's program to supervise\n", argv[0]); + return EXIT_FAILURE; + } + void *userhandle = dlopen(argv[1], RTLD_LAZY); + if (userhandle == NULL) { + fprintf(stderr, "%s: %s\n", argv[0], dlerror()); + return EXIT_FAILURE; + } + dlerror(); + main_t usermain = dlsym(userhandle, "main"); + if ((error = dlerror()) != NULL) { + fprintf(stderr, "%s: %s\n", argv[0], error); + return EXIT_FAILURE; + } + + /* Call Users main, but make master.c invisible by removing first argument */ + return usermain(argc-1, argv+1, envp); +}
--- a/resources/master.c Fri Dec 08 20:17:56 2017 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> -#include <dlfcn.h> - -typedef int (*main_t)(int, char **, char **); - -int main(int argc, char **argv, char **envp) -{ - char *error = NULL; - - setbuf(stdout, NULL); - setbuf(stderr, NULL); - if (argc < 2) { - fprintf(stderr, "USAGE: %s PROGRAM\nWhere PROGRAM is the user's program to supervise\n", argv[0]); - return EXIT_FAILURE; - } - void *userhandle = dlopen(argv[1], RTLD_LAZY); - if (userhandle == NULL) { - fprintf(stderr, "%s: %s\n", argv[0], dlerror()); - return EXIT_FAILURE; - } - dlerror(); - main_t usermain = dlsym(userhandle, "main"); - if ((error = dlerror()) != NULL) { - fprintf(stderr, "%s: %s\n", argv[0], error); - return EXIT_FAILURE; - } - - /* Call Users main, but make master.c invisible by removing first argument */ - return usermain(argc-1, argv+1, envp); -}
--- a/setup.py Fri Dec 08 20:17:56 2017 -0800 +++ b/setup.py Tue Jan 23 22:34:24 2018 -0800 @@ -8,7 +8,7 @@ url='https://github.com/brendanrius/jupyter-c-kernel/', download_url='https://github.com/brendanrius/jupyter-c-kernel/tarball/1.2.1', packages=['jupyter_c_kernel'], - package_data={'jupyter_c_kernel': ['resources/']}, scripts=['jupyter_c_kernel/install_c_kernel'], - keywords=['jupyter', 'notebook', 'kernel', 'c'] + keywords=['jupyter', 'notebook', 'kernel', 'c'], + include_package_data=True )