xlsxwriter 0.2.1.pre.2 → 0.2.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785d6f62717613d9737bd4879dedc8077ac690de96bf3f4fafd7b2c7917956c9
-  data.tar.gz: 73d5337504d25eb891c34eeaa37fcebfa5961dd9e5d49276d27243198287af8a
+  metadata.gz: 5bf5fbd1b3f4d6e80dc28c189f63478ff9a7d6253e6630abf697ebfd5c9b7cb5
+  data.tar.gz: a75bd6805709c6688497e5df0bcc9a4b3a53b94361e7cc09d9d67843f2cd0501
 SHA512:
-  metadata.gz: c0b99c9b0b3bf2ce4499f33acceda7596910beede83721018a38c04ae4b754b56b793b861bb5af59dc0bcdbeb55f473eaa7b9b16c34cef021575c14ec001c382
-  data.tar.gz: 00e8d80d92f11aec6366f3ead33d64251787d54cffb77bfd0769299079d904595ed22d5eaaa8dcc40d4a098eedfeecdf4d553a0a0a30f1a8710c4be8f33577e0
+  metadata.gz: d5be08fe10209e21d0956b58366fb06a0480f8f0145e3607cffeb78ecc12b0eec375a450165384278a0a0770a4d409c1e4bd9f3bb9852297c421cae481d10591
+  data.tar.gz: 83d7ed483b2f2245b5fc4f22afeca555f8216eb1f084504df8075855c50a49a96b24878638b6a63a8e8eb84c1dcdca46c4c3c92bba37c9de85a6ea73a0b887fe

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rake/extensiontask'
 
 task default: :test
@@ -12,9 +13,9 @@ Rake::Task['compile'].prerequisites.unshift :patch_dep
 Gem::PackageTask.new(spec) do |pkg|
 end
 
-DEP_DIR='ext/xlsxwriter/libxlsxwriter'
+DEP_DIR = 'ext/xlsxwriter/libxlsxwriter'
 
-desc "Checkout xlsxwriter C library"
+desc 'Checkout xlsxwriter C library'
 task :patch_dep do
   patches = Dir["#{pwd}/dep_patches/*.patch"]
   chdir(DEP_DIR) do
@@ -30,5 +31,5 @@ end
 
 desc 'Run specs'
 task test: :compile do
-  ruby('test/run-test.rb')
+  ruby 'test/run_test.rb'
 end

data/ext/xlsxwriter/chart.c

@@ -10,9 +10,57 @@ VALUE cChart;
 VALUE cChartSeries;
 VALUE cChartAxis;
 
+size_t
+chart_size(const void *data) {
+  return sizeof(struct chart);
+}
+
+const rb_data_type_t chart_type = {
+	.wrap_struct_name = "chart",
+	.function = {
+		.dmark = NULL,
+		.dfree = ruby_xfree,
+		.dsize = chart_size,
+	},
+	.data = NULL,
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+size_t
+chart_axis_size(const void *data) {
+  return sizeof(struct chart_axis);
+}
+
+const rb_data_type_t chart_axis_type = {
+  .wrap_struct_name = "chart_axis",
+  .function = {
+    .dmark = NULL,
+    .dfree = ruby_xfree,
+    .dsize = chart_axis_size,
+  },
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+size_t
+chart_series_size(const void *data) {
+  return sizeof(struct chart_series);
+}
+
+const rb_data_type_t chart_series_type = {
+  .wrap_struct_name = "chart_series",
+  .function = {
+    .dmark = NULL,
+    .dfree = ruby_xfree,
+    .dsize = chart_series_size,
+  },
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 #define DEF_PROP_SETTER(type, field, value) VALUE type ## _set_ ## field ## _ (VALUE self, VALUE val) { \
     struct type *ptr;                                                   \
-    Data_Get_Struct(self, struct type, ptr);                            \
+    TypedData_Get_Struct(self, struct type, &(type ## _type), ptr);     \
     type ## _set_ ## field (ptr->type, value);                          \
     return val;                                                         \
 }
@@ -20,10 +68,8 @@ VALUE cChartAxis;
 
 VALUE
 chart_alloc(VALUE klass) {
-  VALUE obj;
   struct chart *ptr;
-
-  obj = Data_Make_Struct(klass, struct chart, NULL, NULL, ptr);
+  VALUE obj = TypedData_Make_Struct(klass, struct chart, &chart_type, ptr);
 
   ptr->chart = NULL;
 
@@ -36,8 +82,8 @@ chart_init(VALUE self, VALUE workbook, VALUE type) {
   struct chart *ptr;
   struct workbook *wb_ptr;
 
-  Data_Get_Struct(workbook, struct workbook, wb_ptr);
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(workbook, struct workbook, &workbook_type, wb_ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   if (wb_ptr && wb_ptr->workbook) {
     ptr->chart = workbook_add_chart(wb_ptr->workbook, NUM2INT(type));
   }
@@ -52,7 +98,7 @@ chart_axis_alloc(VALUE klass) {
   VALUE obj;
   struct chart_axis *ptr;
 
-  obj = Data_Make_Struct(klass, struct chart_axis, NULL, NULL, ptr);
+  obj = TypedData_Make_Struct(klass, struct chart_axis, &chart_axis_type, ptr);
 
   return obj;
 }
@@ -63,8 +109,8 @@ chart_axis_init(VALUE self, VALUE chart, VALUE type) {
   struct chart_axis *ptr;
   struct chart *c_ptr;
 
-  Data_Get_Struct(chart, struct chart, c_ptr);
-  Data_Get_Struct(self, struct chart_axis, ptr);
+  TypedData_Get_Struct(chart, struct chart, &chart_type, c_ptr);
+  TypedData_Get_Struct(self, struct chart_axis, &chart_axis_type, ptr);
   rb_iv_set(self, "@chart", chart);
   if (c_ptr && c_ptr->chart) {
     ID axis = rb_check_id_cstr("x", 1, NULL);
@@ -92,7 +138,7 @@ chart_series_alloc(VALUE klass) {
   VALUE obj;
   struct chart_series *ptr;
 
-  obj = Data_Make_Struct(klass, struct chart_series, NULL, NULL, ptr);
+  obj = TypedData_Make_Struct(klass, struct chart_series, &chart_series_type, ptr);
 
   ptr->chart_series = NULL;
 
@@ -107,8 +153,8 @@ chart_series_init(int argc, VALUE *argv, VALUE self) {
   char *cats = NULL, *vals = NULL;
   rb_check_arity(argc, 1, 3);
 
-  Data_Get_Struct(argv[0], struct chart, c_ptr);
-  Data_Get_Struct(self, struct chart_series, ptr);
+  TypedData_Get_Struct(argv[0], struct chart, &chart_type, c_ptr);
+  TypedData_Get_Struct(self, struct chart_series, &chart_series_type, ptr);
 
   if (argc > 2) {
     cats = StringValueCStr(argv[1]);
@@ -160,7 +206,7 @@ chart_y_axis_(VALUE self) {
 VALUE
 chart_title_set_name_(VALUE self, VALUE name) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
 
   if (RTEST(name)) {
     chart_title_set_name(ptr->chart, StringValueCStr(name));
@@ -253,12 +299,23 @@ DEF_PROP_SETTER(chart, rotation, NUM2UINT(rb_check_to_int(val)))
  */
 DEF_PROP_SETTER(chart, hole_size, NUM2UINT(rb_check_to_int(val)))
 
+/* Document-method: XlsxWriter::Workbook::Chart#show_blanks_as=
+ *
+ */
+VALUE
+chart_set_show_blank_as_(VALUE self, VALUE val) {
+  struct chart *ptr;
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
+  ptr->chart->show_blanks_as = NUM2INT(rb_check_to_int(val));
+  return val;
+}
+
 
 /* :nodoc: */
 VALUE
 chart_get_axis_id_1_(VALUE self) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   return UINT2NUM(ptr->chart->axis_id_1);
 }
 
@@ -266,8 +323,8 @@ chart_get_axis_id_1_(VALUE self) {
 VALUE
 chart_set_axis_id_1_(VALUE self, VALUE val) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_1 = NUM2UINT(val);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
+  ptr->chart->axis_id_1 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -275,7 +332,7 @@ chart_set_axis_id_1_(VALUE self, VALUE val) {
 VALUE
 chart_get_axis_id_2_(VALUE self) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   return UINT2NUM(ptr->chart->axis_id_2);
 }
 
@@ -283,8 +340,8 @@ chart_get_axis_id_2_(VALUE self) {
 VALUE
 chart_set_axis_id_2_(VALUE self, VALUE val) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_2 = NUM2UINT(val);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
+  ptr->chart->axis_id_2 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -445,7 +502,7 @@ VALUE
 chart_axis_set_source_linked_(VALUE self, VALUE val) {
   struct chart_axis *ptr;
 
-  Data_Get_Struct(self, struct chart_axis, ptr);
+  TypedData_Get_Struct(self, struct chart_axis, &chart_axis_type, ptr);
 
   ptr->chart_axis->source_linked = NUM2UINT(rb_check_to_int(val));
 
@@ -611,17 +668,20 @@ void init_xlsxwriter_chart() {
 
 
   rb_define_alloc_func(cChart, chart_alloc);
+  rb_define_attr(cChart, "workbook", 1, 0);
   rb_define_method(cChart, "initialize", chart_init, 2);
   rb_define_method(cChart, "add_series", chart_add_series_, -1);
   rb_define_method(cChart, "x_axis", chart_x_axis_, 0);
   rb_define_method(cChart, "y_axis", chart_y_axis_, 0);
   rb_define_method(cChart, "title=", chart_title_set_name_, 1);
+  rb_define_method(cChart, "set_name_range", chart_title_set_name_range_, -1);
   rb_define_method(cChart, "legend_position=", chart_legend_set_position_, 1);
   rb_define_method(cChart, "legend_set_font", chart_legend_set_font_, 1);
   rb_define_method(cChart, "legend_delete_series", chart_legend_delete_series_, 1);
   rb_define_method(cChart, "style=", chart_set_style_, 1);
   rb_define_method(cChart, "rotation=", chart_set_rotation_, 1);
   rb_define_method(cChart, "hole_size=", chart_set_hole_size_, 1);
+  rb_define_method(cChart, "show_blank_as=", chart_set_show_blank_as_, 1);
 
   rb_define_method(cChart, "axis_id_1",  chart_get_axis_id_1_, 0);
   rb_define_method(cChart, "axis_id_1=", chart_set_axis_id_1_, 1);
@@ -700,6 +760,10 @@ void init_xlsxwriter_chart() {
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_CENTER);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_LEFT);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_RIGHT);
+
+  MAP_CHART_CONST(BLANKS_AS_GAP);
+  MAP_CHART_CONST(BLANKS_AS_ZERO);
+  MAP_CHART_CONST(BLANKS_AS_CONNECTED);
 #undef MAP_CHART_CONST
 
 #define MAP_CHART_AXIS_CONST(name) rb_define_const(cChartAxis, #name, INT2NUM(LXW_CHART_AXIS_##name))

data/ext/xlsxwriter/chart.h

@@ -25,5 +25,6 @@ void init_xlsxwriter_chart();
 extern VALUE cChart;
 extern VALUE cChartSeries;
 extern VALUE cChartAxis;
+extern const rb_data_type_t chart_type;
 
 #endif // __CHART__

data/ext/xlsxwriter/chartsheet.c

@@ -6,15 +6,31 @@
 
 VALUE cChartsheet;
 
+void chartsheet_clear(void *p);
 void chartsheet_free(void *p);
 
+size_t
+chartsheet_size(const void *data) {
+  return sizeof(struct chartsheet);
+}
+
+const rb_data_type_t chartsheet_type = {
+	.wrap_struct_name = "chartsheet",
+	.function = {
+		.dmark = NULL,
+		.dfree = chartsheet_free,
+		.dsize = chartsheet_size,
+	},
+	.data = NULL,
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 VALUE
 chartsheet_alloc(VALUE klass) {
   VALUE obj;
   struct chartsheet *ptr;
 
-  obj = Data_Make_Struct(klass, struct chartsheet, NULL, chartsheet_free, ptr);
+  obj = TypedData_Make_Struct(klass, struct chartsheet, &chartsheet_type, ptr);
 
   ptr->chartsheet = NULL;
 
@@ -28,7 +44,7 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
   struct workbook *wb_ptr;
   struct chartsheet *ptr;
 
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
 
   if (argc == 2) {
     name = StringValueCStr(argv[1]);
@@ -36,7 +52,7 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
 
   rb_iv_set(self, "@workbook", argv[0]);
 
-  Data_Get_Struct(argv[0], struct workbook, wb_ptr);
+  TypedData_Get_Struct(argv[0], struct workbook, &workbook_type, wb_ptr);
   ptr->chartsheet = workbook_add_chartsheet(wb_ptr->workbook, name);
   if (!ptr->chartsheet)
     rb_raise(eXlsxWriterError, "chartsheet was not created");
@@ -47,20 +63,25 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
 VALUE
 chartsheet_release(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
 
-  chartsheet_free(ptr);
+  chartsheet_clear(ptr);
   return self;
 }
 
 void
-chartsheet_free(void *p) {
+chartsheet_clear(void *p) {
   struct chartsheet *ptr = p;
 
   if (ptr->chartsheet)
     ptr->chartsheet = NULL;
 }
 
+void
+chartsheet_free(void *p) {
+  chartsheet_clear(p);
+  ruby_xfree(p);
+}
 
 /*  call-seq: cs.activate -> self
  *
@@ -79,7 +100,7 @@ chartsheet_activate_(VALUE self) {
 VALUE
 chartsheet_set_chart_(VALUE self, VALUE chart) {
   struct chart *chart_ptr;
-  Data_Get_Struct(chart, struct chart, chart_ptr);
+  TypedData_Get_Struct(chart, struct chart, &chart_type, chart_ptr);
 
   LXW_ERR_RESULT_CALL(chartsheet, set_chart, chart_ptr->chart);
   return self;
@@ -139,7 +160,7 @@ chartsheet_set_footer_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = chartsheet_set_footer(ptr->chartsheet, ho.str);
@@ -169,7 +190,7 @@ chartsheet_set_header_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = chartsheet_set_header(ptr->chartsheet, ho.str);
@@ -236,7 +257,7 @@ chartsheet_set_zoom_(VALUE self, VALUE val) {
 VALUE
 chartsheet_get_horizontal_dpi_(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   return INT2NUM(ptr->chartsheet->worksheet->horizontal_dpi);
 }
 
@@ -247,7 +268,7 @@ chartsheet_get_horizontal_dpi_(VALUE self) {
 VALUE
 chartsheet_set_horizontal_dpi_(VALUE self, VALUE val) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   ptr->chartsheet->worksheet->horizontal_dpi = NUM2INT(val);
   return val;
 }
@@ -259,7 +280,7 @@ chartsheet_set_horizontal_dpi_(VALUE self, VALUE val) {
 VALUE
 chartsheet_get_vertical_dpi_(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   return INT2NUM(ptr->chartsheet->worksheet->vertical_dpi);
 }
 
@@ -270,7 +291,7 @@ chartsheet_get_vertical_dpi_(VALUE self) {
 VALUE
 chartsheet_set_vertical_dpi_(VALUE self, VALUE val) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   ptr->chartsheet->worksheet->vertical_dpi = NUM2INT(val);
   return val;
 }

data/ext/xlsxwriter/common.h

@@ -1,18 +1,18 @@
 #include <ruby.h>
 #include <ruby/intern.h>
-#include <xlsxwriter_ext.h>
+#include "xlsxwriter_ext.h"
 
 #ifndef __COMMON__
 #define __COMMON__
 
 #define LXW_NO_RESULT_CALL(cls, method, ...) {  \
   struct cls *ptr;                              \
-  Data_Get_Struct(self, struct cls, ptr);       \
+  TypedData_Get_Struct(self, struct cls, &(cls ## _type), ptr); \
   cls ## _ ## method(ptr->cls, ##__VA_ARGS__); }
 
 #define LXW_ERR_RESULT_CALL(cls, method, ...) {      \
     struct cls *ptr;                                \
-    Data_Get_Struct(self, struct cls, ptr);         \
+    TypedData_Get_Struct(self, struct cls, &(cls ## _type), ptr);             \
     lxw_error err = cls ## _ ## method(ptr->cls, ##__VA_ARGS__); \
     handle_lxw_error(err); }
 
@@ -38,7 +38,7 @@ _extract_protect_options(int argc, VALUE *argv) {
       opts = argv[0];
       break;
     default:
-      rb_raise(rb_eArgError, "Wrong argument %"PRIsVALUE", expected a String or Hash", rb_obj_class(argv[0]));
+      rb_raise(rb_eArgError, "Wrong argument %" PRIsVALUE ", expected a String or Hash", rb_obj_class(argv[0]));
     }
   }
 
@@ -46,7 +46,7 @@ _extract_protect_options(int argc, VALUE *argv) {
     if (TYPE(argv[1]) == T_HASH) {
       opts = argv[1];
     } else {
-      rb_raise(rb_eArgError, "Expected a Hash, but got %"PRIsVALUE, rb_obj_class(argv[1]));
+      rb_raise(rb_eArgError, "Expected a Hash, but got %" PRIsVALUE, rb_obj_class(argv[1]));
     }
   }
 

data/ext/xlsxwriter/extconf.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 require 'mkmf'
+require 'English'
 
-libxlsxwriter_dir = File.expand_path('../libxlsxwriter', __FILE__)
-make_pid = spawn({'CFLAGS' => '-fPIC -O2'}, $make, chdir: libxlsxwriter_dir)
+libxlsxwriter_dir = File.expand_path('libxlsxwriter', __dir__)
+make_pid = spawn({ 'CFLAGS' => '-fPIC -O2' }, $make, chdir: libxlsxwriter_dir)
 Process.wait(make_pid)
-raise 'Make failed for xlsxwriter' unless $? == 0
+raise 'Make failed for xlsxwriter' unless $CHILD_STATUS.success?
 
-# enable_config('static', true)
-# find_library('xlsxwriter', 'workbook_new', File.expand_path('../libxlsxwriter/lib', __FILE__))
-$CFLAGS="-I'#{libxlsxwriter_dir}/include' -g -Wall -O2"
-# $LDFLAGS="-L./libxlsxwriter/lib/ -Wl,-Bstatic -lxlsxwriter -Wl,-Bdynamic"
-$LDFLAGS="-lz #{libxlsxwriter_dir}/lib/libxlsxwriter.a"
+$CFLAGS = "-I'#{libxlsxwriter_dir}/include' -g -Wall -Werror -O2"
+$LDFLAGS = "-lz #{libxlsxwriter_dir}/lib/libxlsxwriter.a"
 
 create_makefile 'xlsxwriter/xlsxwriter'

data/ext/xlsxwriter/libxlsxwriter/License.txt

@@ -4,7 +4,7 @@
 
 Libxlsxwriter is released under a FreeBSD license:
 
-    Copyright 2014-2019, John McNamara <jmcnamara@cpan.org>
+    Copyright 2014-2020, John McNamara <jmcnamara@cpan.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,8 @@ Libxlsxwriter is released under a FreeBSD license:
 
 
 Libxlsxwriter includes `queue.h` and `tree.h` from FreeBSD, the `minizip`
-component of `zlib` and `tmpfileplus` which have the following licenses:
+component of `zlib`, `tmpfileplus` and `md5` which have the following
+licenses:
 
 
 Queue.h from FreeBSD:
@@ -146,5 +147,26 @@ See the [Mozilla Public License, v. 2.0](http://mozilla.org/MPL/2.0/).
 Note, it is possible to compile libxlsxwriter using the standard library
 `tmpfile()` function instead of `tmpfileplus`, see @ref gsg_tmpdir.
 
+[Openwall MD5](https://openwall.info/wiki/people/solar/software/public-domain-source-code/md5)
+has the following licence:
+
+    This software was written by Alexander Peslyak in 2001.  No copyright is
+    claimed, and the software is hereby placed in the public domain.
+    In case this attempt to disclaim copyright and place the software in the
+    public domain is deemed null and void, then the software is
+    Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+    general public under the following terms:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted.
+
+    There's ABSOLUTELY NO WARRANTY, express or implied.
+
+    (This is a heavily cut-down "BSD license".)
+
+Note, the MD5 library is used to avoid including duplicate image files in the
+xlsx file. If this functionality isn't required it is possible to compile
+libxlsxwriter without this library by passing `USE_NO_MD5=1` to make.
+
 Next: @ref changes
 */

data/ext/xlsxwriter/libxlsxwriter/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter library.
 #
-# Copyright 2014-2019, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2020, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.
@@ -11,9 +11,11 @@ ifdef V
 Q=
 endif
 
-INSTALL_DIR ?= /usr/local
+DESTDIR ?=
+PREFIX  ?= /usr/local
 
 PYTEST ?= py.test
+PYTESTFILES ?= test
 
 .PHONY: docs tags examples
 
@@ -24,6 +26,9 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src
 
@@ -41,15 +46,18 @@ clean :
 	$(Q)rm -rf test/functional/__pycache__
 	$(Q)rm -f  test/functional/*.pyc
 	$(Q)rm -f  lib/*
-ifndef USE_STANDARD_TMPFILE
+ifndef USE_SYSTEM_MINIZIP
 	$(Q)$(MAKE) clean -C third_party/minizip
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) clean -C third_party/tmpfileplus
 endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) clean -C third_party/md5
+endif
 
 # Run the unit tests.
-test : all test_functional test_unit
+test : all test_unit test_functional
 
 # Test for C++ const correctness on APIs.
 test_const : all
@@ -60,7 +68,7 @@ test_const : all
 # Run the functional tests.
 test_functional : all
 	$(Q)$(MAKE) -C test/functional/src
-	$(Q)$(PYTEST) test/functional -v
+	$(Q)$(PYTEST) test/functional -v -k $(PYTESTFILES)
 
 # Run all tests.
 test_unit :
@@ -70,10 +78,26 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src test_lib
 	$(Q)$(MAKE) -C test/unit test
 
+# Test Cmake. This test should really be done with Cmake in the cmake dir but
+# this is a workaround for now.
+test_cmake :
+ifneq ($(findstring m32,$(CFLAGS)),m32)
+	$(Q)$(MAKE) -C src clean
+	$(Q)cd cmake; cmake .. -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON; make clean; make; cp libxlsxwriter.a ../src/
+	$(Q)cmake/xlsxwriter_unit
+	$(Q)$(MAKE) -C test/functional/src
+	$(Q)$(PYTEST) test/functional -v -k $(PYTESTFILES)
+else
+	@echo "Skipping Cmake tests on 32 bit target."
+endif
+
 # Test the functional test exes with valgrind (in 64bit mode only).
 test_valgrind : all
 ifndef NO_VALGRIND
@@ -98,17 +122,20 @@ doc: docs
 docs:
 	$(Q)$(MAKE) -C docs
 
+docs_doxygen_only:
+	$(Q)$(MAKE) -C docs docs_doxygen_only
+
 # Simple minded install.
 install: all
-	$(Q)mkdir -p        $(INSTALL_DIR)/include
-	$(Q)cp -R include/* $(INSTALL_DIR)/include
-	$(Q)mkdir -p        $(INSTALL_DIR)/lib
-	$(Q)cp lib/*        $(INSTALL_DIR)/lib
+	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/include
+	$(Q)cp -R include/* $(DESTDIR)$(PREFIX)/include
+	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/lib
+	$(Q)cp lib/*        $(DESTDIR)$(PREFIX)/lib
 
 # Simpler minded uninstall.
 uninstall:
-	$(Q)rm -rf $(INSTALL_DIR)/include/xlsxwriter*
-	$(Q)rm     $(INSTALL_DIR)/lib/libxlsxwriter.*
+	$(Q)rm -rf $(DESTDIR)$(PREFIX)/include/xlsxwriter*
+	$(Q)rm     $(DESTDIR)$(PREFIX)/lib/libxlsxwriter.*
 
 # Strip the lib files.
 strip:
@@ -121,12 +148,15 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
 	$(Q)rm -rf  cov-int
 	$(Q)rm -f libxlsxwriter-coverity.tgz
-	$(Q)../../cov-analysis-linux64-8.7.0/bin/cov-build --dir cov-int make -C src libxlsxwriter.a
+	$(Q)../../cov-analysis-linux64-2019.03/bin/cov-build --dir cov-int make -C src libxlsxwriter.a
 	$(Q)tar -czf libxlsxwriter-coverity.tgz cov-int
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
@@ -138,6 +168,9 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
@@ -152,6 +185,7 @@ spellcheck:
 	$(Q)for f in examples/*.c;           do aspell --lang=en_US --check $$f; done
 	$(Q)aspell --lang=en_US --check Changes.txt
 	$(Q)aspell --lang=en_US --check Readme.md
+	$(Q)aspell --lang=en_US --check docs/src/examples.txt
 
 releasecheck:
 	$(Q)dev/release/release_check.sh

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/app.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * app - A libxlsxwriter library for creating Excel XLSX app files.
  *