Skip to content

Commit 264b39f

Browse files
committed
Disable CFFI Common Lisp target language
Clean up to disable target languages that have been neglected/not functional. Target language be fully deleted in SWIG 4.1 unless a new maintainer brings it up to an acceptable status (experimental or supported). Issue swig#1447
1 parent 6d7e3df commit 264b39f

File tree

11 files changed

+8
-27
lines changed

11 files changed

+8
-27
lines changed

ANNOUNCE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SWIG is a software development tool that reads C/C++ header files and
1111
generates the wrapper code needed to make C and C++ code accessible
1212
from other programming languages including Perl, Python, Tcl, Ruby,
1313
PHP, C#, Go, Java, Javascript, Lua, Scheme (Guile, MzScheme),
14-
D, Ocaml, Octave, R, Scilab, Common Lisp (CFFI).
14+
D, Ocaml, Octave, R, Scilab.
1515
SWIG can also export its parse tree in
1616
the form of XML. Major applications of SWIG
1717
include generation of scripting language extension modules, rapid

CHANGES.current

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
77
Version 4.0.0 (in progress)
88
===========================
99

10+
2019-02-04: wsfulton
11+
[CFFI] #1447 Common Lisp CFFI has been disabled as a target language in SWIG as part of a
12+
clean up to remove target languages that have been neglected/not functional.
13+
1014
2019-02-04: wsfulton
1115
[Allegrocl] #1447 Allegro Common Lisp has been disabled as a target language in SWIG as part of a
1216
clean up to remove target languages that have been neglected/not functional.

Doc/Manual/Preprocessor.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ <H2><a name="Preprocessor_condition_compilation">9.3 Conditional Compilation</a>
109109
SWIG_VERSION Hexadecimal (binary-coded decimal) number containing SWIG version,
110110
such as 0x010311 (corresponding to SWIG-1.3.11).
111111

112-
SWIGCFFI Defined when using CFFI
113112
SWIGCSHARP Defined when using C#
114113
SWIGGUILE Defined when using Guile
115114
SWIGJAVA Defined when using Java

Doc/Manual/SWIG.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ <H2><a name="SWIG_nn2">5.1 Running SWIG</a></H2>
118118

119119
<div class="shell"><pre>
120120
Supported Target Language Options
121-
-cffi - Generate CFFI wrappers
122121
-csharp - Generate C# wrappers
123122
-d - Generate D wrappers
124123
-go - Generate Go wrappers

Doc/Manual/Sections.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ <H3><a name="Sections_language_modules">Supported Language Modules Documentation
4646
<li><a href="Guile.html#Guile">Guile support</a></li>
4747
<li><a href="Java.html#Java">Java support</a></li>
4848
<li><a href="Javascript.html#Javascript">Javascript support</a></li>
49-
<li><a href="Lisp.html#Lisp">Common Lisp support</a></li>
5049
<li><a href="Lua.html#Lua">Lua support</a></li>
5150
<li><a href="Mzscheme.html#Mzscheme">MzScheme/Racket support</a></li>
5251
<li><a href="Ocaml.html#Ocaml">Ocaml support</a></li>

Doc/Manual/chapters

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Go.html
2424
Guile.html
2525
Java.html
2626
Javascript.html
27-
Lisp.html
2827
Lua.html
2928
Mzscheme.html
3029
Ocaml.html

Makefile.in

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ skip-ocaml = test -n "@SKIP_OCAML@"
7171
skip-octave = test -n "@SKIP_OCTAVE@"
7272
skip-csharp = test -n "@SKIP_CSHARP@"
7373
skip-lua = test -n "@SKIP_LUA@"
74-
skip-cffi = test -n "@SKIP_CFFI@"
7574
skip-r = test -n "@SKIP_R@"
7675
skip-scilab = test -n "@SKIP_SCILAB@"
7776
skip-go = test -n "@SKIP_GO@"
@@ -112,7 +111,6 @@ check-aliveness:
112111
@$(skip-octave) || ./$(TARGET) -octave -help
113112
@$(skip-php) || ./$(TARGET) -php7 -help
114113
@$(skip-csharp) || ./$(TARGET) -csharp -help
115-
@$(skip-cffi) || ./$(TARGET) -cffi -help
116114
@$(skip-lua) || ./$(TARGET) -lua -help
117115
@$(skip-r) || ./$(TARGET) -r -help
118116
@$(skip-scilab) || ./$(TARGET) -scilab -help
@@ -139,7 +137,6 @@ check-versions: \
139137
check-php-version \
140138
check-csharp-version \
141139
check-lua-version \
142-
check-cffi-version \
143140
check-r-version \
144141
check-scilab-version \
145142
check-go-version \
@@ -173,7 +170,6 @@ check-examples: \
173170
check-php-examples \
174171
check-csharp-examples \
175172
check-lua-examples \
176-
check-cffi-examples \
177173
check-r-examples \
178174
check-scilab-examples \
179175
check-go-examples \
@@ -193,7 +189,6 @@ octave_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/octave/check.list)
193189
php_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/php/check.list)
194190
csharp_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/csharp/check.list)
195191
lua_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/lua/check.list)
196-
cffi_examples :=
197192
r_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/r/check.list)
198193
scilab_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/scilab/check.list)
199194
go_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/go/check.list)
@@ -235,7 +230,6 @@ check-test-suite: \
235230
check-php-test-suite \
236231
check-csharp-test-suite \
237232
check-lua-test-suite \
238-
check-cffi-test-suite \
239233
check-r-test-suite \
240234
check-scilab-test-suite \
241235
check-go-test-suite \
@@ -283,7 +277,6 @@ all-test-suite: \
283277
all-php-test-suite \
284278
all-csharp-test-suite \
285279
all-lua-test-suite \
286-
all-cffi-test-suite \
287280
all-r-test-suite \
288281
all-scilab-test-suite \
289282
all-go-test-suite \
@@ -307,7 +300,6 @@ broken-test-suite: \
307300
broken-php-test-suite \
308301
broken-csharp-test-suite \
309302
broken-lua-test-suite \
310-
broken-cffi-test-suite \
311303
broken-r-test-suite \
312304
broken-scilab-test-suite \
313305
broken-go-test-suite \
@@ -444,7 +436,7 @@ install-main:
444436
@$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@
445437

446438
lib-languages = typemaps tcl perl5 python guile java mzscheme ruby php ocaml octave \
447-
csharp lua cffi r go d javascript javascript/jsc \
439+
csharp lua r go d javascript javascript/jsc \
448440
javascript/v8 scilab xml
449441

450442
lib-modules = std

README

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Version: 4.0.0 (in progress)
44

55
Tagline: SWIG is a compiler that integrates C and C++ with languages
66
including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
7-
Octave, R, Scheme (Guile, MzScheme/Racket), Scilab,
8-
Ocaml, Common Lisp (CFFI).
7+
Octave, R, Scheme (Guile, MzScheme/Racket), Scilab, Ocaml.
98
SWIG can also export its parse tree into XML.
109

1110
SWIG reads annotated C/C++ header files and creates wrapper code (glue

Source/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ eswig_SOURCES = CParse/cscanner.c \
4747
Doxygen/pydoc.h \
4848
Modules/allocate.cxx \
4949
Modules/browser.cxx \
50-
Modules/cffi.cxx \
5150
Modules/contract.cxx \
5251
Modules/csharp.cxx \
5352
Modules/d.cxx \

Source/Modules/swigmain.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
can be dynamically loaded in future versions. */
2727

2828
extern "C" {
29-
Language *swig_cffi(void);
3029
Language *swig_csharp(void);
3130
Language *swig_d(void);
3231
Language *swig_go(void);
@@ -57,7 +56,7 @@ static TargetLanguageModule modules[] = {
5756
{"-allegrocl", NULL, "ALLEGROCL", Disabled},
5857
{"-chicken", NULL, "CHICKEN", Disabled},
5958
{"-clisp", NULL, "CLISP", Disabled},
60-
{"-cffi", swig_cffi, "CFFI", Supported},
59+
{"-cffi", NULL, "CFFI", Disabled},
6160
{"-csharp", swig_csharp, "C#", Supported},
6261
{"-d", swig_d, "D", Supported},
6362
{"-go", swig_go, "Go", Supported},

configure.ac

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,12 +2673,6 @@ if test -z "$RBIN" ; then
26732673
fi
26742674
AC_SUBST(SKIP_R)
26752675

2676-
SKIP_CFFI=
2677-
#if test -z "$CFFIBIN" ; then
2678-
SKIP_CFFI="1"
2679-
#fi
2680-
AC_SUBST(SKIP_CFFI)
2681-
26822676
SKIP_SCILAB=
26832677
if test -z "$SCILAB"; then
26842678
SKIP_SCILAB="1"
@@ -2801,7 +2795,6 @@ AC_CONFIG_FILES([
28012795
Examples/test-suite/scilab/Makefile
28022796
Examples/test-suite/tcl/Makefile
28032797
Examples/test-suite/lua/Makefile
2804-
Examples/test-suite/cffi/Makefile
28052798
Examples/test-suite/r/Makefile
28062799
Examples/test-suite/go/Makefile
28072800
Source/Makefile
@@ -2849,7 +2842,6 @@ EOF
28492842
AC_OUTPUT
28502843

28512844
langs=""
2852-
test -n "$SKIP_CFFI" || langs="${langs}cffi "
28532845
test -n "$SKIP_CSHARP" || langs="${langs}csharp "
28542846
test -n "$SKIP_D" || langs="${langs}d "
28552847
test -n "$SKIP_GO" || langs="${langs}go "

0 commit comments

Comments
 (0)