Clean up build.ninja

Author: cmb69

win32/build/build.ninja

@@ -12,7 +12,7 @@
 #  | Author: Wez Furlong <wez@thebrainroom.com>                           |
 #  +----------------------------------------------------------------------+
 #
-# This is the makefile template for the win32 build
+# This is the ninja template for the win32 build
 
 CC="${PHP_CL}"
 LD="${LINK}"
@@ -22,28 +22,17 @@ RE2C="${RE2C}"
 PGOMGR="${PGOMGR}"
 PHP_BUILD=${PHP_BUILD}
 
-#msvc_deps_prefix = Hinweis: Einlesen der Datei:
+msvc_deps_prefix = Hinweis: Einlesen der Datei:
 
 MCFILE=${BUILD_DIR}\wsyslog.rc
-BUILD_DIR_DEV_NAME=php-${PHP_VERSION_STRING}-devel-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}
-BUILD_DIR_DEV=${BUILD_DIR}\${BUILD_DIR_DEV_NAME}
 
-DIST_ZIP_SNAP=php-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}$$.zip
-DIST_ZIP_PECL=pecl-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}$$.zip
-DIST_ZIP_DEV_PACK=php-devel-pack-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}.zip
-DIST_ZIP_TEST_PACK=php-test-pack-${PHP_VERSION_STRING}.zip
-DIST_ZIP_DEBUG_PACK=php-debug-pack-${PHP_VERSION_STRING}${PHP_ZTS_ARCHIVE_POSTFIX}-Win32-${PHP_COMPILER_SHORT}-${PHP_ARCHITECTURE}.zip
-
-DEBUGGER_CMD=
-DEBUGGER_ARGS=
-
-rule bison1
+rule bison_php
   command = ${BISON} ${BISON_FLAGS} --output=$out -v -d $in
-  description = BISON
+  description = bison $in
 
-build Zend\zend_ini_parser.c: bison1 Zend\zend_ini_parser.y
-build Zend\zend_language_parser.c: bison1 Zend\zend_language_parser.y
-build sapi\phpdbg\phpdbg_parser.c: bison1 sapi\phpdbg\phpdbg_parser.y
+build Zend\zend_ini_parser.c: bison_php Zend\zend_ini_parser.y
+build Zend\zend_language_parser.c: bison_php Zend\zend_language_parser.y
+build sapi\phpdbg\phpdbg_parser.c: bison_php sapi\phpdbg\phpdbg_parser.y
 
 rule re2c1
   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
 
 build sapi\phpdbg\phpdbg_lexer.c: re2c3 sapi\phpdbg\phpdbg_lexer.l
 
-rule mcfile
+rule mc_php
   command = ${MC} -h win32\ -r ${BUILD_DIR}\ -x ${BUILD_DIR}\ $in
-  description = MC $in
-
-build ${MCFILE}: mcfile win32\build\wsyslog.mc
+  description = mc $in
 
-PHP8_PGD_SUFFIX=
-
-PHP8_PGD_OPTION=
+build ${MCFILE}: mc_php win32\build\wsyslog.mc
 
 PHPDLL_RES=${BUILD_DIR}\${PHPDLL}.res
 
 # FIXME: why isn't that defined in Makefile?
 RC=rc.exe
 
-rule rc
-  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
+rule rc_php
+  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
+  description = rc $in
 
-build ${PHPDLL_RES}: rc win32\build\template.rc || ${BUILD_DIR}\\wsyslog.rc
+build ${PHPDLL_RES}: rc_php win32\build\template.rc || ${BUILD_DIR}\\wsyslog.rc
 
 rule ld_php
-  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}
-
-# build ${BUILD_DIR}\${PHPDLL}: ld_php ${PHPDEF} ${PHP_GLOBAL_OBJS} ${STATIC_EXT_OBJS} ${PHPDLL_RES} ${ASM_OBJS} ${MCFILE}
-
-#	@copy win32\build\default.manifest $(BUILD_DIR)\$(PHPDLL).manifest >nul
-#	@$(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)
-#	@"$(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)
-#	-@$(_VC_MANIFEST_EMBED_DLL)
+  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}
+  description = ld $out
 
 build ${BUILD_DIR}\${PHPLIB}: phony ${BUILD_DIR}\${PHPDLL}