Skip to content

C
core
Kaydet (Commit) 64a5712e authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Drop %_EXT% which was always empty

üst 8902a647
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 69 deletions
instsetoo_native/prj/d.lst
Dosyayı görüntüle @ 64a5712e
mkdir: %_DEST%\pus%_EXT% mkdir: %_DEST%\pus
..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv ..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin\userfeedback_VCL_names.csv
..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml ..\%__SRC%\misc\*.update.xml %_DEST%\pus\*.update.xml
scp2/prj/d.lst
Dosyayı görüntüle @ 64a5712e
..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin%_EXT%\setup_osl.inf ..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin%_EXT%\setup_osl.ins ..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
..\%__SRC%\bin\osl\ure.inf %_DEST%\bin%_EXT%\ure.inf ..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
..\%__SRC%\bin\osl\ure.ins %_DEST%\bin%_EXT%\ure.ins ..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin%_EXT%\sdkoo.inf ..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin%_EXT%\sdkoo.ins ..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin%_EXT%\setup_osljre.inf ..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin%_EXT%\setup_osljre.ins ..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
mkdir: %_DEST%\par%_EXT% mkdir: %_DEST%\par
mkdir: %_DEST%\par%_EXT%\osl mkdir: %_DEST%\par\osl
mkdir: %_DEST%\par%_EXT%\fat mkdir: %_DEST%\par\fat
mkdir: %_DEST%\par%_EXT%\fam mkdir: %_DEST%\par\fam
mkdir: %_DEST%\par%_EXT%\ada mkdir: %_DEST%\par\ada
mkdir: %_DEST%\par%_EXT%\adm mkdir: %_DEST%\par\adm
mkdir: %_DEST%\par%_EXT%\omc mkdir: %_DEST%\par\omc
..\%__SRC%\par\osl\*.par %_DEST%\par%_EXT%\osl\*.par ..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
..\%__SRC%\par\fat\*.par %_DEST%\par%_EXT%\fat\*.par ..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
..\%__SRC%\par\fam\*.par %_DEST%\par%_EXT%\fam\*.par ..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
..\%__SRC%\par\ada\*.par %_DEST%\par%_EXT%\ada\*.par ..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
..\%__SRC%\par\adm\*.par %_DEST%\par%_EXT%\adm\*.par ..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
..\%__SRC%\par\omc\*.par %_DEST%\par%_EXT%\omc\*.par ..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
..\inc\macros.inc %_DEST%\inc%_EXT%\macros.inc ..\inc\macros.inc %_DEST%\inc\macros.inc
..\%__SRC%\inc\langmacros.inc %_DEST%\inc%_EXT%\langmacros.inc ..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
solenv/bin/deliver.pl
Dosyayı görüntüle @ 64a5712e
...@@ -231,7 +231,7 @@ sub do_linklib ...@@ -231,7 +231,7 @@ sub do_linklib
return unless $has_symlinks; return unless $has_symlinks;
$from_dir = expand_macros('../%__SRC%/lib'); $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"); @globbed_files = glob("$from_dir/$lib");
...@@ -438,7 +438,6 @@ sub parse_options ...@@ -438,7 +438,6 @@ sub parse_options
sub init_globals sub init_globals
{ {
my $ext;
($module, $repository, $base_dir, $dlst_file) = get_base(); ($module, $repository, $base_dir, $dlst_file) = get_base();
# for CWS: # for CWS:
...@@ -463,8 +462,6 @@ sub init_globals ...@@ -463,8 +462,6 @@ sub init_globals
exit(3); exit(3);
} }
$ext = "";
# Do we have common trees? # Do we have common trees?
if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) { if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
$common_build = 1; $common_build = 1;
...@@ -504,7 +501,6 @@ sub init_globals ...@@ -504,7 +501,6 @@ sub init_globals
[ '%__PRJROOT%', $base_dir ], [ '%__PRJROOT%', $base_dir ],
[ '%__SRC%', $inpath ], [ '%__SRC%', $inpath ],
[ '%_DEST%', $dest ], [ '%_DEST%', $dest ],
[ '%_EXT%', $ext ],
[ '%COMMON_OUTDIR%', $common_outdir ], [ '%COMMON_OUTDIR%', $common_outdir ],
[ '%COMMON_DEST%', $common_dest ], [ '%COMMON_DEST%', $common_dest ],
[ '%GUI%', $gui ] [ '%GUI%', $gui ]
...@@ -575,7 +571,7 @@ sub parse_dlst ...@@ -575,7 +571,7 @@ sub parse_dlst
if ( /\.res\s/ ) { if ( /\.res\s/ ) {
my $imagelist = $_; my $imagelist = $_;
$imagelist =~ s/\.res/\.$ilst_ext/g; $imagelist =~ s/\.res/\.$ilst_ext/g;
$imagelist =~ s/\\bin%_EXT%\\/\\res%_EXT%\\img\\/; $imagelist =~ s/\\bin\\/\\res\\img\\/;
push(@action_data, ['copy', $imagelist]); push(@action_data, ['copy', $imagelist]);
} }
} }
...@@ -991,33 +987,33 @@ sub push_default_actions ...@@ -991,33 +987,33 @@ sub push_default_actions
if ( ! $opt_delete ) { if ( ! $opt_delete ) {
# create all the subdirectories on solver # create all the subdirectories on solver
foreach $subdir (@subdirs) { foreach $subdir (@subdirs) {
push(@action_data, ['mkdir', "%_DEST%/$subdir%_EXT%"]); push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
} }
if ( $common_build ) { if ( $common_build ) {
foreach $subdir (@common_subdirs) { 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 ) { if ( $common_build ) {
push(@action_data, ['mkdir', "%COMMON_DEST%/inc%_EXT%/$module"]); push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
push(@action_data, ['mkdir', "%COMMON_DEST%/res%_EXT%/img"]); push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
} else { } else {
push(@action_data, ['mkdir', "%_DEST%/res%_EXT%/img"]); push(@action_data, ['mkdir', "%_DEST%/res/img"]);
} }
# deliver build.lst to $dest/inc/$module # 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 ) { if ( $common_build ) {
# ... and to $common_dest/inc/$module # ... 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 # need to copy libstaticmxp.dylib for Mac OS X
if ( $^O eq 'darwin' ) 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 ...@@ -1121,10 +1117,6 @@ sub push_on_loglist
my $solarversion = $ENV{'SOLARVERSION'}; my $solarversion = $ENV{'SOLARVERSION'};
$solarversion =~ s#\\#/#g; $solarversion =~ s#\\#/#g;
$entry[2] =~ s/^\Q$solarversion\E\///; $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 ) { if ( $common ) {
push @common_log_list, [@entry]; push @common_log_list, [@entry];
...@@ -1140,21 +1132,18 @@ sub zip_files ...@@ -1140,21 +1132,18 @@ sub zip_files
$zipexe .= ' -y' unless $^O eq 'MSWin32'; $zipexe .= ' -y' unless $^O eq 'MSWin32';
my ($platform_zip_file, $common_zip_file); 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); $platform_zip_file = expand_macros($platform_zip_file);
my (%dest_dir, %list_ref); my (%dest_dir, %list_ref);
$dest_dir{$platform_zip_file} = $dest; $dest_dir{$platform_zip_file} = $dest;
$list_ref{$platform_zip_file} = \@zip_list; $list_ref{$platform_zip_file} = \@zip_list;
if ( $common_build ) { 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); $common_zip_file = expand_macros($common_zip_file);
$dest_dir{$common_zip_file} = $common_dest; $dest_dir{$common_zip_file} = $common_dest;
$list_ref{$common_zip_file} = \@common_zip_list; $list_ref{$common_zip_file} = \@common_zip_list;
} }
my $ext = "%_EXT%";
$ext = expand_macros($ext);
my @zipfiles; my @zipfiles;
$zipfiles[0] = $platform_zip_file; $zipfiles[0] = $platform_zip_file;
if ( $common_build ) { if ( $common_build ) {
...@@ -1272,8 +1261,8 @@ sub get_tempfilename ...@@ -1272,8 +1261,8 @@ sub get_tempfilename
sub write_log sub write_log
{ {
my (%log_file, %file_date); my (%log_file, %file_date);
$log_file{\@log_list} = "%_DEST%/inc%_EXT%/$module/deliver.log"; $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log";
$log_file{\@common_log_list} = "%COMMON_DEST%/inc%_EXT%/$module/deliver.log"; $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log";
$file_date{\@log_list} = $logfiledate; $file_date{\@log_list} = $logfiledate;
$file_date{\@common_log_list} = $commonlogfiledate; $file_date{\@common_log_list} = $commonlogfiledate;
......
solenv/prj/d.lst
Dosyayı görüntüle @ 64a5712e
mkdir: %_DEST%\bin%_EXT% mkdir: %_DEST%\bin
mkdir: %_DEST%\inc%_EXT% mkdir: %_DEST%\inc
..\inc\version.lst %_DEST%\bin%_EXT%\version.lst ..\inc\version.lst %_DEST%\bin\version.lst
..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc ..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
soltools/prj/d.lst
Dosyayı görüntüle @ 64a5712e
..\%__SRC%\bin\ldump4.exe %_DEST%\bin%_EXT%\ldump4.exe ..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe
..\%__SRC%\bin\makedepend.exe %_DEST%\bin%_EXT%\makedepend.exe ..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe
..\%__SRC%\bin\makedepend %_DEST%\bin%_EXT%\makedepend ..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend
..\%__SRC%\bin\adjustvisibility %_DEST%\bin%_EXT%\adjustvisibility ..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility
..\%__SRC%\bin\javadep.exe %_DEST%\bin%_EXT%\javadep.exe ..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe
..\%__SRC%\bin\javadep %_DEST%\bin%_EXT%\javadep ..\%__SRC%\bin\javadep %_DEST%\bin\javadep
..\%__SRC%\bin\checkdll %_DEST%\bin%_EXT%\checkdll ..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll
..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe ..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe
..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc ..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc
..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h ..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h
..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx* ..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx*
stlport/prj/d.lst
Dosyayı görüntüle @ 64a5712e
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
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