Merge branch 'master' of github.com:CopernicaMarketingSoftware/PHP-CPP

EmielBruijntjes · EmielBruijntjes · commit 87b079a70902 · 2024-10-13T17:20:53.000+02:00
diff --git a/Examples/CallPhpFunctions/Makefile b/Examples/CallPhpFunctions/Makefile
@@ -1,11 +1,9 @@
 CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
-
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +26,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/ConstStaticProp/cpp/Makefile b/Examples/ConstStaticProp/cpp/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/CppClassesInPhp/Makefile b/Examples/CppClassesInPhp/Makefile
@@ -29,7 +29,7 @@ NAME				=	cppclassinphp
 #	one for each extension. Use this variable to specify this directory.
 #
 
-INI_DIR				=	/etc/php5/conf.d
+INI_DIR				=	$(shell php-config --ini-dir)
 
 
 #
diff --git a/Examples/DlUnrestricted/Makefile b/Examples/DlUnrestricted/Makefile
@@ -29,7 +29,7 @@ NAME				=	dlunrestricted
 #	one for each extension. Use this variable to specify this directory.
 #
 
-INI_DIR				=	/etc/php5/mods-available
+INI_DIR				=	$(shell php-config --ini-dir)
 
 
 #
diff --git a/Examples/EmptyExtension/Makefile b/Examples/EmptyExtension/Makefile
@@ -29,7 +29,7 @@ NAME				=	yourextension
 #	one for each extension. Use this variable to specify this directory.
 #
 
-INI_DIR				=	/etc/php5/mods-available/
+INI_DIR				=	$(shell php-config --ini-dir)
 
 
 #
diff --git a/Examples/Exceptions/ExceptionCatch/Makefile b/Examples/Exceptions/ExceptionCatch/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/Exceptions/ExceptionThrow/Makefile b/Examples/Exceptions/ExceptionThrow/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/Extension/Makefile b/Examples/Extension/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/FunctionNoParameters/Makefile b/Examples/FunctionNoParameters/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/FunctionReturnValue/Makefile b/Examples/FunctionReturnValue/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/FunctionVoid/Makefile b/Examples/FunctionVoid/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/FunctionWithParameters/Makefile b/Examples/FunctionWithParameters/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-#Edit these lines to correspond with your own directories
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/Globals/Makefile b/Examples/Globals/Makefile
@@ -2,10 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
-PREFIX			= /usr
-PHP_CONFIG      = php-config
+PHP_CONFIG      = $(shell which php-config)
 LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
-PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
@@ -28,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/Examples/ReturnObject/Makefile b/Examples/ReturnObject/Makefile
@@ -29,7 +29,7 @@ NAME				=	returnobject
 #	one for each extension. Use this variable to specify this directory.
 #
 
-INI_DIR				=	/etc/php5/mods-available/
+INI_DIR				=	$(shell php-config --ini-dir)
 
 
 #
diff --git a/Examples/simple/Makefile b/Examples/simple/Makefile
@@ -2,12 +2,9 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -I/home/work/include/ -O2 -std=c++11
 
-PREFIX			= /home/work/
-
-#Edit these lines to correspond with your own directories
-LIBRARY_DIR		= ${PREFIX}/local/php/lib/php/extensions/no-debug-non-zts-20090626/
-
-PHP_CONFIG_DIR	= /home/work/local/php/lib/
+PHP_CONFIG      = $(shell which php-config)
+LIBRARY_DIR		= $(shell ${PHP_CONFIG} --extension-dir)
+PHP_CONFIG_DIR	= $(shell ${PHP_CONFIG} --ini-dir)
 
 LD              = g++
 LD_FLAGS        = -Wall -Wl,-rpath,/home/work/lib -shared -O2 -L/home/work/lib
@@ -30,5 +27,9 @@ ${OBJECTS}:
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
 install:
-		cp -f ${RESULT} ${LIBRARY_DIR}
-		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
+		cp -f ${RESULT} ${LIBRARY_DIR}/
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}/
+
+uninstall:
+		rm ${LIBRARY_DIR}/${RESULT}
+		rm ${PHP_CONFIG_DIR}/${PHPINIFILE}
diff --git a/README.md b/README.md
@@ -7,12 +7,6 @@ The PHP-CPP library is a C++ library for developing PHP extensions. It offers a
 of well documented and easy-to-use classes that can be used and extended to build native
 extensions for PHP. The full documentation can be found on http://www.php-cpp.com.
 
-**Watch out: PHP 7 only!**
-This library has been updated to work with PHP versions 7.0 and up. If you wish to create 
-extensions for older PHP versions, use the [PHP-CPP-LEGACY](https://github.com/CopernicaMarketingSoftware/PHP-CPP-LEGACY)
-library instead. The PHP-CPP and PHP-CPP-LEGACY library have (almost) identical API's,
-so you can easily port extensions for PHP 5.* to PHP 7 and the other way around.
-
 ABOUT
 =====
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ NAME = cppclassinphp`
`29`	`29`	`# one for each extension. Use this variable to specify this directory.`
`30`	`30`	`#`
`31`	`31`
`32`		`-INI_DIR = /etc/php5/conf.d`
	`32`	`+INI_DIR = $(shell php-config --ini-dir)`
`33`	`33`
`34`	`34`
`35`	`35`	`#`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ NAME = dlunrestricted`
`29`	`29`	`# one for each extension. Use this variable to specify this directory.`
`30`	`30`	`#`
`31`	`31`
`32`		`-INI_DIR = /etc/php5/mods-available`
	`32`	`+INI_DIR = $(shell php-config --ini-dir)`
`33`	`33`
`34`	`34`
`35`	`35`	`#`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ NAME = yourextension`
`29`	`29`	`# one for each extension. Use this variable to specify this directory.`
`30`	`30`	`#`
`31`	`31`
`32`		`-INI_DIR = /etc/php5/mods-available/`
	`32`	`+INI_DIR = $(shell php-config --ini-dir)`
`33`	`33`
`34`	`34`
`35`	`35`	`#`