Merge pull request #227 from Hadis-Fard/PHP-7.0

Updated code structure and config.w32
microsoft · Jan 14, 2017 · a6243a9 · a6243a9
2 parents 7b02154 + 73cd9c8
commit a6243a9
Show file tree

Hide file tree

Showing 37 changed files with 40 additions and 10,148 deletions.
diff --git a/pdo_sqlsrv/CREDITS b/pdo_sqlsrv/CREDITS
diff --git a/source/pdo_sqlsrv/CREDITS b/source/pdo_sqlsrv/CREDITS
@@ -0,0 +1 @@
+Microsoft Drivers for PHP for SQL Server (PDO driver)
diff --git a/pdo_sqlsrv/config.w32 → source/pdo_sqlsrv/config.w32 b/pdo_sqlsrv/config.w32 → source/pdo_sqlsrv/config.w32
@@ -3,7 +3,7 @@
 //
 // Contents: JScript build configuration used by buildconf.bat
 //
-// Microsoft Drivers 4.0 for PHP for SQL Server
+// Microsoft Drivers 4.1 for PHP for SQL Server
 // Copyright(c) Microsoft Corporation
 // All rights reserved.
 // MIT License
@@ -21,21 +21,23 @@ ARG_WITH("pdo-sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (PDO dri
 
 if( PHP_PDO_SQLSRV != "no" ) {
 
-    pdo_sqlsrv_src = "pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp";
+    pdo_sqlsrv_src_class = " pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp ";
+    shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp ";
 
     if (CHECK_LIB("odbc32.lib", "pdo_sqlsrv") && CHECK_LIB("odbccp32.lib", "pdo_sqlsrv") && 
-       CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")) {
-
-       EXTENSION("pdo_sqlsrv",  pdo_sqlsrv_src,  PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
-
-       CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_PDO_SQLSRV_ODBC');
-       CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_SQLSRV_ODBC');
-       ADD_FLAG( 'LDFLAGS_PDO_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' );
-       ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/EHsc' );
-       ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/GS' );
-	   ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/Zi' );
-       ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' );
-       ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
-   }
-
+        CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")&&
+	CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname + "\\shared")) {
+            CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
+            CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
+            ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" );
+            ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
+            ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" );
+            ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" );
+            ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" );
+            ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
+            ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
+            EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+    } else {
+        WARNING("pdo-sqlsrv not enabled; libraries and headers not found");
+	}
 }
diff --git a/pdo_sqlsrv/pdo_dbh.cpp → source/pdo_sqlsrv/pdo_dbh.cpp b/pdo_sqlsrv/pdo_dbh.cpp → source/pdo_sqlsrv/pdo_dbh.cpp
diff --git a/pdo_sqlsrv/pdo_init.cpp → source/pdo_sqlsrv/pdo_init.cpp b/pdo_sqlsrv/pdo_init.cpp → source/pdo_sqlsrv/pdo_init.cpp
diff --git a/pdo_sqlsrv/pdo_parser.cpp → source/pdo_sqlsrv/pdo_parser.cpp b/pdo_sqlsrv/pdo_parser.cpp → source/pdo_sqlsrv/pdo_parser.cpp
diff --git a/pdo_sqlsrv/pdo_stmt.cpp → source/pdo_sqlsrv/pdo_stmt.cpp b/pdo_sqlsrv/pdo_stmt.cpp → source/pdo_sqlsrv/pdo_stmt.cpp
diff --git a/pdo_sqlsrv/pdo_util.cpp → source/pdo_sqlsrv/pdo_util.cpp b/pdo_sqlsrv/pdo_util.cpp → source/pdo_sqlsrv/pdo_util.cpp
diff --git a/pdo_sqlsrv/php_pdo_sqlsrv.h → source/pdo_sqlsrv/php_pdo_sqlsrv.h b/pdo_sqlsrv/php_pdo_sqlsrv.h → source/pdo_sqlsrv/php_pdo_sqlsrv.h
diff --git a/sqlsrv/template.rc → source/pdo_sqlsrv/template.rc b/sqlsrv/template.rc → source/pdo_sqlsrv/template.rc
@@ -23,7 +23,7 @@
 
 #include "winresrc.h"
 #include "main/php_version.h"
-#include "version.h"
+#include "shared/version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
@@ -61,7 +61,7 @@ BEGIN
         BEGIN
             VALUE "Comments", "This product includes PHP software that is freely available from http://www.php.net/software/.  Copyright � 2001-2016 The PHP Group.  All rights reserved.\0"
             VALUE "CompanyName", "Microsoft Corp.\0"
-            VALUE "FileDescription", "Microsoft Drivers for PHP for SQL Server\0"
+            VALUE "FileDescription", "Microsoft Drivers for PHP for SQL Server (PDO Driver)\0"
             VALUE "FileVersion", STRVER4(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE, SQLVERSION_BUILD)
             VALUE "InternalName", FILE_NAME "\0"
             VALUE "LegalCopyright", "Copyright Microsoft Corporation.\0"

diff --git a/pdo_sqlsrv/core_conn.cpp → source/shared/core_conn.cpp b/pdo_sqlsrv/core_conn.cpp → source/shared/core_conn.cpp
diff --git a/pdo_sqlsrv/core_init.cpp → source/shared/core_init.cpp b/pdo_sqlsrv/core_init.cpp → source/shared/core_init.cpp
diff --git a/pdo_sqlsrv/core_results.cpp → source/shared/core_results.cpp b/pdo_sqlsrv/core_results.cpp → source/shared/core_results.cpp
diff --git a/pdo_sqlsrv/core_sqlsrv.h → source/shared/core_sqlsrv.h b/pdo_sqlsrv/core_sqlsrv.h → source/shared/core_sqlsrv.h
diff --git a/pdo_sqlsrv/core_stmt.cpp → source/shared/core_stmt.cpp b/pdo_sqlsrv/core_stmt.cpp → source/shared/core_stmt.cpp
diff --git a/pdo_sqlsrv/core_stream.cpp → source/shared/core_stream.cpp b/pdo_sqlsrv/core_stream.cpp → source/shared/core_stream.cpp
diff --git a/pdo_sqlsrv/core_util.cpp → source/shared/core_util.cpp b/pdo_sqlsrv/core_util.cpp → source/shared/core_util.cpp
diff --git a/pdo_sqlsrv/msodbcsql.h → source/shared/msodbcsql.h b/pdo_sqlsrv/msodbcsql.h → source/shared/msodbcsql.h
diff --git a/pdo_sqlsrv/version.h → source/shared/version.h b/pdo_sqlsrv/version.h → source/shared/version.h
diff --git a/source/sqlsrv/CREDITS b/source/sqlsrv/CREDITS
@@ -0,0 +1 @@
+Microsoft Drivers for PHP for SQL Server
diff --git a/sqlsrv/config.w32 → source/sqlsrv/config.w32 b/sqlsrv/config.w32 → source/sqlsrv/config.w32
@@ -3,7 +3,7 @@
 //
 // Contents: JScript build configuration used by buildconf.bat
 //
-// Microsoft Drivers 4.0 for PHP for SQL Server
+// Microsoft Drivers 4.1 for PHP for SQL Server
 // Copyright(c) Microsoft Corporation
 // All rights reserved.
 // MIT License
@@ -21,19 +21,22 @@ ARG_ENABLE("sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (SQLSRV dr
 
 if( PHP_SQLSRV != "no" ) {
 
-    sqlsrv_src = "conn.cpp init.cpp stmt.cpp util.cpp core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp";
+    sqlsrv_src_class = " conn.cpp init.cpp stmt.cpp util.cpp ";
+    shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp ";
 
     if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") && 
-       CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")) {
-
-       EXTENSION("sqlsrv", sqlsrv_src, PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
-
-       CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_SQLSRV_ODBC');
-       CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_SQLSRV_ODBC');
-       ADD_FLAG( 'LDFLAGS_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' );
-       ADD_FLAG( 'CFLAGS_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' );
-       ADD_FLAG( 'CFLAGS_SQLSRV', '/EHsc' );
-       ADD_FLAG( 'CFLAGS_SQLSRV', '/GS' );
-       ADD_FLAG( 'CFLAGS_SQLSRV', '/Zi' );
-   }
+        CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&&
+        CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) {
+            ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
+            CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
+            CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_SQLSRV_ODBC");
+            ADD_FLAG( "LDFLAGS_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" );
+            ADD_FLAG( "CFLAGS_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
+            ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" );
+            ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
+            ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
+            EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+    } else {
+        WARNING("sqlsrv not enabled; libraries and headers not found");
+	}
 }
diff --git a/sqlsrv/conn.cpp → source/sqlsrv/conn.cpp b/sqlsrv/conn.cpp → source/sqlsrv/conn.cpp
diff --git a/sqlsrv/init.cpp → source/sqlsrv/init.cpp b/sqlsrv/init.cpp → source/sqlsrv/init.cpp
diff --git a/sqlsrv/php_sqlsrv.h → source/sqlsrv/php_sqlsrv.h b/sqlsrv/php_sqlsrv.h → source/sqlsrv/php_sqlsrv.h
diff --git a/sqlsrv/stmt.cpp → source/sqlsrv/stmt.cpp b/sqlsrv/stmt.cpp → source/sqlsrv/stmt.cpp
diff --git a/pdo_sqlsrv/template.rc → source/sqlsrv/template.rc b/pdo_sqlsrv/template.rc → source/sqlsrv/template.rc
@@ -23,7 +23,7 @@
 
 #include "winresrc.h"
 #include "main/php_version.h"
-#include "version.h"
+#include "shared/version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)

diff --git a/sqlsrv/util.cpp → source/sqlsrv/util.cpp b/sqlsrv/util.cpp → source/sqlsrv/util.cpp
diff --git a/sqlsrv/CREDITS b/sqlsrv/CREDITS
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Microsoft Drivers for PHP for SQL Server (PDO driver)