Skip to content

Commit 809e99d

Browse files
bjoribjori
committed
PHPC-174: Rename module registration, constants and so on to mongodb
1 parent 234da99 commit 809e99d

File tree

6 files changed

+95
-95
lines changed

6 files changed

+95
-95
lines changed

‎Makefile.frag

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.PHONY: coverage testclean ChangeLog RELEASE package.xml docs
22

33
DATE=`date +%Y-%m-%d--%H-%M-%S`
4-
PHONGO_VERSION=`php -n -dextension=modules/phongo.so -r 'echo PHONGO_VERSION;'`
5-
PHONGO_STABILITY=`php -n -dextension=modules/phongo.so -r 'echo PHONGO_STABILITY;'`
4+
MONGODB_VERSION=`php -n -dextension=modules/mongodb.so -r 'echo MONGODB_VERSION;'`
5+
MONGODB_STABILITY=`php -n -dextension=modules/mongodb.so -r 'echo MONGODB_STABILITY;'`
66
LIB_PATH=vendor/mongodb/mongodb
77
COMPOSER_ARGS=update --no-interaction --prefer-source
88
PHPUNIT_ARGS=--process-isolation
@@ -43,7 +43,7 @@ lcov-local:
4343
lcov --gcov-tool $(top_srcdir)/.llvm-cov.sh --capture --derive-func-data --directory . --output-file .coverage.lcov --no-external
4444

4545
coverage: mv-coverage lcov-local
46-
genhtml .coverage.lcov --legend --title "phongo code coverage" --output-directory coverage
46+
genhtml .coverage.lcov --legend --title "mongodb code coverage" --output-directory coverage
4747

4848

4949
coveralls: mv-coverage lcov-coveralls
@@ -101,14 +101,14 @@ testclean:
101101
find $(top_srcdir)/tests/$$group -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs rm -f; \
102102
done;
103103

104-
phongodep:
104+
mongodbdep:
105105

106106
release: test ChangeLog RELEASE package.xml
107107
pecl package package.xml
108108
@echo "Please run:"
109-
@echo " " git add RELEASE-$(PHONGO_VERSION)
110-
@echo " " git commit -m \"Add $(PHONGO_VERSION) release notes\"
111-
@echo " " git tag -a -m \"Release $(PHONGO_VERSION)\" $(PHONGO_VERSION)
109+
@echo " " git add RELEASE-$(MONGODB_VERSION)
110+
@echo " " git commit -m \"Add $(MONGODB_VERSION) release notes\"
111+
@echo " " git tag -a -m \"Release $(MONGODB_VERSION)\" $(MONGODB_VERSION)
112112
@echo " " git push --tags
113113
@echo " " make release-docs
114114
@echo "And don't forget to bump version in php_phongo.h"
@@ -120,10 +120,10 @@ release-docs: docs
120120
mkdocs gh-deploy --clean
121121

122122
package.xml:
123-
php bin/prep-release.php $(PHONGO_VERSION)-$(PHONGO_STABILITY)
123+
php bin/prep-release.php $(MONGODB_VERSION)-$(MONGODB_STABILITY)
124124

125125
RELEASE:
126-
@git log --pretty=format:"%ad %an <%ae>%n%x09* %s%n" --date short --since="$$(git show -s --format=%ad `git rev-list --tags --max-count=1`)" > RELEASE-$(PHONGO_VERSION)
126+
@git log --pretty=format:"%ad %an <%ae>%n%x09* %s%n" --date short --since="$$(git show -s --format=%ad `git rev-list --tags --max-count=1`)" > RELEASE-$(MONGODB_VERSION)
127127

128128
ChangeLog:
129129
@git log --pretty=format:"%ad %an <%ae>%n%x09* %s%n" --date short > ChangeLog

‎bin/prep-release.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function usage() {
200200
$NOTES = array();
201201
foreach($fullnotes as $note) {
202202
$note = " " . str_replace("&", "&amp;", trim($note));
203-
/* PHP phongo JIRA Project */
203+
/* PHP PHPC JIRA Project */
204204
if (strstr($note, "PHPC-") !== false) {
205205
$NOTES[] = $note;
206206
continue;

‎config.m4

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ AC_DEFUN([PHP_BSON_CLOCK],
7070

7171
MONGOC_SYMBOL_SUFFIX="priv"
7272

73-
if test "$PHONGO" != "no"; then
73+
if test "$MONGODB" != "no"; then
7474
PHP_ARG_ENABLE(developer-flags, whether to enable developer build flags,
7575
[ --enable-developer-flags Enable developer flags],, no)
7676

@@ -126,10 +126,10 @@ if test "$PHONGO" != "no"; then
126126
EXTRA_LDFLAGS="$COVERAGE_CFLAGS"
127127
fi
128128

129-
PHONGO_BSON="\
129+
MONGODB_BSON="\
130130
src/bson.c \
131131
";
132-
PHONGO_BSON_CLASSES="\
132+
MONGODB_BSON_CLASSES="\
133133
src/BSON/Type.c \
134134
src/BSON/Unserializable.c \
135135
src/BSON/Serializable.c \
@@ -143,10 +143,10 @@ if test "$PHONGO" != "no"; then
143143
src/BSON/Timestamp.c \
144144
src/BSON/UTCDatetime.c \
145145
";
146-
PHONGO_ROOT="\
146+
MONGODB_ROOT="\
147147
php_phongo.c \
148148
";
149-
PHONGO_MONGODB_CLASSES="\
149+
MONGODB_MONGODB_CLASSES="\
150150
src/MongoDB/Command.c \
151151
src/MongoDB/Cursor.c \
152152
src/MongoDB/CursorId.c \
@@ -161,7 +161,7 @@ if test "$PHONGO" != "no"; then
161161
src/MongoDB/WriteError.c \
162162
src/MongoDB/WriteResult.c \
163163
";
164-
PHONGO_MONGODB_EXCEPTIONS="\
164+
MONGODB_MONGODB_EXCEPTIONS="\
165165
src/MongoDB/Exception.c \
166166
src/MongoDB/RuntimeException.c \
167167
src/MongoDB/InvalidArgumentException.c \
@@ -268,15 +268,15 @@ MONGOC_SOURCES_SASL=mongoc-sasl.c
268268

269269

270270
if test "$ext_shared" = "no"; then
271-
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $PHONGO_BSON)
272-
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $PHONGO_BSON_CLASSES)
273-
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $PHONGO_MONGODB_CLASSES)
274-
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $PHONGO_MONGODB_EXCEPTIONS)
271+
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON)
272+
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES)
273+
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES)
274+
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS)
275275
else
276-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $PHONGO_BSON, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
277-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $PHONGO_BSON_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
278-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $PHONGO_MONGODB_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
279-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $PHONGO_MONGODB_EXCEPTIONS, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
276+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
277+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
278+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
279+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
280280
fi
281281

282282
dnl libmongoc stuff {{{
@@ -293,64 +293,64 @@ dnl libmongoc stuff {{{
293293
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
294294

295295

296-
PHP_SETUP_OPENSSL(PHONGO_SHARED_LIBADD)
296+
PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
297297
MONGOC_ENABLE_SSL=1
298298
AC_SUBST(MONGOC_ENABLE_SSL)
299299

300300

301301
PHP_ARG_WITH(mongodb-sasl, Build with Cyrus SASL support,
302302
[ --with-mongodb-sasl[=DIR] mongodb: Include Cyrus SASL support], auto, yes)
303303

304-
if test "$PHP_PHONGO_SASL" != "no"; then
304+
if test "$PHP_MONGODB_SASL" != "no"; then
305305
AC_MSG_CHECKING(for SASL)
306-
for i in $PHONGO_SASL /usr /usr/local; do
306+
for i in $MONGODB_SASL /usr /usr/local; do
307307
if test -f $i/include/sasl/sasl.h; then
308-
PHONGO_SASL_DIR=$i
308+
MONGODB_SASL_DIR=$i
309309
AC_MSG_RESULT(found in $i)
310310
break
311311
fi
312312
done
313313

314-
if test -z "$PHONGO_SASL_DIR"; then
314+
if test -z "$MONGODB_SASL_DIR"; then
315315
AC_MSG_RESULT(not found)
316-
if test "$PHONGO_SASL" != "auto"; then
316+
if test "$MONGODB_SASL" != "auto"; then
317317
AC_MSG_ERROR([sasl.h not found!])
318318
fi
319319
fi
320320

321321
PHP_CHECK_LIBRARY(sasl2, sasl_version,
322322
[
323-
PHP_ADD_INCLUDE($PHONGO_SASL_DIR)
324-
PHP_ADD_LIBRARY_WITH_PATH(sasl2, $PHONGO_SASL_DIR/$PHP_LIBDIR, PHONGO_SHARED_LIBADD)
323+
PHP_ADD_INCLUDE($MONGODB_SASL_DIR)
324+
PHP_ADD_LIBRARY_WITH_PATH(sasl2, $MONGODB_SASL_DIR/$PHP_LIBDIR, MONGODB_SHARED_LIBADD)
325325
MONGOC_ENABLE_SASL=1
326326
AC_SUBST(MONGOC_ENABLE_SASL)
327327
], [
328-
if test "$PHONGO_SASL" != "auto"; then
328+
if test "$MONGODB_SASL" != "auto"; then
329329
AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])
330330
fi
331331
], [
332-
-L$PHONGO_SASL_DIR/$PHP_LIBDIR
332+
-L$MONGODB_SASL_DIR/$PHP_LIBDIR
333333
])
334334
fi
335335
m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
336336
AX_PTHREAD
337337

338338
AC_CHECK_FUNCS([shm_open], [SHM_LIB=], [AC_CHECK_LIB([rt], [shm_open], [SHM_LIB=-lrt], [SHM_LIB=])])
339-
PHONGO_SHARED_LIBADD="$PHONGO_SHARED_LIBADD $SHM_LIB"
339+
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $SHM_LIB"
340340

341341

342-
dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, PHONGO_SHARED_LIBADD)
343-
dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, PHONGO_SHARED_LIBADD)
342+
dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, MONGODB_SHARED_LIBADD)
343+
dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, MONGODB_SHARED_LIBADD)
344344
EXTRA_CFLAGS="$PTHREAD_CFLAGS $SASL_CFLAGS"
345345
PHP_SUBST(EXTRA_CFLAGS)
346346
PHP_SUBST(EXTRA_LDFLAGS)
347347

348-
PHONGO_SHARED_LIBADD="$PHONGO_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
349-
PHP_SUBST(PHONGO_SHARED_LIBADD)
348+
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
349+
PHP_SUBST(MONGODB_SHARED_LIBADD)
350350

351351
dnl }}}
352352

353-
PHP_NEW_EXTENSION(mongodb, $PHONGO_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
353+
PHP_NEW_EXTENSION(mongodb, $MONGODB_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
354354
PHP_ADD_EXTENSION_DEP(mongodb, spl)
355355

356356
m4_include(src/libbson/build/autotools/CheckAtomics.m4)
@@ -372,8 +372,8 @@ dnl }}}
372372
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
373373
PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
374374

375-
dnl PHONGO_SHARED_DEPENDENCIES="mongodbdep"
376-
dnl PHP_SUBST(PHONGO_SHARED_DEPENDENCIES)
375+
dnl MONGODB_SHARED_DEPENDENCIES="mongodbdep"
376+
dnl PHP_SUBST(MONGODB_SHARED_DEPENDENCIES)
377377

378378
PHP_BSON_BIGENDIAN
379379
AC_HEADER_STDBOOL
@@ -440,7 +440,7 @@ Build configuration:
440440
Code Coverage flags (extra slow) : $COVERAGE_CFLAGS
441441
LDFLAGS : $LDFLAGS
442442
EXTRA_LDFLAGS : $EXTRA_LDFLAGS
443-
PHONGO_SHARED_LIBADD : $PHONGO_SHARED_LIBADD
443+
MONGODB_SHARED_LIBADD : $MONGODB_SHARED_LIBADD
444444
445445
Please submit bugreports at:
446446
https://jira.mongodb.org/browse/PHP

0 commit comments

Comments
 (0)