Style(include): merge to include dir

README_zh.md

@@ -34,6 +34,7 @@ xlswriter is a PHP C Extension that can be used to write text, numbers, formulas
 
 - [编译安装](#编译安装)
 - [PECL](#PECL)
+
 ## 使用
 
 1. [创建一个简单的xlsx文件](#创建一个简单的xlsx文件)

config.m4

@@ -6,7 +6,7 @@ PHP_ARG_WITH(libxlsxwriter, system libxlsswriter,
 
 if test "$PHP_XLSWRITER" != "no"; then
     xls_writer_sources="
-    xls_writer.c \
+    xlswriter.c \
     kernel/exception.c \
     kernel/resource.c \
     kernel/common.c \
@@ -102,6 +102,9 @@ if test "$PHP_XLSWRITER" != "no"; then
 
     PHP_NEW_EXTENSION(xlswriter, $xls_writer_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
+    PHP_ADD_INCLUDE([$ext_builddir])
+    PHP_ADD_INCLUDE([$ext_builddir/include])
+
     PHP_ADD_BUILD_DIR([$ext_builddir/kernel])
     PHP_ADD_BUILD_DIR([$ext_builddir/library/src])
     PHP_ADD_BUILD_DIR([$ext_builddir/library/third_party/minizip])

config.w32

@@ -6,10 +6,15 @@ if (PHP_XLSWRITER != "no") {
 
     if (CHECK_LIB("xlsxwriter.lib;xlsxwriter_a.lib", "xlswriter", PHP_XLSWRITER) &&
         CHECK_HEADER_ADD_INCLUDE("xlsxwriter.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\include;" + PHP_XLSWRITER) &&
-        CHECK_HEADER_ADD_INCLUDE("xlsxwriter/packager.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\include;" + PHP_XLSWRITER) &&
-        CHECK_HEADER_ADD_INCLUDE("xlsxwriter/format.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\include;" + PHP_XLSWRITER)) {
-        EXTENSION("xlswriter", "xls_writer.c")
+        CHECK_HEADER_ADD_INCLUDE("xlsxwriter/format.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\include;" + PHP_XLSWRITER) &&
+        CHECK_HEADER_ADD_INCLUDE("xlsxwriter/packager.h", "CFLAGS_XLSWRITER", PHP_PHP_BUILD + "\\include;" + PHP_XLSWRITER)) {
+
+        EXTENSION("xlswriter", "xlswriter.c")
+
+        ADD_FLAG("CFLAGS_XLSWRITER", ' /I "' + configure_module_dirname + '" ');
+
         AC_DEFINE("HAVE_LXW_VERSION", 1, "lxw_version available in 0.7.7");
+
         ADD_SOURCES(configure_module_dirname + "\\kernel", "common.c resource.c exception.c excel.c write.c format.c chart.c", "xlswriter");
     } else {
         WARNING("xlswriter not enabled, xlsxwriter.lib or headers not found");

kernel/include.h → include/xlswriter.h

@@ -28,7 +28,7 @@
 #include "xlsxwriter/packager.h"
 #include "xlsxwriter/format.h"
 
-#include "../php_xls_writer.h"
+#include "php_xlswriter.h"
 #include "excel.h"
 #include "exception.h"
 #include "format.h"

kernel/chart.c

@@ -10,8 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
-#include "chart.h"
+#include "xlswriter.h"
 
 zend_class_entry *vtiful_chart_ce;
 

kernel/common.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 void xls_file_path(zend_string *file_name, zval *dir_path, zval *file_path)
 {

kernel/excel.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 zend_class_entry *vtiful_xls_ce;
 

kernel/exception.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 zend_class_entry *vtiful_exception_ce;
 

kernel/format.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 zend_class_entry *vtiful_format_ce;
 

kernel/resource.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 /* {{{ */
 xls_resource_t * zval_get_resource(zval *handle)

kernel/write.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#include "include.h"
+#include "xlswriter.h"
 
 /*
  * According to the zval type written to the file

php_xls_writer.h → php_xlswriter.h

@@ -13,7 +13,7 @@
 #ifndef PHP_VTIFUL_H
 #define PHP_VTIFUL_H
 
-#include "kernel/include.h"
+#include "xlswriter.h"
 
 extern zend_module_entry xlswriter_module_entry;
 #define phpext_xlswriter_ptr &xlswriter_module_entry

xls_writer.c → xlswriter.c

@@ -16,7 +16,7 @@
 
 #include "php.h"
 #include "ext/standard/info.h"
-#include "kernel/include.h"
+#include "xlswriter.h"
 
 int le_xls_writer;