jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert rev 11187 "Merged with recent changes from trunk."

Browse source 
This reverts commit c595e4d90ebfd63eb55430c735bb121cf690bd59.

Conflicts:

	Source/Modules/c.cxx

From: William S Fulton <wsf@fultondesigns.co.uk>

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13033 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-05-06 01:13:16 +00:00
commit d6b81eb831
703 changed files with 9266 additions and 21128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/GIFPlot/Java/full/README
View file

@ -1,8 +1,8 @@
This example runs the entire gifplot.h header file through SWIG without
any changes. The program 'runme.java' does something a little more
interesting. After doing a make, run it using 'java runme'. You'll have to go
any changes. The program 'main.java' does something a little more
interesting. After doing a make, run it using 'java main'. You'll have to go
look at the header file to get a complete listing of the functions.
Note the differences in the runme.java files between this example and the
Note the differences in the main.java files between this example and the
'full' example. This example does not use shadow classes.

2
Examples/GIFPlot/Java/full/runme.java → Examples/GIFPlot/Java/full/main.java
View file

@ -1,7 +1,7 @@
// Plot a 3D function
import java.lang.Math;
public class runme {
public class main {
static {
try {

5
Examples/GIFPlot/Java/shadow/Makefile
View file

@ -1,9 +1,8 @@
TOP = ../../..
SWIG = $(TOP)/../swig
SWIGOPT = -outcurrentdir
SWIGOPT = -I../../Interface
SRCS =
TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include
@ -11,7 +10,7 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
javac *.java
clean::

4
Examples/GIFPlot/Java/shadow/README
View file

@ -1,5 +1,5 @@
This example uses the file in ../../Interface/gifplot.i to build
an interface with shadow classes. After doing a make, run the program runme, ie: 'java runme'.
an interface with shadow classes. After doing a make, run the program main, ie: 'java main'.
Note the differences in the runme.java files between this example and the
Note the differences in the main.java files between this example and the
'full' example. This example uses the shadow classes.

2
Examples/GIFPlot/Java/shadow/runme.java → Examples/GIFPlot/Java/shadow/main.java
View file

@ -2,7 +2,7 @@
import java.lang.Math;
public class runme {
public class main {
static {
try {

2
Examples/GIFPlot/Java/simple/README
View file

@ -1,5 +1,5 @@
This is a very minimalistic example in which just a few functions
and constants from library are wrapped and used to draw some simple
shapes. After doing a make, run the java program, ie 'java runme'.
shapes. After doing a make, run the java program, ie 'java main'.

2
Examples/GIFPlot/Java/simple/runme.java → Examples/GIFPlot/Java/simple/main.java
View file

@ -1,5 +1,5 @@
public class runme {
public class main {
static {
try {

5
Examples/GIFPlot/Lib/color.c
View file

@ -132,10 +132,7 @@ int ColorMap_write(ColorMap *cm, char *filename) {
f = fopen(filename,"w");
if (fwrite(cm->cmap,768,1,f) != 1) {
fclose(f);
return -1;
}
fwrite(cm->cmap,768,1,f);
fclose(f);
return 0;
}

8
Examples/GIFPlot/Lib/gif.c
View file

@ -268,7 +268,7 @@ static int maxmaxcode = 1 << GP_BITS; /* NEVER generate this */
static count_int *htab;
static unsigned short *codetab;
static int GIFOutBufSize;
static GIFOutBufSize;
/* static count_int htab [HSIZE];
static unsigned short codetab [HSIZE]; */
@ -656,11 +656,7 @@ int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename) {
fclose(file);
return -1;
}
if (fwrite(buffer,nbytes,1,file) != 1) {
free(buffer);
fclose(file);
return -1;
}
fwrite(buffer,nbytes,1,file);
fclose(file);
free(buffer);
return 0;

7
Examples/GIFPlot/Perl5/shadow/Makefile
View file

@ -1,9 +1,8 @@
TOP = ../../..
SWIG = $(TOP)/../swig
SWIGOPT = -outcurrentdir
SWIGOPT = -I../../Interface
SRCS =
TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot -lm
INCLUDES = -I../../Include
@ -11,12 +10,12 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static
TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static
clean::
$(MAKE) -f $(TOP)/Makefile perl5_clean

0
Examples/GIFPlot/Php/check.list → Examples/GIFPlot/Php4/check.list
View file

4
Examples/GIFPlot/Php/full/Makefile → Examples/GIFPlot/Php4/full/Makefile
View file

@ -10,10 +10,10 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4
clean::
$(MAKE) -f $(TOP)/Makefile php_clean
$(MAKE) -f $(TOP)/Makefile php4_clean
rm -f *.gif
rm -f php_gifplot.h

0
Examples/GIFPlot/Php/full/README → Examples/GIFPlot/Php4/full/README
View file

0
Examples/GIFPlot/Php/full/cmap → Examples/GIFPlot/Php4/full/cmap
View file

0
Examples/GIFPlot/Php/full/gifplot.i → Examples/GIFPlot/Php4/full/gifplot.i
View file

0
Examples/GIFPlot/Php/full/runme.php → Examples/GIFPlot/Php4/full/runme.php4
View file

4
Examples/GIFPlot/Php/shadow/Makefile → Examples/GIFPlot/Php4/shadow/Makefile
View file

@ -10,10 +10,10 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4
clean::
$(MAKE) -f $(TOP)/Makefile php_clean
$(MAKE) -f $(TOP)/Makefile php4_clean
rm -f *.gif
check: all

0
Examples/GIFPlot/Php/shadow/README → Examples/GIFPlot/Php4/shadow/README
View file

0
Examples/GIFPlot/Php/shadow/cmap → Examples/GIFPlot/Php4/shadow/cmap
View file

0
Examples/GIFPlot/Php/shadow/runme.php → Examples/GIFPlot/Php4/shadow/runme.php4
View file

4
Examples/GIFPlot/Php/simple/Makefile → Examples/GIFPlot/Php4/simple/Makefile
View file

@ -10,10 +10,10 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4
clean::
$(MAKE) -f $(TOP)/Makefile php_clean
$(MAKE) -f $(TOP)/Makefile php4_clean
rm -f *.gif
rm -f php_simple.h

0
Examples/GIFPlot/Php/simple/README → Examples/GIFPlot/Php4/simple/README
View file

0
Examples/GIFPlot/Php/simple/runme.php → Examples/GIFPlot/Php4/simple/runme.php4
View file

0
Examples/GIFPlot/Php/simple/simple.i → Examples/GIFPlot/Php4/simple/simple.i
View file

3
Examples/GIFPlot/Python/full/Makefile
View file

@ -1,5 +1,5 @@
TOP = ../../..
SWIG = $(TOP)/../preinst-swig
SWIG = $(TOP)/../swig
SWIGOPT = -I../../Include
SRCS =
TARGET = gifplot
@ -23,4 +23,3 @@ clean::
rm -f *.gif
check: all
$(MAKE) -f $(TOP)/Makefile python_run

10
Examples/GIFPlot/Python/shadow/Makefile
View file

@ -1,9 +1,8 @@
TOP = ../../..
SWIG = $(TOP)/../preinst-swig
SWIGOPT = -outcurrentdir
SWIG = $(TOP)/../swig
SWIGOPT = -I../../Interface
SRCS =
TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include
@ -11,12 +10,12 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static
TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
clean::
$(MAKE) -f $(TOP)/Makefile python_clean
@ -24,4 +23,3 @@ clean::
rm -f *.gif
check: all
$(MAKE) -f $(TOP)/Makefile python_run

3
Examples/GIFPlot/Python/simple/Makefile
View file

@ -1,5 +1,5 @@
TOP = ../../..
SWIG = $(TOP)/../preinst-swig
SWIG = $(TOP)/../swig
SWIGOPT =
SRCS =
TARGET = simple
@ -23,4 +23,3 @@ clean::
rm -f *.gif
check: all
$(MAKE) -f $(TOP)/Makefile python_run

7
Examples/GIFPlot/Ruby/shadow/Makefile
View file

@ -1,9 +1,8 @@
TOP = ../../..
SWIG = $(TOP)/../swig
SWIGOPT = -outcurrentdir
SWIGOPT = -I../../Interface
SRCS =
TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include
@ -11,12 +10,12 @@ INCLUDES = -I../../Include
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static
TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static
clean::
$(MAKE) -f $(TOP)/Makefile ruby_clean