Skip to content

Commit 951c831

Browse files
viestviest
authored
Merge pull request #94 from viest/dev
fix : build bunled library version, fixes #90
2 parents 39b8062 + c02e3b5 commit 951c831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+266
-42609
lines changed

‎.appveyor.yml‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,26 @@ install:
2323
7z x c:\build-cache\$bname -oc:\build-cache
2424
move c:\build-cache\$dname0 c:\build-cache\$dname1
2525
}
26-
$lname2 = 'zlib-1.2.11.tar.gz'
27-
$lname3 = 'zlib'
26+
$lname0 = 'zlib-' + $env:ZLIB_VER + '-' + $env:VC + '-' + $env:ARCH + '.zip'
27+
$lname1 = 'zlib'
28+
if (-not (Test-Path c:\build-cache\$lname0)) {
29+
$zliurl = "https://windows.php.net/downloads/php-sdk/deps/" + $env:VC + "/" + $env:ARCH+ "/" + $lname0
30+
Invoke-WebRequest $zliurl -OutFile "c:\build-cache\$lname0"
31+
}
32+
if (-not (Test-Path c:\build-cache\$lname1)) {
33+
& 7z x c:\build-cache\$lname0 -oc:\build-cache\$lname1
34+
}
35+
$lname2 = 'libxlsxwriter-' + $env:LIBXLSXWRITER_VER + '-' + $env:VC + '-' + $env:ARCH + '.zip'
36+
$lname3 = 'libxlsxwriter'
2837
if (-not (Test-Path c:\build-cache\$lname2)) {
29-
$zliurl = "http://zlib.net/" + $lname2
30-
Invoke-WebRequest $zliurl -OutFile "c:\build-cache\$lname2"
38+
$url = "https://windows.php.net/downloads/pecl/deps/" + $lname2
39+
Invoke-WebRequest $url -OutFile "c:\build-cache\$lname2"
3140
}
3241
if (-not (Test-Path c:\build-cache\$lname3)) {
33-
& 7z x c:\build-cache\$lname2 -oc:\build-cache
34-
& 7z x c:\build-cache\zlib-1.2.11.tar -oc:\build-cache\$lname3
35-
}
36-
if (-not (Test-Path c:\build-cache\$lname3\Release)) {
37-
cd c:\build-cache\$lname3\zlib-1.2.11
38-
$cmakegen = 'Visual Studio 15 2017'
39-
if ($env:VC -Match "vc14") {
40-
$cmakegen = "Visual Studio 14 2015"
41-
}
42-
& cmake -G $cmakegen -DCMAKE_BUILD_TYPE="Release" -DCMAKE_C_FLAGS_RELEASE="/MT"
43-
& cmake --build . --config "Release"
42+
& 7z x c:\build-cache\$lname2 -oc:\build-cache\$lname3
4443
}
44+
move c:\build-cache\zlib\lib\*.* c:\build-cache\libxlsxwriter\lib
45+
move c:\build-cache\zlib\include\*.* c:\build-cache\libxlsxwriter\include
4546
4647
cache:
4748
c:\build-cache -> .appveyor.yml
@@ -54,61 +55,73 @@ environment:
5455
ARCH: x64
5556
VC: vc14
5657
PHP_VER: 7.0.28
58+
ZLIB_VER: 1.2.8
5759
TS: 0
5860
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
5961
ARCH: x64
6062
VC: vc14
6163
PHP_VER: 7.0.28
64+
ZLIB_VER: 1.2.8
6265
TS: 1
6366
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
6467
ARCH: x86
6568
VC: vc14
6669
PHP_VER: 7.0.28
70+
ZLIB_VER: 1.2.8
6771
TS: 0
6872
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
6973
ARCH: x86
7074
VC: vc14
7175
PHP_VER: 7.0.28
76+
ZLIB_VER: 1.2.8
7277
TS: 1
7378
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
7479
ARCH: x64
7580
VC: vc14
7681
PHP_VER: 7.1.15
82+
ZLIB_VER: 1.2.8
7783
TS: 0
7884
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
7985
ARCH: x64
8086
VC: vc14
8187
PHP_VER: 7.1.15
88+
ZLIB_VER: 1.2.8
8289
TS: 1
8390
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
8491
ARCH: x86
8592
VC: vc14
8693
PHP_VER: 7.1.15
94+
ZLIB_VER: 1.2.8
8795
TS: 0
8896
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
8997
ARCH: x86
9098
VC: vc14
9199
PHP_VER: 7.1.15
100+
ZLIB_VER: 1.2.8
92101
TS: 1
93102
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
94103
ARCH: x64
95104
VC: vc15
96105
PHP_VER: 7.2.3
106+
ZLIB_VER: 1.2.11
97107
TS: 0
98108
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
99109
ARCH: x64
100110
VC: vc15
101111
PHP_VER: 7.2.3
112+
ZLIB_VER: 1.2.11
102113
TS: 1
103114
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
104115
ARCH: x86
105116
VC: vc15
106117
PHP_VER: 7.2.3
118+
ZLIB_VER: 1.2.11
107119
TS: 0
108120
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
109121
ARCH: x86
110122
VC: vc15
111123
PHP_VER: 7.2.3
124+
ZLIB_VER: 1.2.11
112125
TS: 1
113126

114127
build_script:
@@ -134,7 +147,7 @@ build_script:
134147
#echo "" | Out-File -Encoding "ASCII" -Append task.bat
135148
echo "" | Out-File -Encoding "ASCII" task.bat
136149
echo "call phpize 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
137-
$conf_cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\zlib-1.2.11\Release --with-extra-includes=c:\build-cache\zlib\zlib-1.2.11 --enable-debug-pack 2>&1'
150+
$conf_cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\libxlsxwriter\lib --with-extra-includes=c:\build-cache\libxlsxwriter\include --enable-debug-pack 2>&1'
138151
echo $conf_cmd | Out-File -Encoding "ASCII" -Append task.bat
139152
echo "nmake /nologo 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
140153
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat
@@ -152,7 +165,7 @@ after_build:
152165
if ('x64' -eq $env:ARCH) { $dir = $dir + 'x64\' }
153166
$dir = $dir + 'Release'
154167
if ('1' -eq $env:TS) { $dir = $dir + '_TS' }
155-
& 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE
168+
& 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE c:\build-cache\libxlsxwriter\lib\xlsxwriter.lib c:\build-cache\libxlsxwriter\lib\xlsxwriter.pdb
156169
Push-AppveyorArtifact c:\$zip_bname
157170
158171
test_script:
@@ -173,7 +186,7 @@ test_script:
173186
cd c:\projects\xlswriter
174187
echo "" | Out-File -Encoding "ASCII" task.bat
175188
echo "set REPORT_EXIT_STATUS=1" | Out-File -Encoding "ASCII" -Append task.bat
176-
$cmd = 'call configure --with-xlswriter --with-xlswriter --with-extra-libs=c:\build-cache\zlib\zlib-1.2.11\Release --with-extra-includes=c:\build-cache\zlib\zlib-1.2.11 --with-prefix=c:\build-cache\' + $dname + ' 2>&1'
189+
$cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\libxlsxwriter\lib --with-extra-includes=c:\build-cache\libxlsxwriter\include --with-prefix=c:\build-cache\' + $dname + ' 2>&1'
177190
echo $cmd | Out-File -Encoding "ASCII" -Append task.bat
178191
echo 'nmake /nologo test TESTS="-q --show-diff --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
179192
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "library"]
2+
path = library
3+
url = https://github.com/jmcnamara/libxlsxwriter.git
4+
branch = RELEASE_0.7.9

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ notifications:
1717
email: [email protected]
1818

1919
before_script:
20+
- git submodule update --init
2021
- sudo apt-get install zlib1g-dev -y
2122
- phpize && ./configure && make clean && make
2223

‎backup/.appveyor.yml.backup‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
version: "{branch}.build.{build}"
2+
skip_tags: true
3+
4+
branches:
5+
only:
6+
- master
7+
- dev
8+
9+
clone_folder: c:\projects\xlswriter
10+
11+
install:
12+
ps: |
13+
if (-not (Test-Path c:\build-cache)) {
14+
mkdir c:\build-cache
15+
}
16+
$bname = 'php-sdk-' + $env:BIN_SDK_VER + '.zip'
17+
if (-not (Test-Path c:\build-cache\$bname)) {
18+
Invoke-WebRequest "https://github.com/OSTC/php-sdk-binary-tools/archive/$bname" -OutFile "c:\build-cache\$bname"
19+
}
20+
$dname0 = 'php-sdk-binary-tools-php-sdk-' + $env:BIN_SDK_VER
21+
$dname1 = 'php-sdk-' + $env:BIN_SDK_VER
22+
if (-not (Test-Path c:\build-cache\$dname1)) {
23+
7z x c:\build-cache\$bname -oc:\build-cache
24+
move c:\build-cache\$dname0 c:\build-cache\$dname1
25+
}
26+
$lname2 = 'zlib-1.2.11.tar.gz'
27+
$lname3 = 'zlib'
28+
if (-not (Test-Path c:\build-cache\$lname2)) {
29+
$zliurl = "http://zlib.net/" + $lname2
30+
Invoke-WebRequest $zliurl -OutFile "c:\build-cache\$lname2"
31+
}
32+
if (-not (Test-Path c:\build-cache\$lname3)) {
33+
& 7z x c:\build-cache\$lname2 -oc:\build-cache
34+
& 7z x c:\build-cache\zlib-1.2.11.tar -oc:\build-cache\$lname3
35+
}
36+
if (-not (Test-Path c:\build-cache\$lname3\Release)) {
37+
cd c:\build-cache\$lname3\zlib-1.2.11
38+
$cmakegen = 'Visual Studio 15 2017'
39+
if ($env:VC -Match "vc14") {
40+
$cmakegen = "Visual Studio 14 2015"
41+
}
42+
& cmake -G $cmakegen -DCMAKE_BUILD_TYPE="Release" -DCMAKE_C_FLAGS_RELEASE="/MT"
43+
& cmake --build . --config "Release"
44+
}
45+
46+
cache:
47+
c:\build-cache -> .appveyor.yml
48+
49+
environment:
50+
BIN_SDK_VER: 2.1.2
51+
LIBXLSXWRITER_VER: 0.7.7
52+
matrix:
53+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
54+
ARCH: x64
55+
VC: vc14
56+
PHP_VER: 7.0.28
57+
TS: 0
58+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
59+
ARCH: x64
60+
VC: vc14
61+
PHP_VER: 7.0.28
62+
TS: 1
63+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
64+
ARCH: x86
65+
VC: vc14
66+
PHP_VER: 7.0.28
67+
TS: 0
68+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
69+
ARCH: x86
70+
VC: vc14
71+
PHP_VER: 7.0.28
72+
TS: 1
73+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
74+
ARCH: x64
75+
VC: vc14
76+
PHP_VER: 7.1.15
77+
TS: 0
78+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
79+
ARCH: x64
80+
VC: vc14
81+
PHP_VER: 7.1.15
82+
TS: 1
83+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
84+
ARCH: x86
85+
VC: vc14
86+
PHP_VER: 7.1.15
87+
TS: 0
88+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
89+
ARCH: x86
90+
VC: vc14
91+
PHP_VER: 7.1.15
92+
TS: 1
93+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
94+
ARCH: x64
95+
VC: vc15
96+
PHP_VER: 7.2.3
97+
TS: 0
98+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
99+
ARCH: x64
100+
VC: vc15
101+
PHP_VER: 7.2.3
102+
TS: 1
103+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
104+
ARCH: x86
105+
VC: vc15
106+
PHP_VER: 7.2.3
107+
TS: 0
108+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
109+
ARCH: x86
110+
VC: vc15
111+
PHP_VER: 7.2.3
112+
TS: 1
113+
114+
build_script:
115+
ps: |
116+
$ts_part = ''
117+
if ('0' -eq $env:TS) { $ts_part = '-nts' }
118+
$bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
119+
if (-not (Test-Path c:\build-cache\$bname)) {
120+
Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
121+
if (-not (Test-Path c:\build-cache\$bname)) {
122+
Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
123+
}
124+
}
125+
$dname0 = 'php-' + $env:PHP_VER + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
126+
$dname1 = 'php-' + $env:PHP_VER + $ts_part + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
127+
if (-not (Test-Path c:\build-cache\$dname1)) {
128+
7z x c:\build-cache\$bname -oc:\build-cache
129+
move c:\build-cache\$dname0 c:\build-cache\$dname1
130+
}
131+
cd c:\projects\xlswriter
132+
$env:PATH = 'c:\build-cache\' + $dname1 + ';' + $env:PATH
133+
#echo "@echo off" | Out-File -Encoding "ASCII" task.bat
134+
#echo "" | Out-File -Encoding "ASCII" -Append task.bat
135+
echo "" | Out-File -Encoding "ASCII" task.bat
136+
echo "call git submodule update --init 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
137+
echo "call phpize 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
138+
$conf_cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\zlib-1.2.11\Release --with-extra-includes=c:\build-cache\zlib\zlib-1.2.11 --enable-debug-pack 2>&1'
139+
echo $conf_cmd | Out-File -Encoding "ASCII" -Append task.bat
140+
echo "nmake /nologo 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
141+
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat
142+
$here = (Get-Item -Path "." -Verbose).FullName
143+
$runner = 'c:\build-cache\php-sdk-' + $env:BIN_SDK_VER + '\phpsdk' + '-' + $env:VC + '-' + $env:ARCH + '.bat'
144+
$task = $here + '\task.bat'
145+
& $runner -t $task
146+
147+
after_build:
148+
ps: |
149+
$ts_part = 'ts'
150+
if ('0' -eq $env:TS) { $ts_part = 'nts' }
151+
$zip_bname = 'php_xlswriter-' + $env:APPVEYOR_REPO_COMMIT.substring(0, 8) + '-' + $env:PHP_VER.substring(0, 3) + '-' + $ts_part + '-' + $env:VC + '-' + $env:ARCH + '.zip'
152+
$dir = 'c:\projects\xlswriter\';
153+
if ('x64' -eq $env:ARCH) { $dir = $dir + 'x64\' }
154+
$dir = $dir + 'Release'
155+
if ('1' -eq $env:TS) { $dir = $dir + '_TS' }
156+
& 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE
157+
Push-AppveyorArtifact c:\$zip_bname
158+
159+
test_script:
160+
ps: |
161+
$ts_part = ''
162+
if ('0' -eq $env:TS) { $ts_part = '-nts' }
163+
$bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
164+
if (-not (Test-Path c:\build-cache\$bname)) {
165+
Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
166+
if (-not (Test-Path c:\build-cache\$bname)) {
167+
Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
168+
}
169+
}
170+
$dname = 'php-' + $env:PHP_VER + $ts_part + '-' + $env:VC.toUpper() + '-' + $env:ARCH
171+
if (-not (Test-Path c:\build-cache\$dname)) {
172+
7z x c:\build-cache\$bname -oc:\build-cache\$dname
173+
}
174+
cd c:\projects\xlswriter
175+
echo "" | Out-File -Encoding "ASCII" task.bat
176+
echo "set REPORT_EXIT_STATUS=1" | Out-File -Encoding "ASCII" -Append task.bat
177+
$cmd = 'call configure --with-xlswriter --with-xlswriter --with-extra-libs=c:\build-cache\zlib\zlib-1.2.11\Release --with-extra-includes=c:\build-cache\zlib\zlib-1.2.11 --with-prefix=c:\build-cache\' + $dname + ' 2>&1'
178+
echo $cmd | Out-File -Encoding "ASCII" -Append task.bat
179+
echo 'nmake /nologo test TESTS="-q --show-diff --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
180+
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat
181+
$here = (Get-Item -Path "." -Verbose).FullName
182+
$runner = 'c:\build-cache\php-sdk-' + $env:BIN_SDK_VER + '\phpsdk' + '-' + $env:VC + '-' + $env:ARCH + '.bat'
183+
$task = $here + '\task.bat'
184+
& $runner -t $task

‎backup/config.w32.backup‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// vim:ft=javascript
2+
3+
ARG_WITH("xlswriter", "xlswriter support", "no");
4+
5+
if (PHP_XLSWRITER != "no") {
6+
7+
MESSAGE("Include Path:" + configure_module_dirname + "\\include");
8+
9+
if (CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_XLSWRITER) &&
10+
CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_XLSWRITER", "..\\zlib;" + php_usual_include_suspects) &&
11+
CHECK_HEADER_ADD_INCLUDE("xlsxwriter.h", "CFLAGS_XLSWRITER", PHP_XLSWRITER + ";" + configure_module_dirname + "\\library\\include") &&
12+
CHECK_HEADER_ADD_INCLUDE("packager.h", "CFLAGS_XLSWRITER", PHP_XLSWRITER + ";" + configure_module_dirname + "\\library\\include\\xlsxwriter") &&
13+
CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_XLSWRITER", PHP_XLSWRITER + ";" + configure_module_dirname + "\\library\\include\\xlsxwriter\\third_party")) {
14+
15+
EXTENSION("xlswriter", "xls_writer.c");
16+
17+
ADD_SOURCES(configure_module_dirname + "\\library\\third_party\\minizip", "ioapi.c iowin32.c mztools.c unzip.c zip.c", "xlswriter");
18+
ADD_SOURCES(configure_module_dirname + "\\library\\third_party\\tmpfileplus", "tmpfileplus.c", "xlswriter");
19+
ADD_SOURCES(configure_module_dirname + "\\library\\src", "app.c chart.c content_types.c core.c custom.c drawing.c format.c hash_table.c packager.c relationships.c shared_strings.c styles.c theme.c utility.c workbook.c worksheet.c xmlwriter.c", "xlswriter");
20+
ADD_SOURCES(configure_module_dirname + "\\kernel", "common.c resource.c exception.c excel.c write.c format.c", "xlswriter");
21+
22+
ADD_FLAG("CFLAGS_XLSWRITER", ' /I "' + configure_module_dirname + '" ');
23+
24+
} else {
25+
WARNING("xlswriter not enabled, headers not found");
26+
}
27+
28+
}

‎config.m4‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if test "$PHP_XLSWRITER" != "no"; then
2626
library/src/core.c \
2727
library/src/custom.c \
2828
library/src/drawing.c \
29-
library/src/xlsx_format.c \
29+
library/src/format.c \
3030
library/src/hash_table.c \
3131
library/src/packager.c \
3232
library/src/relationships.c \
@@ -82,9 +82,15 @@ if test "$PHP_XLSWRITER" != "no"; then
8282
xls_writer_sources="$xls_writer_sources $libxlsxwriter_sources"
8383
PHP_ADD_INCLUDE([$srcdir/library/include])
8484

85-
dnl uncomment when bunled lib will be updated
86-
dnl AC_DEFINE(HAVE_LXW_VERSION, 1, [ lxw_version available in 0.7.9 ])
87-
dnl AC_DEFINE(HAVE_LXW_CHARTSHEET_NEW, 1, [ lxw_chartsheet_new available in 0.8.0 ])
85+
XLSXWRITER_VERSION=`$EGREP "define LXW_VERSION" $srcdir/library/include/xlsxwriter.h | $SED -e 's/[[^0-9\.]]//g'`
86+
87+
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 800; then
88+
AC_DEFINE(HAVE_LXW_VERSION, 1, [ lxw_version available in 0.7.9 ])
89+
fi
90+
91+
if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 800; then
92+
AC_DEFINE(HAVE_LXW_CHARTSHEET_NEW, 1, [ lxw_chartsheet_new available in 0.8.0 ])
93+
fi
8894
fi
8995

9096
if test -z "$PHP_DEBUG"; then

0 commit comments

Comments
 (0)