archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix year
  Add /nologo
This commit is contained in:
Anatol Belski 2017-10-31 10:38:18 +01:00
commit da9da5742c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32/build/Makefile
View file

@ -114,7 +114,7 @@ _VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest
!endif !endif
$(PHPDLL_RES): win32\build\template.rc $(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \ $(RC) /nologo /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \
/d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" \ /d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" \
/I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \ /I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \
win32\build\template.rc win32\build\template.rc

6
win32/build/confutils.js
View file

@ -1113,7 +1113,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
*/ */
if (FSO.FileExists(creditspath + '\\template.rc')) { if (FSO.FileExists(creditspath + '\\template.rc')) {
MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": " + creditspath + "\\template.rc"); MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": " + creditspath + "\\template.rc");
MFO.WriteLine("\t$(RC) /fo $(BUILD_DIR)\\" + resname + logo + debug + MFO.WriteLine("\t$(RC) /nologo /fo $(BUILD_DIR)\\" + resname + logo + debug +
' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' +
makefiletarget + '\\"" /d PRODUCT_NAME="\\"' + res_prod_name + makefiletarget + '\\"" /d PRODUCT_NAME="\\"' + res_prod_name +
versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" ' + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" ' +
@ -1122,14 +1122,14 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
} }
if (MODE_PHPIZE) { if (MODE_PHPIZE) {
MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": $(PHP_DIR)\\build\\template.rc"); MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": $(PHP_DIR)\\build\\template.rc");
MFO.WriteLine("\t$(RC) /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug + MFO.WriteLine("\t$(RC) /nologo /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"'
+ makefiletarget + '\\"" /d URL="\\"' + project_url + + makefiletarget + '\\"" /d URL="\\"' + project_url +
'\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning +
'\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc'); '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc');
} else { } else {
MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": win32\\build\\template.rc"); MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": win32\\build\\template.rc");
MFO.WriteLine("\t$(RC) /n /fo $(BUILD_DIR)\\" + resname + logo + debug + MFO.WriteLine("\t$(RC) /nologo /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"'
+ makefiletarget + '\\"" /d URL="\\"' + project_url + + makefiletarget + '\\"" /d URL="\\"' + project_url +
'\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning +

2
win32/build/template.rc
View file

@ -65,7 +65,7 @@ BEGIN
#endif #endif
VALUE "FileVersion", EXT_VERSION VALUE "FileVersion", EXT_VERSION
VALUE "InternalName", INTERNAL_NAME VALUE "InternalName", INTERNAL_NAME
VALUE "LegalCopyright", "Copyright © 1997-2017 The PHP Group" VALUE "LegalCopyright", "Copyright © 1997-2017 The PHP Group"
VALUE "LegalTrademarks", "PHP" VALUE "LegalTrademarks", "PHP"
VALUE "OriginalFilename", FILE_NAME VALUE "OriginalFilename", FILE_NAME
VALUE "ProductName", "PHP" VALUE "ProductName", "PHP"