search

Perl / perl5

🐪 The Perl programming language
https://dev.perl.org/perl5/
Other
1.9k stars 540 forks source link

[PATCH] remove useless build product /win32/config.w32 #15030

Closed p5pRT closed 8 years ago

p5pRT commented 8 years ago

Migrated from rt.perl.org#126565 (status was 'resolved')

Searchable as RT126565$

p5pRT commented 8 years ago

From @bulk88

Created by @bulk88

See patch.

Perl Info ``` Flags:     category=core     severity=low Site configuration information for perl 5.21.8: Configured by Administrator at Thu Dec 25 21:47:06 2014. Summary of my perl5 (revision 5 version 21 subversion 8) configuration:   Derived from: a2809ed3f018e1bc7a25293a24e20f1045f13f63   Ancestor: 5e754124df5a29d96dd9bb3ecb0e73b5c11cd93a   Platform:     osname=MSWin32, osvers=5.2, archname=MSWin32-x64-multi-thread     uname=''     config_args='undef'     hint=recommended, useposix=true, d_sigaction=undef     useithreads=define, usemultiplicity=define     use64bitint=define, use64bitall=undef, uselongdouble=undef     usemymalloc=n, bincompat5005=undef   Compiler:     cc='cl', ccflags ='-nologo -GF -W3 -O1 -MD -Zi -DNDEBUG -GS- -fp:precise -DWIN32 -D_CONSOLE -DNO_STRICT -DWIN64 -DCONSERVATIVE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE  -DPERL_TEXTMODE_SCRIPTS -DPERL_HASH_FUNC_ONE_AT_A_TIME -DNO_MATHOMS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DUSE_PERLIO',     optimize='-O1 -MD -Zi -DNDEBUG -GS- -fp:precise',     cppflags='-DWIN32'     ccversion='15.00.30729.01', gccversion='', gccosandvers=''     intsize=4, longsize=4, ptrsize=8, doublesize=8, byteorder=12345678, doublekind=3     d_longlong=undef, longlongsize=8, d_longdbl=define, longdblsize=8, longdblkind=0     ivtype='__int64', ivsize=8, nvtype='double', nvsize=8, Off_t='__int64', lseeksize=8     alignbytes=8, prototype=define   Linker and Libraries:     ld='link', ldflags ='-nologo -nodefaultlib -debug -opt:ref,icf -ltcg  -libpath:"c:\p521\lib\CORE"  -machine:AMD64 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"'     libpth=\lib     libs=oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib  comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib  netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib  version.lib odbc32.lib odbccp32.lib comctl32.lib msvcrt.lib     perllibs=oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib  comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib  netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib  version.lib odbc32.lib odbccp32.lib comctl32.lib msvcrt.lib     libc=msvcrt.lib, so=dll, useshrplib=true, libperl=perl521.lib     gnulibc_version=''   Dynamic Linking:     dlsrc=dl_win32.xs, dlext=dll, d_dlsymun=undef, ccdlflags=' '     cccdlflags=' ', lddlflags='-dll -nologo -nodefaultlib -debug -opt:ref,icf -ltcg  -libpath:"c:\p521\lib\CORE"  -machine:AMD64 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"' Locally applied patches:     uncommitted-changes     cd6c09c1d3b5d28e942d90a3395318bcf61f8efc     78c46fd42b26e41d1b756875baed4b0bd3581817     bf54a2e14d917af00e68d164996d31222b2ba840     dd9d34e232c848de58b389b6f312243628fe5d4e     b067b36797cfabaf9dc0520e7bef59d127ae2376     4a9d29b96c9c423676975c58c8df54f4d754d77b     8b25fc460db0bf51de2e56e68a5e1579cc76844a     3e71eedac4745e96e8467a9835d71d553b4a3362     afecf120eec0ee3460d131d898fb6f5ac20e42fc     0b97f3dc66b4d1dea20d8e27e764943f8960465b     ad27b3745cc703d543d4d4546a1af3a060b02e06     a2809ed3f018e1bc7a25293a24e20f1045f13f63 @INC for perl 5.21.8:     C:/p523/site/lib     C:/p523/lib     . Environment for perl 5.21.8:     CYGWIN=tty     HOME (unset)     LANG (unset)     LANGUAGE (unset)     LD_LIBRARY_PATH=/usr/lib/x86:/usr/X11R6/lib     LOGDIR (unset)     PATH=C:\p523\bin;C:\WINDOWS\system32;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\BIN\amd64;c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\x64;C:\WINDOWS;C:\Program Files\TortoiseGit\bin;C:\sp3220\c\bin;     PERL_BADLANG (unset)     SHELL (unset) ```
p5pRT commented 8 years ago

From @bulk88

0001-remove-useless-build-product-win32-config.w32.patch ```diff From 74da73477153dcb8c37e8e0b35c60c648aa82374 Mon Sep 17 00:00:00 2001 From: Daniel Dragan Date: Wed, 4 Nov 2015 17:28:06 -0500 Subject: [PATCH] remove useless build product /win32/config.w32 CFGSH_TMPL (config.gc or config.vc) is not written to by config_sh.PL, so there is no need to make a copy of it, this reduces 1 target node out of dmake so there are less targets to traverse for dep checking, this also fixes an "dmake -n" schedule irregularity where "copy $(CFGSH_TMPL) config.w32" was scheduled (for serial) as the very first recipie to run by dmake for a "dmake -n Extensions" but a recipie in the middle of the procs to launch for "dmake -n Extensions_nonxs". This schedule irregularity might be causing delays in finding parallel work to do. Also arrange ..\config.sh target's deps from "on disk" to "build product" order, so the left side dep nodes get marked "completed" ASAP in the graph. --- C:\p523\src\win32\xs.txt +++ C:\p523\src\win32\nonxs.txt @@ -1,3 +1,4 @@ +copy config.vc config.w32 if not exist ".\mini" mkdir ".\mini" if exist config.h del /f config.h copy config_H.vc config.h @@ -141,20 +142,11 @@ @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\mk31 if exist ..\miniperl.exe.manifest mt -nologo -manifest **CUT** ..\miniperl.exe -I..\lib -f ..\write_buildcustomize.pl .. -copy config.vc config.w32 ..\miniperl.exe -I..\lib config_sh.PL --cfgsh-option-file \ C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\mk32 config.w32 > ..\config.sh ..\miniperl.exe -I..\lib ..\configpm --chdir=.. xcopy /f /r /i /d /y config.h ..\lib\CORE\*.* ..\miniperl.exe -I..\lib config_h.PL "ARCHPREFIX=" --- win32/makefile.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/win32/makefile.mk b/win32/makefile.mk index 68d4236..4ce4572 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1093,8 +1093,6 @@ $(GLOBEXE) : perlglob.c $(LIBFILES) && $(EMBED_EXE_MANI) .ENDIF -config.w32 : $(CFGSH_TMPL) - copy $(CFGSH_TMPL) config.w32 ..\git_version.h : $(HAVEMINIPERL) ..\make_patchnum.pl cd .. && miniperl -Ilib make_patchnum.pl @@ -1102,9 +1100,9 @@ config.w32 : $(CFGSH_TMPL) # make sure that we recompile perl.c if the git version changes ..\perl$(o) : ..\git_version.h -..\config.sh : config.w32 $(HAVEMINIPERL) config_sh.PL FindExt.pm +..\config.sh : $(CFGSH_TMPL) config_sh.PL FindExt.pm $(HAVEMINIPERL) $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file \ - $(mktmp $(CFG_VARS)) config.w32 > ..\config.sh + $(mktmp $(CFG_VARS)) $(CFGSH_TMPL) > ..\config.sh # This target is for when changes to the main config.sh happen. # Edit config.gc, then make perl using GCC in a minimal configuration (i.e. @@ -1754,7 +1752,6 @@ _clean : -@erase perlglob$(o) -@erase perlmain$(o) -@erase perlmainst$(o) - -@erase config.w32 -@erase /f config.h -@erase /f ..\git_version.h -@erase $(GLOBEXE) -- 1.8.0.msysgit.0 ```
p5pRT commented 8 years ago

From @steve-m-hay

Thanks\, applied as eb840d4ab69d8844753dfefe934e921ba27e0f91.

p5pRT commented 8 years ago

The RT System itself - Status changed from 'new' to 'open'

p5pRT commented 8 years ago

@steve-m-hay - Status changed from 'open' to 'resolved'