control.pm (9780544f) control.pm (dfa12748)
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

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

82 my $local_pathseparator = $installer::globals::pathseparator;
83
84 if( $^O =~ /cygwin/i )
85 { # When using cygwin's perl the PATH variable is POSIX style and ...
86 $pathvariable = qx{cygpath -mp "$pathvariable"} ;
87 # has to be converted to DOS style for further use.
88 $local_pathseparator = ';';
89 }
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

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

82 my $local_pathseparator = $installer::globals::pathseparator;
83
84 if( $^O =~ /cygwin/i )
85 { # When using cygwin's perl the PATH variable is POSIX style and ...
86 $pathvariable = qx{cygpath -mp "$pathvariable"} ;
87 # has to be converted to DOS style for further use.
88 $local_pathseparator = ';';
89 }
90 if( $^O =~ /os2/i )
91 {
92 # has to be converted to DOS style for further use.
93 $local_pathseparator = ';';
94 }
90 my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
91
92 $installer::globals::patharray = $patharrayref;
93
94 my @needed_files_in_path = ();
95
96 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
97 {

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

105
106 if ( $installer::globals::compiler eq "wntmsci10" )
107 {
108 push(@needed_files_in_path, "msvcp71.dll");
109 push(@needed_files_in_path, "msvcr71.dll");
110 }
111
112 }
95 my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
96
97 $installer::globals::patharray = $patharrayref;
98
99 my @needed_files_in_path = ();
100
101 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
102 {

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

110
111 if ( $installer::globals::compiler eq "wntmsci10" )
112 {
113 push(@needed_files_in_path, "msvcp71.dll");
114 push(@needed_files_in_path, "msvcr71.dll");
115 }
116
117 }
113 elsif ($installer::globals::iswin)
118 elsif ($installer::globals::iswin || $installer::globals::isos2)
114 {
115 @needed_files_in_path = ("zip.exe");
116 }
117 else
118 {
119 @needed_files_in_path = ("zip");
120 }
121

--- 634 unchanged lines hidden --- 		119 {
120 @needed_files_in_path = ("zip.exe");
121 }
122 else
123 {
124 @needed_files_in_path = ("zip");
125 }
126

--- 634 unchanged lines hidden ---