control.pm (b274bc22) control.pm (e6ca2088)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 62 unchanged lines hidden (view full) ---

71# Checking the local system
72# Checking existence of needed files in include path
73#########################################################
74
75sub check_system_path
76{
77 # The following files have to be found in the environment variable PATH
78 # All platforms: zip
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 62 unchanged lines hidden (view full) ---

71# Checking the local system
72# Checking existence of needed files in include path
73#########################################################
74
75sub check_system_path
76{
77 # The following files have to be found in the environment variable PATH
78 # All platforms: zip
79 # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
80 # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
81
82 my $onefile;
83 my $error = 0;
84 my $pathvariable = $ENV{'PATH'};
85 my $local_pathseparator = $installer::globals::pathseparator;
86
87 if( $^O =~ /cygwin/i )

--- 11 unchanged lines hidden (view full) ---

99
100 $installer::globals::patharray = $patharrayref;
101
102 my @needed_files_in_path = ();
103
104 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
105 {
106 @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
79 # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
80
81 my $onefile;
82 my $error = 0;
83 my $pathvariable = $ENV{'PATH'};
84 my $local_pathseparator = $installer::globals::pathseparator;
85
86 if( $^O =~ /cygwin/i )

--- 11 unchanged lines hidden (view full) ---

98
99 $installer::globals::patharray = $patharrayref;
100
101 my @needed_files_in_path = ();
102
103 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
104 {
105 @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
107
108 if ( $installer::globals::compiler eq "wntmsci8" )
109 {
110 push(@needed_files_in_path, "msvcp70.dll");
111 push(@needed_files_in_path, "msvcr70.dll");
112 }
113
114 if ( $installer::globals::compiler eq "wntmsci10" )
115 {
116 push(@needed_files_in_path, "msvcp71.dll");
117 push(@needed_files_in_path, "msvcr71.dll");
118 }
119
120 }
121 elsif ($installer::globals::iswin || $installer::globals::isos2)
122 {
123 @needed_files_in_path = ("zip.exe");
124 }
125 else
126 {
127 @needed_files_in_path = ("zip");

--- 640 unchanged lines hidden --- 		106 }
107 elsif ($installer::globals::iswin || $installer::globals::isos2)
108 {
109 @needed_files_in_path = ("zip.exe");
110 }
111 else
112 {
113 @needed_files_in_path = ("zip");

--- 640 unchanged lines hidden ---