mig5/pdo_sqlcipher
1
0
Fork 0
Code Activity

Revert commit (fix #2, #3, breaks FreeBSD build).

Browse source
This commit is contained in:
Anton Batenev 2013-09-13 15:15:53 +04:00
parent e1899a53c0
commit a653043ce4
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
build.sh
View file

@ -122,29 +122,25 @@ if [ $? -ne 0 ]; then
exit $? exit $?
fi fi
cp "${SQLCIPHER_SRC}/sqlite3.c" "${BUILD_DIR}/sqlite3.c"
if [ $? -ne 0 ]; then
exit $?
fi
cp "${SQLCIPHER_SRC}/sqlite3.h" "${BUILD_DIR}/sqlite3.h"
if [ $? -ne 0 ]; then
exit $?
fi
# magic :) # magic :)
for FILE in "${BUILD_DIR}"/* for FILE in "${BUILD_DIR}"/*
do do
cat "${FILE}" | \ cat "${FILE}" | \
sed -e 's/sqlite/sqlcipher/g' | \ sed -e 's/<sqlite3.h>/"sqlcipher3.h"/g' | \
sed -e 's/SQLite/SQLCipher/g' | \ sed -e 's/pdo_sqlite/pdo_sqlcipher/g' | \
sed -e 's/SQLITE/SQLCIPHER/g' > \ sed -e 's/php_sqlite3/php_sqlcipher/g' | \
sed -e 's/sqlite_handle_/sqlcipher_handle_/g' | \
sed -e 's/sqlite_stmt_methods/sqlcipher_stmt_methods/g' | \
sed -e 's/PDO_SQLITE/PDO_SQLCIPHER/g' | \
sed -e 's/HEADER(sqlite)/HEADER(sqlcipher)/g' | \
sed -e 's/PDO Driver for SQLite 3.x/PDO Driver for SQLCipher/g' | \
sed -e 's/SQLite Library/SQLCipher Library/g' > \
"${FILE}.tmp" "${FILE}.tmp"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit $? exit $?
fi fi
NEW_FILE=$(echo ${FILE} | sed 's/sqlite/sqlcipher/') NEW_FILE=$(echo ${FILE} | sed 's/_sqlite/_sqlcipher/')
mv "${FILE}.tmp" "${NEW_FILE}" mv "${FILE}.tmp" "${NEW_FILE}"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -159,6 +155,17 @@ do
fi fi
done done
# copy unmodified sqlite sources
cp "${SQLCIPHER_SRC}/sqlite3.c" "${BUILD_DIR}/sqlcipher3.c"
if [ $? -ne 0 ]; then
exit $?
fi
cp "${SQLCIPHER_SRC}/sqlite3.h" "${BUILD_DIR}/sqlcipher3.h"
if [ $? -ne 0 ]; then
exit $?
fi
# #
# Build pdo_sqlcipher # Build pdo_sqlcipher
# #
@ -180,8 +187,6 @@ if [ $? -ne 0 ]; then
exit $? exit $?
fi fi
CFLAGS=$(echo "${CFLAGS}" | sed -e 's/SQLITE/SQLCIPHER/g')
./configure \ ./configure \
CFLAGS="${CFLAGS}" \ CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" LDFLAGS="${LDFLAGS}"
@ -231,7 +236,7 @@ if [ $? -ne 0 ]; then
fi fi
# sqlcipher static binary # sqlcipher static binary
cp "${SQLCIPHER_SRC}/sqlite3" "${RELEASE_DIR}/sqlcipher" cp "${SQLCIPHER_SRC}/sqlcipher" "${RELEASE_DIR}/sqlcipher"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit $? exit $?
fi fi

2
config.m4
View file

@ -25,7 +25,7 @@ if test "$PHP_PDO_SQLCIPHER" != "no"; then
fi fi
AC_MSG_RESULT($pdo_inc_path) AC_MSG_RESULT($pdo_inc_path)
php_pdo_sqlcipher_sources_core="pdo_sqlcipher.c sqlcipher_driver.c sqlcipher_statement.c sqlcipher3.c" php_pdo_sqlcipher_sources_core="pdo_sqlcipher.c sqlite_driver.c sqlite_statement.c sqlcipher3.c"
PHP_NEW_EXTENSION(pdo_sqlcipher, $php_pdo_sqlcipher_sources_core, $ext_shared,,-I$pdo_inc_path) PHP_NEW_EXTENSION(pdo_sqlcipher, $php_pdo_sqlcipher_sources_core, $ext_shared,,-I$pdo_inc_path)