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

Commit93f35f0

Browse files
committed
Perltidy run over the MSVC build system files, to clean up code formatting
and indentation styles.
1 parent7c60637 commit93f35f0

File tree

7 files changed

+286
-247
lines changed

7 files changed

+286
-247
lines changed

‎src/tools/msvc/Install.pm

Lines changed: 68 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Install;
33
#
44
# Package that provides 'make install' functionality for msvc builds
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.34 2010/01/05 13:31:58 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.35 2010/04/09 13:05:58 mha Exp $
77
#
88
use strict;
99
use warnings;
@@ -19,16 +19,16 @@ our (@ISA,@EXPORT_OK);
1919

2020
sublcopy
2121
{
22-
my$src =shift;
23-
my$target =shift;
22+
my$src =shift;
23+
my$target =shift;
2424

25-
if (-f$target)
26-
{
27-
unlink$target || confess"Could not delete$target\n";
28-
}
25+
if (-f$target)
26+
{
27+
unlink$target || confess"Could not delete$target\n";
28+
}
2929

30-
copy($src,$target)
31-
|| confess"Could not copy$src to$target\n";
30+
copy($src,$target)
31+
|| confess"Could not copy$src to$target\n";
3232

3333
}
3434

@@ -61,31 +61,35 @@ sub Install
6161

6262
CopySolutionOutput($conf,$target);
6363
lcopy($target .'/lib/libpq.dll',$target .'/bin/libpq.dll');
64-
my$sample_files = [];
65-
File::Find::find({wanted=>
66-
sub {/^.*\.sample\z/s &&
67-
push(@$sample_files,$File::Find::name);
68-
}
69-
},
70-
"src" );
71-
CopySetOfFiles('config files',$sample_files ,$target .'/share/');
64+
my$sample_files = [];
65+
File::Find::find(
66+
{
67+
wanted=>sub {
68+
/^.*\.sample\z/s
69+
&&push(@$sample_files,$File::Find::name);
70+
}
71+
},
72+
"src"
73+
);
74+
CopySetOfFiles('config files',$sample_files,$target .'/share/');
7275
CopyFiles(
7376
'Import libraries',
7477
$target .'/lib/',
75-
"$conf\\","postgres\\postgres.lib","libpq\\libpq.lib","libecpg\\libecpg.lib","libpgport\\libpgport.lib"
78+
"$conf\\","postgres\\postgres.lib","libpq\\libpq.lib","libecpg\\libecpg.lib",
79+
"libpgport\\libpgport.lib"
80+
);
81+
CopySetOfFiles(
82+
'timezone names',
83+
[glob('src\timezone\tznames\*.txt') ],
84+
$target .'/share/timezonesets/'
7685
);
77-
CopySetOfFiles('timezone names',
78-
[glob('src\timezone\tznames\*.txt') ] ,
79-
$target .'/share/timezonesets/');
8086
CopyFiles(
8187
'timezone sets',
8288
$target .'/share/timezonesets/',
8389
'src/timezone/tznames/','Default','Australia','India'
8490
);
85-
CopySetOfFiles('BKI files', [glob("src\\backend\\catalog\\postgres.*") ],
86-
$target .'/share/');
87-
CopySetOfFiles('SQL files', [glob("src\\backend\\catalog\\*.sql") ],
88-
$target .'/share/');
91+
CopySetOfFiles('BKI files', [glob("src\\backend\\catalog\\postgres.*") ],$target .'/share/');
92+
CopySetOfFiles('SQL files', [glob("src\\backend\\catalog\\*.sql") ],$target .'/share/');
8993
CopyFiles(
9094
'Information schema data',
9195
$target .'/share/',
@@ -94,12 +98,16 @@ sub Install
9498
GenerateConversionScript($target);
9599
GenerateTimezoneFiles($target,$conf);
96100
GenerateTsearchFiles($target);
97-
CopySetOfFiles('Stopword files',
98-
[glob ("src\\backend\\snowball\\stopwords\\*.stop") ],
99-
$target .'/share/tsearch_data/');
100-
CopySetOfFiles('Dictionaries sample files',
101-
[glob ("src\\backend\\tsearch\\*_sample.*" ) ],
102-
$target .'/share/tsearch_data/');
101+
CopySetOfFiles(
102+
'Stopword files',
103+
[glob("src\\backend\\snowball\\stopwords\\*.stop") ],
104+
$target .'/share/tsearch_data/'
105+
);
106+
CopySetOfFiles(
107+
'Dictionaries sample files',
108+
[glob("src\\backend\\tsearch\\*_sample.*") ],
109+
$target .'/share/tsearch_data/'
110+
);
103111
CopyContribFiles($config,$target);
104112
CopyIncludeFiles($target);
105113

@@ -189,8 +197,10 @@ sub CopySolutionOutput
189197
# Static lib, such as libpgport, only used internally during build, don't install
190198
next;
191199
}
192-
lcopy("$conf\\$pf\\$pf.$ext","$target\\$dir\\$pf.$ext") || croak"Could not copy$pf.$ext\n";
193-
lcopy("$conf\\$pf\\$pf.pdb","$target\\symbols\\$pf.pdb") || croak"Could not copy$pf.pdb\n";
200+
lcopy("$conf\\$pf\\$pf.$ext","$target\\$dir\\$pf.$ext")
201+
|| croak"Could not copy$pf.$ext\n";
202+
lcopy("$conf\\$pf\\$pf.pdb","$target\\symbols\\$pf.pdb")
203+
|| croak"Could not copy$pf.pdb\n";
194204
print".";
195205
}
196206
print"\n";
@@ -241,7 +251,8 @@ sub GenerateTimezoneFiles
241251
my@tzfiles =split /\s+/,$1;
242252
unshift@tzfiles,'';
243253
print"Generating timezone files...";
244-
system("$conf\\zic\\zic -d\"$target/share/timezone\"" .join(" src/timezone/data/",@tzfiles));
254+
system(
255+
"$conf\\zic\\zic -d\"$target/share/timezone\"" .join(" src/timezone/data/",@tzfiles));
245256
print"\n";
246257
}
247258

@@ -260,14 +271,16 @@ sub GenerateTsearchFiles
260271
open($F,">$target/share/snowball_create.sql")
261272
||die"Could not write snowball_create.sql";
262273
print$F read_file('src/backend/snowball/snowball_func.sql.in');
274+
263275
while ($#pieces > 0)
264276
{
265277
my$lang =shift@pieces ||last;
266278
my$asclang =shift@pieces ||last;
267279
my$txt =$tmpl;
268280
my$stop ='';
269281

270-
if (-s"src/backend/snowball/stopwords/$lang.stop") {
282+
if (-s"src/backend/snowball/stopwords/$lang.stop")
283+
{
271284
$stop =", StopWords=$lang";
272285
}
273286

@@ -383,9 +396,8 @@ sub CopyIncludeFiles
383396
{
384397
my$target =shift;
385398

386-
EnsureDirectories($target,'include','include/libpq',
387-
'include/internal','include/internal/libpq',
388-
'include/server');
399+
EnsureDirectories($target,'include','include/libpq','include/internal',
400+
'include/internal/libpq','include/server');
389401

390402
CopyFiles(
391403
'Public headers',
@@ -395,9 +407,11 @@ sub CopyIncludeFiles
395407
lcopy('src/include/libpq/libpq-fs.h',$target .'/include/libpq/')
396408
|| croak'Could not copy libpq-fs.h';
397409

398-
CopyFiles('Libpq headers',
399-
$target .'/include/','src/interfaces/libpq/',
400-
'libpq-fe.h','libpq-events.h');
410+
CopyFiles(
411+
'Libpq headers',
412+
$target .'/include/',
413+
'src/interfaces/libpq/','libpq-fe.h','libpq-events.h'
414+
);
401415
CopyFiles(
402416
'Libpq internal headers',
403417
$target .'/include/internal/',
@@ -417,9 +431,7 @@ sub CopyIncludeFiles
417431
$target .'/include/server/',
418432
'src/include/','pg_config.h','pg_config_os.h'
419433
);
420-
CopySetOfFiles('',
421-
[glob("src\\include\\*.h" ) ],
422-
$target .'/include/server/');
434+
CopySetOfFiles('',[glob("src\\include\\*.h") ],$target .'/include/server/');
423435
my$D;
424436
opendir($D,'src/include') || croak"Could not opendir on src/include!\n";
425437

@@ -430,8 +442,7 @@ sub CopyIncludeFiles
430442
nextunless (-d'src/include/' .$d);
431443

432444
EnsureDirectories($target .'/include/server',$d);
433-
system(
434-
"xcopy /s /i /q /r /y src\\include\\$d\\*.h\"$target\\include\\server\\$d\\\"")
445+
system("xcopy /s /i /q /r /y src\\include\\$d\\*.h\"$target\\include\\server\\$d\\\"")
435446
&& croak("Failed to copy include directory$d\n");
436447
}
437448
closedir($D);
@@ -463,12 +474,16 @@ sub GenerateNLSFiles
463474

464475
print"Installing NLS files...";
465476
EnsureDirectories($target,"share/locale");
466-
my@flist;
467-
File::Find::find({wanted=>
468-
sub {/^nls\.mk\z/s &&
469-
!push(@flist,$File::Find::name);
470-
}
471-
},"src");
477+
my@flist;
478+
File::Find::find(
479+
{
480+
wanted=>sub {
481+
/^nls\.mk\z/s
482+
&&!push(@flist,$File::Find::name);
483+
}
484+
},
485+
"src"
486+
);
472487
foreach (@flist)
473488
{
474489
my$prgm = DetermineCatalogName($_);
@@ -484,8 +499,7 @@ sub GenerateNLSFiles
484499
EnsureDirectories($target,"share/locale/$lang","share/locale/$lang/LC_MESSAGES");
485500
system(
486501
"\"$nlspath\\bin\\msgfmt\" -o\"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\"$_"
487-
)
488-
&& croak("Could not run msgfmt on$dir\\$_");
502+
)&& croak("Could not run msgfmt on$dir\\$_");
489503
print".";
490504
}
491505
}

0 commit comments

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