Drop %_EXT% which was always empty

1 files changed, 15 insertions, 26 deletions

diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index cf950eb0456f..5072a1c1a4e8 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -231,7 +231,7 @@ sub do_linklib
     return unless $has_symlinks;
 
     $from_dir = expand_macros('../%__SRC%/lib');
-    $to_dir = expand_macros('%_DEST%/lib%_EXT%');
+    $to_dir = expand_macros('%_DEST%/lib');
 
     @globbed_files = glob("$from_dir/$lib");
 
@@ -438,7 +438,6 @@ sub parse_options
 
 sub init_globals
 {
-    my $ext;
     ($module, $repository, $base_dir, $dlst_file) =  get_base();
 
     # for CWS:
@@ -463,8 +462,6 @@ sub init_globals
             exit(3);
     }
 
-    $ext = "";
-
     # Do we have common trees?
     if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
         $common_build = 1;
@@ -504,7 +501,6 @@ sub init_globals
                 [ '%__PRJROOT%',        $base_dir       ],
                 [ '%__SRC%',            $inpath         ],
                 [ '%_DEST%',            $dest           ],
-                [ '%_EXT%',             $ext            ],
                 [ '%COMMON_OUTDIR%',    $common_outdir  ],
                 [ '%COMMON_DEST%',      $common_dest    ],
                 [ '%GUI%',              $gui            ]
@@ -575,7 +571,7 @@ sub parse_dlst
             if ( /\.res\s/ ) {
                 my $imagelist = $_;
                 $imagelist =~ s/\.res/\.$ilst_ext/g;
-                $imagelist =~ s/\\bin%_EXT%\\/\\res%_EXT%\\img\\/;
+                $imagelist =~ s/\\bin\\/\\res\\img\\/;
                 push(@action_data, ['copy', $imagelist]);
             }
         }
@@ -991,33 +987,33 @@ sub push_default_actions
     if ( ! $opt_delete ) {
         # create all the subdirectories on solver
         foreach $subdir (@subdirs) {
-            push(@action_data, ['mkdir', "%_DEST%/$subdir%_EXT%"]);
+            push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
         }
         if ( $common_build ) {
             foreach $subdir (@common_subdirs) {
-                push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir%_EXT%"]);
+                push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]);
             }
         }
     }
-    push(@action_data, ['mkdir', "%_DEST%/inc%_EXT%/$module"]);
+    push(@action_data, ['mkdir', "%_DEST%/inc/$module"]);
     if ( $common_build ) {
-        push(@action_data, ['mkdir', "%COMMON_DEST%/inc%_EXT%/$module"]);
-        push(@action_data, ['mkdir', "%COMMON_DEST%/res%_EXT%/img"]);
+        push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
+        push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
     } else {
-        push(@action_data, ['mkdir', "%_DEST%/res%_EXT%/img"]);
+        push(@action_data, ['mkdir', "%_DEST%/res/img"]);
     }
 
     # deliver build.lst to $dest/inc/$module
-    push(@action_data, ['copy', "build.lst %_DEST%/inc%_EXT%/$module/build.lst"]);
+    push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]);
     if ( $common_build ) {
         # ... and to $common_dest/inc/$module
-        push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc%_EXT%/$module/build.lst"]);
+        push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]);
     }
 
     # need to copy libstaticmxp.dylib for Mac OS X
     if ( $^O eq 'darwin' )
     {
-        push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib%_EXT%/lib*static*.dylib"]);
+        push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib/lib*static*.dylib"]);
     }
 }
 
@@ -1121,10 +1117,6 @@ sub push_on_loglist
     my $solarversion  = $ENV{'SOLARVERSION'};
     $solarversion =~ s#\\#/#g;
     $entry[2] =~ s/^\Q$solarversion\E\///;
-    # strip minor from 'to'
-    my $ext = "%_EXT%";
-    $ext = expand_macros($ext);
-    $entry[2] =~ s#$ext([\\\/])#$1#o;
 
     if ( $common ) {
         push @common_log_list, [@entry];
@@ -1140,21 +1132,18 @@ sub zip_files
     $zipexe .= ' -y' unless  $^O eq 'MSWin32';
 
     my ($platform_zip_file, $common_zip_file);
-    $platform_zip_file = "%_DEST%/zip%_EXT%/$module.zip";
+    $platform_zip_file = "%_DEST%/zip/$module.zip";
     $platform_zip_file = expand_macros($platform_zip_file);
     my (%dest_dir, %list_ref);
     $dest_dir{$platform_zip_file} = $dest;
     $list_ref{$platform_zip_file} = \@zip_list;
     if ( $common_build ) {
-        $common_zip_file = "%COMMON_DEST%/zip%_EXT%/$module.zip";
+        $common_zip_file = "%COMMON_DEST%/zip/$module.zip";
         $common_zip_file = expand_macros($common_zip_file);
         $dest_dir{$common_zip_file}   = $common_dest;
         $list_ref{$common_zip_file}   = \@common_zip_list;
     }
 
-    my $ext = "%_EXT%";
-    $ext = expand_macros($ext);
-
     my @zipfiles;
     $zipfiles[0] = $platform_zip_file;
     if ( $common_build ) {
@@ -1272,8 +1261,8 @@ sub get_tempfilename
 sub write_log
 {
     my (%log_file, %file_date);
-    $log_file{\@log_list} = "%_DEST%/inc%_EXT%/$module/deliver.log";
-    $log_file{\@common_log_list} = "%COMMON_DEST%/inc%_EXT%/$module/deliver.log";
+    $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log";
+    $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log";
     $file_date{\@log_list} = $logfiledate;
     $file_date{\@common_log_list} = $commonlogfiledate;