we always use relative paths in ddf files

2 files changed, 13 insertions, 24 deletions

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 188141e07e88..6856a6710a13 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -82,7 +82,6 @@ LibreOffice
             USE_FILEVERSION 1
             LIBRARYVERSION 9.4.0
             PATCHCODEFILE ooo_patchcodes.txt
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -146,7 +145,6 @@ LibreOffice_Dev
             PATCHCODEFILE ooodev_patchcodes.txt
             CODEFILENAME codes_ooodev.txt
             LOCALUSERDIR $ORIGIN/..
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -183,7 +181,6 @@ URE
             PCPFILENAME ure.pcp
             GLOBALFILEGID gid_File_Dl_Cppu
             DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -227,7 +224,6 @@ LibreOffice_SDK
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -275,7 +271,6 @@ LibreOffice_Dev_SDK
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -317,7 +312,6 @@ LibreOffice_Test
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -365,7 +359,6 @@ LibreOffice_Dev_Test
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -424,7 +417,6 @@ OxygenOffice
             PROGRESSSIZE 430,5
             PROGRESSPOSITION 5,230
             PROGRESSFRAMECOLOR 207,208,211
-            RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
             STARTCENTER_INFO_URL http://www.libreoffice.org/
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
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 = "";