Skip to content

C
core
Kaydet (Commit) 4f4bd6c8 authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

use MSM directly from MSVC dir 

Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
üst 29c4a88e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
solenv/bin/modules/installer/windows/update.pm
Dosyayı görüntüle @ 4f4bd6c8
...@@ -423,10 +423,10 @@ sub readmergedatabase ...@@ -423,10 +423,10 @@ sub readmergedatabase
foreach my $mergemodule ( @{$mergemodules} ) foreach my $mergemodule ( @{$mergemodules} )
{ {
my $filename = $mergemodule->{'Name'}; my $filename = $mergemodule->{'Name'};
my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1); my $mergefile = $ENV{'MSM_PATH'} . $filename;
if ( $$mergefile eq "" ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "readmergedatabase"); } if ( ! -f $mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "readmergedatabase"); }
my $completesource = $$mergefile; my $completesource = $mergefile;
my $mergegid = $mergemodule->{'gid'}; my $mergegid = $mergemodule->{'gid'};
my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid; my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment