Ver Fonte

update bundle

viest há 5 anos atrás
pai
commit
2af6b75119
5 ficheiros alterados com 16 adições e 6 exclusões
  1. 2 0
      .gitignore
  2. 1 1
      .gitmodules
  3. 1 0
      .travis.yml
  4. 11 4
      config.w32
  5. 1 1
      library/libxlsxwriter

+ 2 - 0
.gitignore

@@ -2,6 +2,8 @@
 *.lo
 *.la
 .libs
+.dockerignore
+Dockerfile
 debug
 debug.php
 php

+ 1 - 1
.gitmodules

@@ -1,7 +1,7 @@
 [submodule "library/libxlsxwriter"]
 	path = library/libxlsxwriter
 	url = https://github.com/jmcnamara/libxlsxwriter.git
-	branch = RELEASE_0.7.9
+	branch = RELEASE_0.9.4
 [submodule "library/libexpat"]
 	path = library/libexpat
 	url = https://github.com/libexpat/libexpat.git

+ 1 - 0
.travis.yml

@@ -35,6 +35,7 @@ branches:
   only:
     - master
     - dev
+    - bundle
 
 script:
     - ./travis/run-test.sh

+ 11 - 4
config.w32

@@ -35,15 +35,21 @@ if (PHP_XLSWRITER != "no") {
                 mztools.c \
                 unzip.c \
                 zip.c \
-                ", "xlswriter");
+                ", "xlswriter", "libxlsxwriter");
 
         ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\third_party\\tmpfileplus", "\
                 tmpfileplus.c \
-                ", "xlswriter");
+                ", "xlswriter", "libxlsxwriter");
+
+        ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\third_party\\md5", "\
+                md5.c \
+                ", "xlswriter", "libxlsxwriter");
 
         ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\src", "\
                 app.c \
                 chart.c \
+                chartsheet.c \
+                comment.c \
                 content_types.c \
                 core.c \
                 custom.c \
@@ -56,6 +62,7 @@ if (PHP_XLSWRITER != "no") {
                 styles.c \
                 theme.c \
                 utility.c \
+                vml.c \
                 workbook.c \
                 worksheet.c \
                 xmlwriter.c \
@@ -68,12 +75,12 @@ if (PHP_XLSWRITER != "no") {
                 xmltok.c \
                 xmltok_impl.c \
                 xmltok_ns.c \
-                ", "xlswriter");
+                ", "xlswriter", "libexpat");
 
         ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxio\\lib", "\
                 xlsxio_read.c \
                 xlsxio_read_sharedstrings.c \
-                ", "xlswriter");
+                ", "xlswriter", "libxlsxio");
     } else {
         WARNING("xlswriter not enabled, xlsxwriter.lib or headers not found");
     }

+ 1 - 1
library/libxlsxwriter

@@ -1 +1 @@
-Subproject commit 5de3c005c60545d75fc10a66c4a8ac2be60fd2b1
+Subproject commit 559e391cd182599448121a528b8f4b94fda3660d