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

Commitbb24af5

Browse files
committed
Fix MSVC installations with multiple "configure" files detected
When installing binaries and libraries using the MSVC installationroutines, the operation gets done after moving to the root folder, whoselocation is detected by checking if "configure" exists two times in arow. So, calling the installation script from src/tools/msvc/ with anextra "configure" file four levels up the root path of the code treecauses the execution to go further up, leading to a failure in findingthe builds. This commit fixes the issue by moving to the root folder ofthe code tree only once, when necessary.Author: Arnold MüllerReviewed-by: Daniel GustafssonDiscussion:https://postgr.es/m/16343-f638f67e7e52b86c@postgresql.orgBackpatch-through: 9.5
1 parent673582d commitbb24af5

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

‎src/tools/msvc/Install.pm

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,16 @@ sub Install
6363
do"./config.pl"if (-f"config.pl");
6464
}
6565

66-
chdir("../../..")if (-f"../../../configure");
67-
chdir("../../../..")if (-f"../../../../configure");
66+
# Move to the root path depending on the current location.
67+
if (-f"../../../configure")
68+
{
69+
chdir("../../..");
70+
}
71+
elsif (-f"../../../../configure")
72+
{
73+
chdir("../../../..");
74+
}
75+
6876
my$conf ="";
6977
if (-d"debug")
7078
{

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp