Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d36372

Browse files
committed
Fix very broken clean.bat for msvc install. The way we used subroutines
in .bat simply did not work, and it called them in the wrong order,some several times, and some not at all. So this unrolls all subroutinecalls.This should fix the issues with clean deleting the wrong files reportedby Dave Page.While at it, add the "clean dist" option to act like "make distclean",and no longer remove the flex/bison output files by default. This shuoldfix the problem reported by Pavel Golub in bug #3909.
1 parent03e4dc9 commit8d36372

File tree

2 files changed

+61
-51
lines changed

2 files changed

+61
-51
lines changed

‎doc/src/sgml/install-win32.sgml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.44 2007/12/19 12:29:36 mha Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.45 2008/02/06 15:13:25 mha Exp $ -->
22

33
<chapter id="install-win32">
44
<title>Installation on <productname>Windows</productname></title>
@@ -238,7 +238,10 @@
238238
handle changed files. But if there have been large changes, you may need
239239
to clean the installation. To do this, simply run the
240240
<filename>clean.bat</filename> command, which will automatically clean out
241-
all generated files.
241+
all generated files. You can also run it with with the
242+
<parameter>dist</parameter> parameter, in which case it will behave like
243+
<userinput>make distclean</userinput> and remove the flex/bison output files
244+
as well.
242245
</para>
243246

244247
<para>

‎src/tools/msvc/clean.bat

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,78 @@
11
@echooff
2-
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.9 2007/12/19 12:31:35 mha Exp $
2+
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.10 2008/02/06 15:13:25 mha Exp $
3+
4+
setDIST=0
5+
if"%1"=="dist"setDIST=1
36

47
setD=%CD%
58
ifexist ..\msvcifexist ..\..\..\srccd ..\..\..
69

710
ifexist debugrd /s /q debug
811
ifexist releaserd /s /q release
9-
call :del*.vcproj
10-
call :del pgsql.sln
12+
for%%fin (*.vcproj)dodel%%f
13+
ifexist pgsql.slndel /q pgsql.sln
1114
del /s /q src\bin\win32ver.rc2>NUL
1215
del /s /q src\interfaces\win32ver.rc2>NUL
13-
call :del src\backend\win32ver.rc
14-
16+
ifexist src\backend\win32ver.rcdel /q src\backend\win32ver.rc
1517

1618
REM Delete files created with GenerateFiles() in Solution.pm
17-
call :del src\include\pg_config.h
18-
call :del src\include\pg_config_os.h
19-
call :del src\backend\parser\parse.h
20-
call :del src\include\utils\fmgroids.h
21-
22-
call :del src\backend\utils\fmgrtab.c
23-
call :del src\backend\catalog\postgres.bki
24-
call :del src\backend\catalog\postgres.description
25-
call :del src\backend\catalog\postgres.shdescription
26-
call :del src\backend\parser\gram.c
27-
call :del src\backend\bootstrap\bootparse.c
28-
call :del src\backend\bootstrap\bootstrap_tokens.h
29-
30-
call :del src\bin\psql\sql_help.h
31-
32-
call :del src\interfaces\libpq\libpq.rc
33-
call :del src\interfaces\libpq\libpqdll.def
34-
call :del src\interfaces\ecpg\compatlib\compatlib.def
35-
call :del src\interfaces\ecpg\ecpglib\ecpglib.def
36-
call :del src\interfaces\ecpg\include\ecpg_config.h
37-
call :del src\interfaces\ecpg\pgtypeslib\pgtypeslib.def
38-
call :del src\interfaces\ecpg\preproc\preproc.c
39-
call :del src\interfaces\ecpg\preproc\preproc.h
40-
41-
call :del src\port\pg_config_paths.h
42-
43-
call :del src\pl\plperl\spi.c
44-
call :del src\pl\plpgsql\src\pl_gram.c
45-
call :del src\pl\plpgsql\src\pl.tab.h
46-
47-
call :del contrib\cube\cubeparse.c
48-
call :del contrib\cube\cubeparse.h
49-
call :del contrib\seg\segparse.c
50-
call :del contrib\seg\segparse.h
19+
ifexist src\include\pg_config.hdel /q src\include\pg_config.h
20+
ifexist src\include\pg_config_os.hdel /q src\include\pg_config_os.h
21+
if%DIST%==1ifexist src\backend\parser\parse.hdel /q src\backend\parser\parse.h
22+
ifexist src\include\utils\fmgroids.hdel /q src\include\utils\fmgroids.h
23+
24+
ifexist src\backend\utils\fmgrtab.cdel /q src\backend\utils\fmgrtab.c
25+
ifexist src\backend\catalog\postgres.bkidel /q src\backend\catalog\postgres.bki
26+
ifexist src\backend\catalog\postgres.descriptiondel /q src\backend\catalog\postgres.description
27+
ifexist src\backend\catalog\postgres.shdescriptiondel /q src\backend\catalog\postgres.shdescription
28+
if%DIST%==1ifexist src\backend\parser\scan.cdel /q src\backend\parser\scan.c
29+
if%DIST%==1ifexist src\backend\parser\gram.cdel /q src\backend\parser\gram.c
30+
if%DIST%==1ifexist src\backend\bootstrap\bootscanner.cdel /q src\backend\bootstrap\bootscanner.c
31+
if%DIST%==1ifexist src\backend\bootstrap\bootparse.cdel /q src\backend\bootstrap\bootparse.c
32+
if%DIST%==1ifexist src\backend\bootstrap\bootstrap_tokens.hdel /q src\backend\bootstrap\bootstrap_tokens.h
33+
if%DIST%==1ifexist src\backend\utils\misc\guc-file.cdel /q src\backend\utils\misc\guc-file.c
34+
35+
36+
ifexist src\bin\psql\sql_help.hdel /q src\bin\psql\sql_help.h
37+
38+
ifexist src\interfaces\libpq\libpq.rcdel /q src\interfaces\libpq\libpq.rc
39+
ifexist src\interfaces\libpq\libpqdll.defdel /q src\interfaces\libpq\libpqdll.def
40+
ifexist src\interfaces\ecpg\compatlib\compatlib.defdel /q src\interfaces\ecpg\compatlib\compatlib.def
41+
ifexist src\interfaces\ecpg\ecpglib\ecpglib.defdel /q src\interfaces\ecpg\ecpglib\ecpglib.def
42+
ifexist src\interfaces\ecpg\include\ecpg_config.hdel /q src\interfaces\ecpg\include\ecpg_config.h
43+
ifexist src\interfaces\ecpg\pgtypeslib\pgtypeslib.defdel /q src\interfaces\ecpg\pgtypeslib\pgtypeslib.def
44+
if%DIST%==1ifexist src\interfaces\ecpg\preproc\pgc.cdel /q src\interfaces\ecpg\preproc\pgc.c
45+
if%DIST%==1ifexist src\interfaces\ecpg\preproc\preproc.cdel /q src\interfaces\ecpg\preproc\preproc.c
46+
if%DIST%==1ifexist src\interfaces\ecpg\preproc\preproc.hdel /q src\interfaces\ecpg\preproc\preproc.h
47+
48+
ifexist src\port\pg_config_paths.hdel /q src\port\pg_config_paths.h
49+
50+
ifexist src\pl\plperl\spi.cdel /q src\pl\plperl\spi.c
51+
if%DIST%==1ifexist src\pl\plpgsql\src\pl_scan.cdel /q src\pl\plpgsql\src\pl_scan.c
52+
if%DIST%==1ifexist src\pl\plpgsql\src\pl_gram.cdel /q src\pl\plpgsql\src\pl_gram.c
53+
if%DIST%==1ifexist src\pl\plpgsql\src\pl.tab.hdel /q src\pl\plpgsql\src\pl.tab.h
54+
55+
if%DIST%==1ifexist src\bin\psql\psqlscan.cdel /q src\bin\psql\psqlscan.c
56+
57+
if%DIST%==1ifexist contrib\cube\cubescan.cdel /q contrib\cube\cubescan.c
58+
if%DIST%==1ifexist contrib\cube\cubeparse.cdel /q contrib\cube\cubeparse.c
59+
if%DIST%==1ifexist contrib\cube\cubeparse.hdel /q contrib\cube\cubeparse.h
60+
if%DIST%==1ifexist contrib\seg\segscan.cdel /q contrib\seg\segscan.c
61+
if%DIST%==1ifexist contrib\seg\segparse.cdel /q contrib\seg\segparse.c
62+
if%DIST%==1ifexist contrib\seg\segparse.hdel /q contrib\seg\segparse.h
5163

5264
ifexist src\test\regress\tmp_checkrd /s /q src\test\regress\tmp_check
53-
call :del contrib\spi\refint.dll
54-
call :del contrib\spi\autoinc.dll
55-
call :del src\test\regress\regress.dll
65+
ifexist contrib\spi\refint.dlldel /q contrib\spi\refint.dll
66+
ifexist contrib\spi\autoinc.dlldel /q contrib\spi\autoinc.dll
67+
ifexist src\test\regress\regress.dlldel /q src\test\regress\regress.dll
5668

5769
REM Clean up datafiles built with contrib
58-
cd contrib
59-
for /r%%fin (*.sql)doifexist%%f.indel%%f
70+
REMcd contrib
71+
REMfor /r %%f in (*.sql) do if exist %%f.in del %%f
6072

6173
cd%D%
6274

6375
REM Clean up ecpg regression test files
6476
msbuild /NoLogo ecpg_regression.proj /t:clean /v:q
6577

6678
goto :eof
67-
68-
69-
:del
70-
ifexist%1del /q%1
71-
goto :eof

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp