Change the other two demos to the ffi.set_source() style too

4 files changed, 34 insertions, 4 deletions

diff --git a/demo/_curses_build.py b/demo/_curses_build.py
index 9dad6ab..a7bd6b8 100644
--- a/demo/_curses_build.py
+++ b/demo/_curses_build.py
@@ -4,7 +4,6 @@ if sys.platform == 'win32':
     raise ImportError('No module named _curses')
 
 from cffi import FFI
-from _cffi1 import recompile
 
 ffi = FFI()
 
@@ -283,7 +282,7 @@ void _m_getsyx(int *yx);
 """)
 
 
-recompile(ffi, "_curses_cffi", """
+ffi.set_source("_curses_cffi", """
 #ifdef __APPLE__
 /* the following define is necessary for OS X 10.6+; without it, the
    Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
@@ -323,3 +322,6 @@ void _m_getsyx(int *yx) {
     getsyx(yx[0], yx[1]);
 }
 """, libraries=['ncurses', 'panel'])
+
+if __name__ == '__main__':
+    ffi.compile()
diff --git a/demo/_curses_setup.py b/demo/_curses_setup.py
new file mode 100644
index 0000000..81ae35d
--- /dev/null
+++ b/demo/_curses_setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+setup(
+    name="_curses",
+    version="0.1",
+    py_modules=["_curses"],
+    setup_requires=["cffi>=1.0"],
+    cffi_modules=[
+        "_curses_build:ffi",
+    ],
+    install_requires=["cffi>=1.0"],   # should maybe be "cffi-backend" only?
+    zip_safe=False,
+)
diff --git a/demo/readdir2_build.py b/demo/readdir2_build.py
index 368b2af..50d17b4 100644
--- a/demo/readdir2_build.py
+++ b/demo/readdir2_build.py
@@ -1,5 +1,4 @@
 from cffi import FFI
-from _cffi1 import recompile
 
 ffi = FFI()
 ffi.cdef("""
@@ -21,7 +20,7 @@ ffi.cdef("""
     static const int DT_DIR;
 
 """)
-recompile(ffi, "_readdir2", """
+ffi.set_source("_readdir2", """
 #ifndef _ATFILE_SOURCE
 #  define _ATFILE_SOURCE
 #endif
@@ -32,3 +31,6 @@ recompile(ffi, "_readdir2", """
 #include <sys/types.h>
 #include <dirent.h>
 """)
+
+if __name__ == '__main__':
+    ffi.compile()
diff --git a/demo/readdir2_setup.py b/demo/readdir2_setup.py
new file mode 100644
index 0000000..b27380b
--- /dev/null
+++ b/demo/readdir2_setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+setup(
+    name="readdir2",
+    version="0.1",
+    py_modules=["readdir2"],
+    setup_requires=["cffi>=1.0"],
+    cffi_modules=[
+        "readdir2_build:ffi",
+    ],
+    install_requires=["cffi>=1.0"],   # should maybe be "cffi-backend" only?
+    zip_safe=False,
+)