Skip to content

Commit 7090802

Browse files
committed
Reorganize into include directory.
1 parent 5388b8f commit 7090802

14 files changed

+16
-16
lines changed

config.w32

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ X64 = toolset_is_64();
55
if (PHP_ASYNC != 'no') {
66
AC_DEFINE('HAVE_ASYNC', 1, 'async support enabled');
77

8-
ADD_FLAG('CFLAGS', '/I ' + configure_module_dirname);
8+
ADD_FLAG('CFLAGS', '/I ' + configure_module_dirname);
9+
ADD_FLAG('CFLAGS', '/I ' + configure_module_dirname + '\\include');
10+
911
ADD_FLAG('LDFLAGS', '/NODEFAULTLIB:LIBCMT');
1012

1113
var async_source_files = [
@@ -109,8 +111,6 @@ if (PHP_ASYNC != 'no') {
109111
async_source_files.push('thirdparty\\libuv\\src\\win\\' + uv_win[i]);
110112
}
111113

112-
PHP_INSTALL_HEADERS('ext/async', 'php_async.h thirdparty\\libuv\\include\\uv.h');
113-
114114
var ret = SETUP_OPENSSL('async', PHP_ASYNC);
115115

116116
if (ret > 0) {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function collect_files($dir, array $include, $role = null)
111111
];
112112
}
113113

114-
$files = array_merge($files, collect_files(__DIR__ . '/async', [
114+
$files = array_merge($files, collect_files(__DIR__ . '/include', [
115115
'h'
116116
]));
117117

package.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<active>yes</active>
1212
</lead>
1313
<date>2019-07-15</date>
14-
<time>12:33:24</time>
14+
<time>12:51:07</time>
1515
<version>
1616
<release>0.3.0</release>
1717
<api>0.3.0</api>
@@ -31,17 +31,17 @@
3131
<file role="src" name="config.w32"/>
3232
<file role="src" name="php_async.c"/>
3333
<file role="src" name="php_async.h"/>
34-
<file role="src" name="async/buffer.h"/>
35-
<file role="src" name="async/event.h"/>
36-
<file role="src" name="async/fiber.h"/>
37-
<file role="src" name="async/helper.h"/>
38-
<file role="src" name="async/pipe.h"/>
39-
<file role="src" name="async/process.h"/>
40-
<file role="src" name="async/socket.h"/>
41-
<file role="src" name="async/ssl.h"/>
42-
<file role="src" name="async/stack.h"/>
43-
<file role="src" name="async/stream.h"/>
44-
<file role="src" name="async/xp.h"/>
34+
<file role="src" name="include/async/buffer.h"/>
35+
<file role="src" name="include/async/event.h"/>
36+
<file role="src" name="include/async/fiber.h"/>
37+
<file role="src" name="include/async/helper.h"/>
38+
<file role="src" name="include/async/pipe.h"/>
39+
<file role="src" name="include/async/process.h"/>
40+
<file role="src" name="include/async/socket.h"/>
41+
<file role="src" name="include/async/ssl.h"/>
42+
<file role="src" name="include/async/stack.h"/>
43+
<file role="src" name="include/async/stream.h"/>
44+
<file role="src" name="include/async/xp.h"/>
4545
<file role="src" name="src/channel.c"/>
4646
<file role="src" name="src/console.c"/>
4747
<file role="src" name="src/context.c"/>

0 commit comments

Comments
 (0)