strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give Mac master builds a nice background .dmg image, too

Browse source 
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals "LibO-dev" - in that case, we use the DS_Store_Dev one.
This commit is contained in:
Thorsten Behrens 2011-11-03 18:57:23 +01:00
parent 06840c3b3d
commit dab7974476
5 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scp2/source/ooo/scpaction_ooo.scp
View file

@ -291,6 +291,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = "DS_Store";
DevVersionCopy = "DS_Store_Dev";
LangPackCopy = "DS_Store_Langpack";
PatchCopy = "DS_Store_Patch";
Name = ".DS_Store";

1
setup_native/prj/d.lst
View file

@ -31,6 +31,7 @@ mkdir: %_DEST%\bin\osolsmf
..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat

BIN
setup_native/source/mac/ooo/DS_Store_Dev Normal file
View file

Binary file not shown.

1
solenv/bin/make_installer.pl
View file

@ -487,6 +487,7 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }

15
solenv/bin/modules/installer/scriptitems.pm
View file

@ -619,6 +619,21 @@ sub use_langpack_copy_scpaction
}
}
################################################################################
# Using different HostName for dev builds
################################################################################
sub use_devversion_copy_scpaction
{
my ($scpactionsref) = @_;
for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
{
my $onescpaction = ${$scpactionsref}[$i];
if (( $onescpaction->{'DevVersionCopy'} ) && ( $onescpaction->{'DevVersionCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'DevVersionCopy'}; }
}
}
################################################################################
# Using different HostName for language packs
################################################################################