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

modify build system to use php instead of php4

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10967 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-12-06 21:40:54 +00:00
commit bcc796f676
71 changed files with 163 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Examples/Makefile.in
View file

@ -746,41 +746,41 @@ ruby_clean:
##################################################################
# -------------------------------------------------------------------
# Build a PHP4 dynamically loadable module (C)
# Build a PHP dynamically loadable module (C)
# -------------------------------------------------------------------
PHP4_INCLUDE = @PHP4INC@
PHP4_SO = @PHP4_SO@
PHP_INCLUDE = @PHPINC@
PHP_SO = @PHP_SO@
php4: $(SRCS)
php: $(SRCS)
$(SWIG) -php5 $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
# --------------------------------------------------------------------
# Build a PHP4 dynamically loadable module (C++)
# Build a PHP dynamically loadable module (C++)
# --------------------------------------------------------------------
php4_cpp: $(SRCS)
php_cpp: $(SRCS)
$(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
# -----------------------------------------------------------------
# Running a PHP4 example
# Running a PHP example
# -----------------------------------------------------------------
PHP4=@PHP4@
PHP4SCRIPT ?= runme.php4
PHP=@PHP@
PHPSCRIPT ?= runme.php
php4_run:
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(PHP4SCRIPT)
php_run:
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. $(PHPSCRIPT)
# -----------------------------------------------------------------
# Cleaning the PHP4 examples
# Cleaning the PHP examples
# -----------------------------------------------------------------
php4_clean:
php_clean:
rm -f *_wrap* *~ .~* example.php php_example.h
rm -f core @EXTRA_CLEAN@
rm -f *.@OBJEXT@ *@SO@

10
Examples/php/class/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT = -noproxy
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/class/runme.php4 → Examples/php/class/runme.php
View file

10
Examples/php/constants/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/constants/runme.php4 → Examples/php/constants/runme.php
View file

10
Examples/php/cpointer/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/cpointer/runme.php4 → Examples/php/cpointer/runme.php
View file

10
Examples/php/disown/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/disown/runme.php4 → Examples/php/disown/runme.php
View file

10
Examples/php/enum/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT = -noproxy
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/enum/runme.php4 → Examples/php/enum/runme.php
View file

10
Examples/php/funcptr/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/funcptr/runme.php4 → Examples/php/funcptr/runme.php
View file

10
Examples/php/overloading/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/overloading/runme.php4 → Examples/php/overloading/runme.php
View file

10
Examples/php/pointer/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/pointer/runme.php4 → Examples/php/pointer/runme.php
View file

10
Examples/php/pragmas/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/pragmas/runme.php4 → Examples/php/pragmas/runme.php
View file

10
Examples/php/proxy/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/proxy/runme.php4 → Examples/php/proxy/runme.php
View file

10
Examples/php/reference/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT = -noproxy
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/reference/runme.php4 → Examples/php/reference/runme.php
View file

10
Examples/php/simple/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/simple/runme.php4 → Examples/php/simple/runme.php
View file

10
Examples/php/sync/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4_cpp
php_cpp
static::
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_cpp_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_cpp_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/sync/runme.php4 → Examples/php/sync/runme.php
View file

10
Examples/php/value/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT = -noproxy
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/value/runme.php4 → Examples/php/value/runme.php
View file

10
Examples/php/variables/Makefile
View file

@ -9,16 +9,16 @@ SWIGOPT =
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
php4
php
static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
php4_static
SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
php_static
clean::
$(MAKE) -f $(TOP)/Makefile php4_clean
$(MAKE) -f $(TOP)/Makefile php_clean
rm -f $(TARGET).php
check: all
$(MAKE) -f $(TOP)/Makefile php4_run
$(MAKE) -f $(TOP)/Makefile php_run

0
Examples/php/variables/runme.php4 → Examples/php/variables/runme.php
View file

22
Examples/test-suite/php/Makefile.in
View file

@ -1,9 +1,9 @@
#######################################################################
# Makefile for php4 test-suite
# Makefile for php test-suite
#######################################################################
LANGUAGE = php4
SCRIPTSUFFIX = _runme.php4
LANGUAGE = php
SCRIPTSUFFIX = _runme.php
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
@ -25,19 +25,19 @@ makectests:
@bash -ec 'for test in $(C_TEST_CASES) ; do $($(MAKE)) clean && $(MAKE) $${test}.cpptest; done'
runcpptests:
@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
runctests:
@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
runtests: runcpptests runctests
# write out tests without a _runme.php4
# write out tests without a _runme.php
missingcpptests:
@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
missingctests:
@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
missingtests: missingcpptests missingctests
@ -58,10 +58,10 @@ missingtests: missingcpptests missingctests
+$(run_testcase)
# Runs the testcase. A testcase is only run if
# a file is found which has _runme.php4 appended after the testcase name.
# a file is found which has _runme.php appended after the testcase name.
run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP4SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \
fi;
# Clean: remove the generated .php file
@ -69,4 +69,4 @@ run_testcase = \
@rm -f $*.php;
clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php4_clean
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php_clean

2
Examples/test-suite/php/abstract_inherit_ok_runme.php4 → Examples/test-suite/php/abstract_inherit_ok_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "abstract_inherit_ok.php";
check::classes(array(Foo,Spam));

2
Examples/test-suite/php/abstract_inherit_runme.php4 → Examples/test-suite/php/abstract_inherit_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "abstract_inherit.php";
check::classes(array(Foo,Bar,Spam,NRFilter_i,NRRCFilter_i,NRRCFilterpro_i,NRRCFilterpri_i));

2
Examples/test-suite/php/add_link_runme.php4 → Examples/test-suite/php/add_link_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "add_link.php";
// No new functions, except the flat functions

2
Examples/test-suite/php/argout_runme.php4 → Examples/test-suite/php/argout_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "argout.php";
check::functions(array(incp,incr,inctr,new_intp,copy_intp,delete_intp,intp_assign,intp_value,voidhandle,handle));

2
Examples/test-suite/php/arrayptr_runme.php4 → Examples/test-suite/php/arrayptr_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "arrayptr.php";
// No new functions

2
Examples/test-suite/php/arrays_global_runme.php4 → Examples/test-suite/php/arrays_global_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "arrays_global.php";
check::functions(array(test_a,test_b,new_simplestruct,new_material));

2
Examples/test-suite/php/arrays_global_twodim_runme.php4 → Examples/test-suite/php/arrays_global_twodim_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "arrays_global_twodim.php";
check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));

2
Examples/test-suite/php/arrays_runme.php4 → Examples/test-suite/php/arrays_runme.php
View file

@ -1,6 +1,6 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "arrays.php";
check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));

2
Examples/test-suite/php/arrays_scope_runme.php4 → Examples/test-suite/php/arrays_scope_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "arrays_scope.php";
// No new functions

2
Examples/test-suite/php/casts_runme.php4 → Examples/test-suite/php/casts_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "casts.php";
// No new functions

2
Examples/test-suite/php/class_ignore_runme.php4 → Examples/test-suite/php/class_ignore_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "class_ignore.php";
check::functions(array(do_blah,new_bar,bar_blah,new_boo,boo_away,new_far,new_hoo));

2
Examples/test-suite/php/conversion_namespace_runme.php4 → Examples/test-suite/php/conversion_namespace_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "conversion_namespace.php";
check::classes(array("Foo","Bar"));

2
Examples/test-suite/php/conversion_ns_template_runme.php4 → Examples/test-suite/php/conversion_ns_template_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "conversion_ns_template.php";
check::classes(array("conversion_ns_template","Foo_One","Bar_One","Hi"));

2
Examples/test-suite/php/conversion_runme.php4 → Examples/test-suite/php/conversion_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "conversion.php";
check::classes(array("Foo","Bar"));

2
Examples/test-suite/php/cpp_static_runme.php4 → Examples/test-suite/php/cpp_static_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "cpp_static.php";
// No new functions

2
Examples/test-suite/php/enum_scope_template_runme.php4 → Examples/test-suite/php/enum_scope_template_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "enum_scope_template.php";
check::classes(array("enum_scope_template", "TreeInt"));

2
Examples/test-suite/php/evil_diamond_ns_runme.php4 → Examples/test-suite/php/evil_diamond_ns_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "evil_diamond_ns.php";
check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));

2
Examples/test-suite/php/evil_diamond_prop_runme.php4 → Examples/test-suite/php/evil_diamond_prop_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "evil_diamond_prop.php";
check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));

2
Examples/test-suite/php/evil_diamond_runme.php4 → Examples/test-suite/php/evil_diamond_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "evil_diamond.php";
check::classes(array("evil_diamond","foo","bar","baz","spam"));

2
Examples/test-suite/php/extend_template_ns_runme.php4 → Examples/test-suite/php/extend_template_ns_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "extend_template_ns.php";
check::classes(array("extend_template_ns","Foo_One"));

2
Examples/test-suite/php/extend_template_runme.php4 → Examples/test-suite/php/extend_template_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "extend_template.php";
check::classes(array("Foo_0"));

2
Examples/test-suite/php/grouping_runme.php4 → Examples/test-suite/php/grouping_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "grouping.php";
check::functions(array("test1","test2","do_unary","negate"));

2
Examples/test-suite/php/ignore_parameter_runme.php4 → Examples/test-suite/php/ignore_parameter_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "ignore_parameter.php";
// No new functions

2
Examples/test-suite/php/li_carrays_runme.php4 → Examples/test-suite/php/li_carrays_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "li_carrays.php";
// No new functions

2
Examples/test-suite/php/li_std_string_runme.php4 → Examples/test-suite/php/li_std_string_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "li_std_string.php";
// Global variables

2
Examples/test-suite/php/rename_scope_runme.php4 → Examples/test-suite/php/rename_scope_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "rename_scope.php";
check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));

2
Examples/test-suite/php/skel.php4 → Examples/test-suite/php/skel.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "____.php";
// No new functions

2
Examples/test-suite/php/smart_pointer_rename_runme.php4 → Examples/test-suite/php/smart_pointer_rename_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "smart_pointer_rename.php";
check::classes(array("Foo","Bar"));

2
Examples/test-suite/php/sym_runme.php4 → Examples/test-suite/php/sym_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "sym.php";
// No new functions

2
Examples/test-suite/php/template_arg_typename_runme.php4 → Examples/test-suite/php/template_arg_typename_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "template_arg_typename.php";
// No new functions

2
Examples/test-suite/php/template_construct_runme.php4 → Examples/test-suite/php/template_construct_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "template_construct.php";
check::classes(array(Foo_int));

0
Examples/test-suite/php/tests.php4 → Examples/test-suite/php/tests.php
View file

2
Examples/test-suite/php/typedef_reference_runme.php4 → Examples/test-suite/php/typedef_reference_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "typedef_reference.php";
check::functions(array(somefunc,otherfunc,new_intp,copy_intp,delete_intp,intp_assign,intp_value));

2
Examples/test-suite/php/typemap_ns_using_runme.php4 → Examples/test-suite/php/typemap_ns_using_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "typemap_ns_using.php";
if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
if (! 3==spam(3)) die("spam function not working right\n");

2
Examples/test-suite/php/using1_runme.php4 → Examples/test-suite/php/using1_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "using1.php";
if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
if (! 3==spam(3)) die("spam function not working right\n");

2
Examples/test-suite/php/using2_runme.php4 → Examples/test-suite/php/using2_runme.php
View file

@ -1,6 +1,6 @@
<?php
require "tests.php4";
require "tests.php";
require "using2.php";
if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
if (! 3==spam(3)) die("spam function not working right\n");

2
Examples/test-suite/php/valuewrapper_base_runme.php4 → Examples/test-suite/php/valuewrapper_base_runme.php
View file

@ -1,7 +1,7 @@
<?php
// Sample test file
require "tests.php4";
require "tests.php";
require "valuewrapper_base.php";
check::classes(array("valuewrapper_base","Base","Interface_BP"));

2
Makefile.in
View file

@ -49,7 +49,7 @@ skip-guilescm = test -n "@SKIP_GUILESCM@"
skip-guile = test -n "@SKIP_GUILE@"
skip-mzscheme = test -n "@SKIP_MZSCHEME@"
skip-ruby = test -n "@SKIP_RUBY@"
skip-php = test -n "@SKIP_PHP4@"
skip-php = test -n "@SKIP_PHP@"
skip-ocaml = test -n "@SKIP_OCAML@"
skip-octave = test -n "@SKIP_OCTAVE@"
skip-pike = test -n "@SKIP_PIKE@"

46
configure.in
View file

@ -243,10 +243,10 @@ case $host in
*) GUILE_SO=$SO;;
esac
AC_SUBST(PHP4_SO)
AC_SUBST(PHP_SO)
case $host in
*-*-darwin*) PHP4_SO=.so;;
*) PHP4_SO=$SO;;
*-*-darwin*) PHP_SO=.so;;
*) PHP_SO=$SO;;
esac
AC_SUBST(MZSCHEME_SO)
@ -1329,37 +1329,37 @@ AC_SUBST(RUBYDYNAMICLINKING)
# Look for PHP
#-------------------------------------------------------------------------
PHP4BIN=
PHPBIN=
AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP])
AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHP4BIN="$withval"], [PHP4BIN=yes])
AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN=yes])
# First, check for "--without-php" or "--with-php=no".
if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then
if test x"${PHPBIN}" = xno -o x"${with_alllang}" = xno ; then
AC_MSG_NOTICE([Disabling PHP])
PHP4=
PHP=
else
if test "x$PHP4BIN" = xyes; then
AC_CHECK_PROGS(PHP4, [php5 php])
if test "x$PHPBIN" = xyes; then
AC_CHECK_PROGS(PHP, [php5 php])
else
PHP4=$PHP4BIN
PHP=$PHPBIN
fi
AC_MSG_CHECKING(for PHP header files)
dnl /usr/bin/php5 -> /usr/bin/php-config5
case $PHP4 in
case $PHP in
*5)
PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;;
PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;;
*)
PHP4CONFIG=$PHP4-config ;;
PHPCONFIG=$PHP-config ;;
esac
php_version=`$PHP4CONFIG --version 2>/dev/null`
php_version=`$PHPCONFIG --version 2>/dev/null`
case $php_version in
5*)
PHP4INC=`$PHP4CONFIG --includes 2>/dev/null`
if test -n "$PHP4INC"; then
AC_MSG_RESULT($PHP4INC)
PHPINC=`$PHPCONFIG --includes 2>/dev/null`
if test -n "$PHPINC"; then
AC_MSG_RESULT($PHPINC)
else
AC_MSG_RESULT(not found)
fi
@ -1368,8 +1368,8 @@ else
AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;;
esac
fi
AC_SUBST(PHP4)
AC_SUBST(PHP4INC)
AC_SUBST(PHP)
AC_SUBST(PHPINC)
#----------------------------------------------------------------
# Look for ocaml
@ -2003,11 +2003,11 @@ fi
AC_SUBST(SKIP_RUBY)
SKIP_PHP4=
if test -z "$PHP4" || test -z "$PHP4INC" ; then
SKIP_PHP4="1"
SKIP_PHP=
if test -z "$PHP" || test -z "$PHPINC" ; then
SKIP_PHP="1"
fi
AC_SUBST(SKIP_PHP4)
AC_SUBST(SKIP_PHP)
SKIP_OCAML=