diff options
author | Andras Timar <atimar@suse.com> | 2012-03-06 21:17:00 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-03-06 21:17:00 +0100 |
commit | 07cf4a4a21b4f8f9325e7a7243fba6295ec42a54 (patch) | |
tree | 33ec1fc09a0a00c1271927abc95766f70972ce9c /solenv | |
parent | remove unused SETSTATICPATH variable (diff) | |
download | core-07cf4a4a21b4f8f9325e7a7243fba6295ec42a54.tar.gz core-07cf4a4a21b4f8f9325e7a7243fba6295ec42a54.zip |
we always use relative paths in ddf files
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 6a9d68bd8d3f..f1d1e3df9998 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -202,7 +202,7 @@ sub generate_cab_file_list if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; } # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); # all files with the same cabinetfile have increasing sequencenumbers @@ -224,7 +224,7 @@ sub generate_cab_file_list $sourcepath = $nextfile->{'sourcepath'}; if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; } # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); $uniquename = $nextfile->{'uniquename'}; my $localdoinclude = 1; my $nextfilestyles = ""; @@ -296,7 +296,7 @@ sub generate_cab_file_list if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; } # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); my @ddffile = (); @@ -317,7 +317,7 @@ sub generate_cab_file_list $sourcepath = $nextfile->{'sourcepath'}; if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; } # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); $uniquename = $nextfile->{'uniquename'}; my $localdoinclude = 1; my $nextfilestyles = ""; @@ -376,7 +376,7 @@ sub generate_cab_file_list # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); # all files with the same cabinetfile are directly behind each other in the files collector @@ -397,7 +397,7 @@ sub generate_cab_file_list $sourcepath = $nextfile->{'sourcepath'}; if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; } # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); $uniquename = $nextfile->{'uniquename'}; my $localdoinclude = 1; my $nextfilestyles = ""; @@ -459,7 +459,7 @@ sub generate_cab_file_list my $uniquename = $onefile->{'uniquename'}; # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); if ( $counter == 1 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); } @@ -513,7 +513,7 @@ sub generate_cab_file_list my $uniquename = $onefile->{'uniquename'}; # to avoid lines with more than 256 characters, it can be useful to use relative paths - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); } + $sourcepath = make_relative_ddf_path($sourcepath); if ( $i == 0 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); } @@ -1610,14 +1610,11 @@ sub execute_packaging $infoline = "chdir: $to \n"; push( @installer::globals::logfileinfo, $infoline); - # if the ddf file contains relative paths, it is necessary to change into the temp directory - if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) - { - $to = $installer::globals::temppath; - chdir($to); - $infoline = "chdir: $to \n"; - push( @installer::globals::logfileinfo, $infoline); - } + # the ddf file contains relative paths, it is necessary to change into the temp directory + $to = $installer::globals::temppath; + chdir($to); + $infoline = "chdir: $to \n"; + push( @installer::globals::logfileinfo, $infoline); # changing the tmp directory, because makecab.exe generates temporary cab files my $origtemppath = ""; |