Skip to content

Commit f825c77

Browse files
viestviest
authored
Merge pull request #249 from viest/bundle
Bundle
2 parents 556c8f9 + 2af6b75 commit f825c77

File tree

8 files changed

+32
-81
lines changed

8 files changed

+32
-81
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "library/libxlsxwriter"]
22
path = library/libxlsxwriter
33
url = https://github.com/jmcnamara/libxlsxwriter.git
4-
branch = RELEASE_0.7.9
4+
branch = RELEASE_0.9.4
55
[submodule "library/libexpat"]
66
path = library/libexpat
77
url = https://github.com/libexpat/libexpat.git

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ branches:
3535
only:
3636
- master
3737
- dev
38+
- bundle
3839

3940
script:
4041
- ./travis/run-test.sh

‎config.m4‎

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ if test "$PHP_XLSWRITER" != "no"; then
3737

3838
libxlsxwriter_sources="
3939
library/libxlsxwriter/third_party/tmpfileplus/tmpfileplus.c \
40+
library/libxlsxwriter/third_party/md5/md5.c \
4041
library/libxlsxwriter/src/app.c \
4142
library/libxlsxwriter/src/chart.c \
43+
library/libxlsxwriter/src/chartsheet.c \
44+
library/libxlsxwriter/src/comment.c \
4245
library/libxlsxwriter/src/content_types.c \
4346
library/libxlsxwriter/src/core.c \
4447
library/libxlsxwriter/src/custom.c \
@@ -51,6 +54,7 @@ if test "$PHP_XLSWRITER" != "no"; then
5154
library/libxlsxwriter/src/styles.c \
5255
library/libxlsxwriter/src/theme.c \
5356
library/libxlsxwriter/src/utility.c \
57+
library/libxlsxwriter/src/vml.c \
5458
library/libxlsxwriter/src/workbook.c \
5559
library/libxlsxwriter/src/worksheet.c \
5660
library/libxlsxwriter/src/xmlwriter.c \
@@ -85,32 +89,11 @@ if test "$PHP_XLSWRITER" != "no"; then
8589
AC_MSG_ERROR([libxlsxwriter library not found])
8690
else
8791
PHP_ADD_INCLUDE($XLSXWRITER_DIR/include)
88-
PHP_CHECK_LIBRARY(xlsxwriter, worksheet_write_string,
92+
PHP_CHECK_LIBRARY(xlsxwriter, lxw_worksheet_find_cell_in_row,
8993
[
9094
PHP_ADD_LIBRARY_WITH_PATH(xlsxwriter, $i/$PHP_LIBDIR, XLSWRITER_SHARED_LIBADD)
9195
],[
92-
AC_MSG_ERROR([Wrong libxlsxwriter version or library not found])
93-
],[
94-
-L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
95-
])
96-
PHP_CHECK_LIBRARY(xlsxwriter, lxw_version,
97-
[
98-
AC_DEFINE(HAVE_LXW_VERSION, 1, [ lxw_version available in 0.7.9 ])
99-
],[
100-
],[
101-
-L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
102-
])
103-
PHP_CHECK_LIBRARY(xlsxwriter, lxw_chartsheet_new,
104-
[
105-
AC_DEFINE(HAVE_LXW_CHARTSHEET_NEW, 1, [ lxw_chartsheet_new available in 0.8.0 ])
106-
],[
107-
],[
108-
-L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
109-
])
110-
PHP_CHECK_LIBRARY(xlsxwriter, workbook_add_vba_project,
111-
[
112-
AC_DEFINE(HAVE_WORKBOOK_ADD_VBA_PROJECT, 1, [ workbook_add_vba_project available in 0.8.7 ])
113-
],[
96+
AC_MSG_ERROR([Wrong libxlsxwriter version or library not found, 0.9.3 required])
11497
],[
11598
-L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
11699
])
@@ -129,23 +112,6 @@ if test "$PHP_XLSWRITER" != "no"; then
129112
xls_writer_sources="$xls_writer_sources $libxlsxwriter_sources"
130113
PHP_ADD_INCLUDE([$srcdir/library/libxlsxwriter/include])
131114

132-
XLSXWRITER_VERSION=`$EGREP "define LXW_VERSION" $srcdir/library/include/libxlsxwriter/xlsxwriter.h | $SED -e 's/[[^0-9\.]]//g'`
133-
134-
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 709; then
135-
AC_DEFINE(HAVE_LXW_VERSION, 1, [ lxw_version available in 0.7.9 ])
136-
fi
137-
138-
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 800; then
139-
AC_DEFINE(HAVE_LXW_CHARTSHEET_NEW, 1, [ lxw_chartsheet_new available in 0.8.0 ])
140-
fi
141-
142-
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 807; then
143-
AC_DEFINE(HAVE_WORKBOOK_ADD_VBA_PROJECT, 1, [ workbook_add_vba_project available in 0.8.7 ])
144-
fi
145-
146-
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 808; then
147-
AC_DEFINE(HAVE_LXW_OPEN, 1, [ lxw_fopen available in 0.8.8 ])
148-
fi
149115
dnl see library/CMakeLists.txt
150116
LIBOPT="-DNOCRYPT -DNOUNCRYPT"
151117
fi
@@ -215,6 +181,7 @@ if test "$PHP_XLSWRITER" != "no"; then
215181
PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/src])
216182
PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/third_party/minizip])
217183
PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/third_party/tmpfileplus])
184+
PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/third_party/md5])
218185

219186
PHP_ADD_BUILD_DIR([$abs_builddir/library/libexpat/expat/lib])
220187
PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxio/lib])

‎config.w32‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,21 @@ if (PHP_XLSWRITER != "no") {
3636
mztools.c \
3737
unzip.c \
3838
zip.c \
39-
", "xlswriter");
39+
", "xlswriter", "libxlsxwriter");
4040

4141
ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\third_party\\tmpfileplus", "\
4242
tmpfileplus.c \
43-
", "xlswriter");
43+
", "xlswriter", "libxlsxwriter");
44+
45+
ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\third_party\\md5", "\
46+
md5.c \
47+
", "xlswriter", "libxlsxwriter");
4448

4549
ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxwriter\\src", "\
4650
app.c \
4751
chart.c \
52+
chartsheet.c \
53+
comment.c \
4854
content_types.c \
4955
core.c \
5056
custom.c \
@@ -57,6 +63,7 @@ if (PHP_XLSWRITER != "no") {
5763
styles.c \
5864
theme.c \
5965
utility.c \
66+
vml.c \
6067
workbook.c \
6168
worksheet.c \
6269
xmlwriter.c \
@@ -69,12 +76,12 @@ if (PHP_XLSWRITER != "no") {
6976
xmltok.c \
7077
xmltok_impl.c \
7178
xmltok_ns.c \
72-
", "xlswriter");
79+
", "xlswriter", "libexpat");
7380

7481
ADD_SOURCES(configure_module_dirname + "\\library\\libxlsxio\\lib", "\
7582
xlsxio_read.c \
7683
xlsxio_read_sharedstrings.c \
77-
", "xlswriter");
84+
", "xlswriter", "libxlsxio");
7885
} else {
7986
WARNING("xlswriter not enabled, xlsxwriter.lib or headers not found");
8087
}

‎kernel/write.c‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,8 @@ workbook_file(xls_resource_write_t *self)
342342
/* Add cached data to charts. */
343343
_add_chart_cache_data(self->workbook);
344344

345-
/* ugly test, new param (use_zip_64) was added in 0.8.7 with workbook_add_vba_project */
346-
#ifdef HAVE_WORKBOOK_ADD_VBA_PROJECT
347345
/* Create a packager object to assemble sub-elements into a zip file. */
348346
packager = lxw_packager_new(self->workbook->filename, self->workbook->options.tmpdir, 0);
349-
#else
350-
packager = lxw_packager_new(self->workbook->filename, self->workbook->options.tmpdir);
351-
#endif
352347

353348
/* If the packager fails it is generally due to a zip permission error. */
354349
if (packager == NULL) {
@@ -552,46 +547,29 @@ STATIC void
552547
_prepare_drawings(lxw_workbook *self)
553548
{
554549
lxw_worksheet *worksheet;
555-
#ifdef HAVE_LXW_OPEN
556550
lxw_object_properties *image_options;
557-
#else
558-
lxw_image_options *image_options;
559-
#endif
560551
uint16_t chart_ref_id = 0;
561552
uint16_t image_ref_id = 0;
562553
uint16_t drawing_id = 0;
563554

564555
STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
565556

566-
#ifdef HAVE_LXW_OPEN
567557
if (STAILQ_EMPTY(worksheet->image_props)
568-
#else
569-
if (STAILQ_EMPTY(worksheet->image_data)
570-
#endif
571558
&& STAILQ_EMPTY(worksheet->chart_data))
572559
continue;
573560

574561
drawing_id++;
575562

576563
STAILQ_FOREACH(image_options, worksheet->chart_data, list_pointers) {
577564
chart_ref_id++;
578-
#ifdef HAVE_LXW_CHARTSHEET_NEW
579565
lxw_worksheet_prepare_chart(worksheet, chart_ref_id, drawing_id,
580566
image_options, 0);
581-
#else
582-
lxw_worksheet_prepare_chart(worksheet, chart_ref_id, drawing_id,
583-
image_options);
584-
#endif
585567
if (image_options->chart)
586568
STAILQ_INSERT_TAIL(self->ordered_charts, image_options->chart,
587569
ordered_list_pointers);
588570
}
589571

590-
#ifdef HAVE_LXW_OPEN
591572
STAILQ_FOREACH(image_options, worksheet->image_props, list_pointers) {
592-
#else
593-
STAILQ_FOREACH(image_options, worksheet->image_data, list_pointers) {
594-
#endif
595573

596574
if (image_options->image_type == LXW_IMAGE_PNG)
597575
self->has_png = LXW_TRUE;
@@ -940,7 +918,7 @@ _populate_range_data_cache(lxw_workbook *self, lxw_series_range *range)
940918
return;
941919
}
942920

943-
cell_obj = lxw_worksheet_find_cell(row_obj, col_num);
921+
cell_obj = lxw_worksheet_find_cell_in_row(row_obj, col_num);
944922

945923
if (cell_obj) {
946924
if (cell_obj->type == NUMBER_CELL) {

‎library/libxlsxwriter‎

Submodule libxlsxwriter updated 1026 files

‎package.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,16 @@
188188
<file name="tests/const_memory_index_out_range.phpt" role="test" />
189189
<file name="tests/default_format.phpt" role="test" />
190190
<file name="tests/fix-207.phpt" role="test" />
191-
<file md5sum="df2a6af4ced4ea7660a1691d18e75e8c" name="tests/format_align.phpt" role="test" />
192-
<file md5sum="6f9186fb9d8eb2ad4d96d149c97ef5f8" name="tests/format_background.phpt" role="test" />
193-
<file md5sum="c67d20fdc2f1d4b4b429ac905cb4cbf9" name="tests/format_border.phpt" role="test" />
194-
<file md5sum="666669e50723870fe7fc7ebbb3354cb4" name="tests/format_font.phpt" role="test" />
195-
<file md5sum="c4d791e16e40e172ebc516520cf35e5f" name="tests/format_font_color.phpt" role="test" />
196-
<file md5sum="cf25b25c4320818e5c54041d154ddc78" name="tests/format_font_size.phpt" role="test" />
197-
<file md5sum="4dfaa3f81e9c7138aca39da99a67f270" name="tests/format_font_strikeout.phpt" role="test" />
198-
<file md5sum="c32a045fc8d621cbbaf8f00008ddb8b5" name="tests/format_number.phpt" role="test" />
199-
<file md5sum="f9c233fedf10a2bbb2ac5534cf8f20ef" name="tests/format_wrap.phpt" role="test" />
200-
<file md5sum="4d46bc759ff8d41c8c919a0f50c595b0" name="tests/freeze_panes.phpt" role="test" />
191+
<file name="tests/format_align.phpt" role="test" />
192+
<file name="tests/format_background.phpt" role="test" />
193+
<file name="tests/format_border.phpt" role="test" />
194+
<file name="tests/format_font.phpt" role="test" />
195+
<file name="tests/format_font_color.phpt" role="test" />
196+
<file name="tests/format_font_size.phpt" role="test" />
197+
<file name="tests/format_font_strikeout.phpt" role="test" />
198+
<file name="tests/format_number.phpt" role="test" />
199+
<file name="tests/format_wrap.phpt" role="test" />
200+
<file name="tests/freeze_panes.phpt" role="test" />
201201
<file name="tests/gridlines.phpt" role="test" />
202202
<file name="tests/header_format.phpt" role="test" />
203203
<file md5sum="b4c6f2949c46ab89099e5f971f152a1f" name="tests/image_no_styles.phpt" role="test" />

‎xlswriter.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,8 @@ PHP_MINFO_FUNCTION(xlswriter)
8282
#ifdef HAVE_LIBXLSXWRITER
8383
/* Build time */
8484
php_info_print_table_row(2, "libxlsxwriter headers version", LXW_VERSION);
85-
#ifdef HAVE_LXW_VERSION
8685
/* Run time, available since 0.7.9 */
8786
php_info_print_table_row(2, "libxlsxwriter library version", lxw_version());
88-
#endif
8987
#else
9088
php_info_print_table_row(2, "bundled libxlsxwriter version", LXW_VERSION);
9189
#endif

0 commit comments

Comments
 (0)