diff options
| author | Anatol Belski <ab@php.net> | 2017-10-31 10:38:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-31 10:38:18 +0100 |
| commit | da9da5742cee401ef2861ddc1bdecbe706caa076 (patch) | |
| tree | b1cb4b01f34359e7244f06a763e832eba15454a8 | |
| parent | e3b2859c8a1062e6bd87237f59a4004197912148 (diff) | |
| parent | 98422cfa3df722b3b65dac9540874d9ba7bf6d82 (diff) | |
| download | php-git-da9da5742cee401ef2861ddc1bdecbe706caa076.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix year
Add /nologo
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 6 | ||||
| -rw-r--r-- | win32/build/template.rc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 26c7a26fa0..f54dfad3ce 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -114,7 +114,7 @@ _VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest !endif $(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\"" \ /I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \ win32\build\template.rc diff --git a/win32/build/confutils.js b/win32/build/confutils.js index c3fa274fc8..ffbcb413e8 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1113,7 +1113,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s */ if (FSO.FileExists(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="\\"' + makefiletarget + '\\"" /d PRODUCT_NAME="\\"' + res_prod_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" ' + @@ -1122,14 +1122,14 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s } if (MODE_PHPIZE) { 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="\\"' + makefiletarget + '\\"" /d URL="\\"' + project_url + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc'); } else { 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="\\"' + makefiletarget + '\\"" /d URL="\\"' + project_url + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + diff --git a/win32/build/template.rc b/win32/build/template.rc index ba3f1164c1..34b8fd70b7 100644 --- a/win32/build/template.rc +++ b/win32/build/template.rc @@ -65,7 +65,7 @@ BEGIN #endif VALUE "FileVersion", EXT_VERSION VALUE "InternalName", INTERNAL_NAME - VALUE "LegalCopyright", "Copyright © 1997-2017 The PHP Group" + VALUE "LegalCopyright", "Copyright © 1997-2017 The PHP Group" VALUE "LegalTrademarks", "PHP" VALUE "OriginalFilename", FILE_NAME VALUE "ProductName", "PHP" |