Skip to content

Commit a0acbab

Browse files
committed
Clean up build.ninja
1 parent b072fac commit a0acbab

File tree

1 file changed

+16
-36
lines changed

1 file changed

+16
-36
lines changed

win32/build/build.ninja

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# | Author: Wez Furlong <wez@thebrainroom.com> |
1313
# +----------------------------------------------------------------------+
1414
#
15-
# This is the makefile template for the win32 build
15+
# This is the ninja template for the win32 build
1616

1717
CC="${PHP_CL}"
1818
LD="${LINK}"
@@ -22,28 +22,17 @@ RE2C="${RE2C}"
2222
PGOMGR="${PGOMGR}"
2323
PHP_BUILD=${PHP_BUILD}
2424

25-
#msvc_deps_prefix = Hinweis: Einlesen der Datei:
25+
msvc_deps_prefix = Hinweis: Einlesen der Datei:
2626

2727
MCFILE=${BUILD_DIR}\wsyslog.rc
28-
BUILD_DIR_DEV_NAME=php-${PHP_VERSION_STRING}-devel-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}
29-
BUILD_DIR_DEV=${BUILD_DIR}\${BUILD_DIR_DEV_NAME}
3028

31-
DIST_ZIP_SNAP=php-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}$$.zip
32-
DIST_ZIP_PECL=pecl-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}$$.zip
33-
DIST_ZIP_DEV_PACK=php-devel-pack-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}.zip
34-
DIST_ZIP_TEST_PACK=php-test-pack-${PHP_VERSION_STRING}.zip
35-
DIST_ZIP_DEBUG_PACK=php-debug-pack-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}.zip
36-
37-
DEBUGGER_CMD=
38-
DEBUGGER_ARGS=
39-
40-
rule bison1
29+
rule bison_php
4130
command = ${BISON} ${BISON_FLAGS} --output=$out -v -d $in
42-
description = BISON
31+
description = bison $in
4332

44-
build Zend\zend_ini_parser.c: bison1 Zend\zend_ini_parser.y
45-
build Zend\zend_language_parser.c: bison1 Zend\zend_language_parser.y
46-
build sapi\phpdbg\phpdbg_parser.c: bison1 sapi\phpdbg\phpdbg_parser.y
33+
build Zend\zend_ini_parser.c: bison_php Zend\zend_ini_parser.y
34+
build Zend\zend_language_parser.c: bison_php Zend\zend_language_parser.y
35+
build sapi\phpdbg\phpdbg_parser.c: bison_php sapi\phpdbg\phpdbg_parser.y
4736

4837
rule re2c1
4938
command = ${RE2C} ${RE2C_FLAGS} --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
@@ -60,34 +49,25 @@ rule re2c3
6049

6150
build sapi\phpdbg\phpdbg_lexer.c: re2c3 sapi\phpdbg\phpdbg_lexer.l
6251

63-
rule mcfile
52+
rule mc_php
6453
command = ${MC} -h win32\ -r ${BUILD_DIR}\ -x ${BUILD_DIR}\ $in
65-
description = MC $in
66-
67-
build ${MCFILE}: mcfile win32\build\wsyslog.mc
54+
description = mc $in
6855

69-
PHP8_PGD_SUFFIX=
70-
71-
PHP8_PGD_OPTION=
56+
build ${MCFILE}: mc_php win32\build\wsyslog.mc
7257

7358
PHPDLL_RES=${BUILD_DIR}\${PHPDLL}.res
7459

7560
# FIXME: why isn't that defined in Makefile?
7661
RC=rc.exe
7762

78-
rule rc
79-
command = ${RC} /nologo /fo ${PHPDLL_RES} /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" /d FILE_NAME="\"${PHPDLL}\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" /I${BUILD_DIR} /d MC_INCLUDE="\"${MCFILE}\"" win32\build\template.rc
63+
rule rc_php
64+
command = ${RC} /nologo /fo $out /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" /d FILE_NAME="\"${PHPDLL}\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" /I${BUILD_DIR} /d MC_INCLUDE="\"${MCFILE}\"" $in
65+
description = rc $in
8066

81-
build ${PHPDLL_RES}: rc win32\build\template.rc || ${BUILD_DIR}\\wsyslog.rc
67+
build ${PHPDLL_RES}: rc_php win32\build\template.rc || ${BUILD_DIR}\\wsyslog.rc
8268

8369
rule ld_php
84-
command = ${LD} ${PHP_GLOBAL_OBJS_RESP} ${STATIC_EXT_OBJS_RESP} ${STATIC_EXT_LIBS} ${LIBS} ${ASM_OBJS} ${PHPDLL_RES} /out:${BUILD_DIR}\${PHPDLL} ${PHP8_PGD_OPTION} ${PHP_LDFLAGS} ${LDFLAGS} ${STATIC_EXT_LDFLAGS}
85-
86-
# build ${BUILD_DIR}\${PHPDLL}: ld_php ${PHPDEF} ${PHP_GLOBAL_OBJS} ${STATIC_EXT_OBJS} ${PHPDLL_RES} ${ASM_OBJS} ${MCFILE}
87-
88-
# @copy win32\build\default.manifest $(BUILD_DIR)\$(PHPDLL).manifest >nul
89-
# @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP8_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
90-
# @"$(LINK)" $(PHP_GLOBAL_OBJS_RESP) $(STATIC_EXT_OBJS_RESP) $(STATIC_EXT_LIBS) $(LIBS) $(ASM_OBJS) $(PHPDLL_RES) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP8_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
91-
# -@$(_VC_MANIFEST_EMBED_DLL)
70+
command = ${LD} ${PHP_GLOBAL_OBJS_RESP} ${STATIC_EXT_OBJS_RESP} ${STATIC_EXT_LIBS} ${LIBS} ${ASM_OBJS} ${PHPDLL_RES} /out:$out ${PHP8_PGD_OPTION} ${PHP_LDFLAGS} ${LDFLAGS} ${STATIC_EXT_LDFLAGS}
71+
description = ld $out
9272

9373
build ${BUILD_DIR}\${PHPLIB}: phony ${BUILD_DIR}\${PHPDLL}

0 commit comments

Comments
 (0)