diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-11-03 18:57:23 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-03 19:02:55 +0100 |
| commit | dab79744767c05fd5268866937e225b74e658cea (patch) | |
| tree | 652a4ac44b44c115db8322ea180905eb49812fff | |
| parent | 06840c3b3d90ad79c58398d1420577c28d630d57 (diff) | |
Give Mac master builds a nice background .dmg image, too
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals "LibO-dev" - in that case, we use the DS_Store_Dev one.
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 1 | ||||
| -rw-r--r-- | setup_native/prj/d.lst | 1 | ||||
| -rw-r--r-- | setup_native/source/mac/ooo/DS_Store_Dev | bin | 0 -> 15364 bytes | |||
| -rw-r--r-- | solenv/bin/make_installer.pl | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 15 |
5 files changed, 18 insertions, 0 deletions
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index dba0ce7a8d59..8dccba28c7f0 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -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"; diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 71290f13e7af..6e8cae9d66ae 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -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 diff --git a/setup_native/source/mac/ooo/DS_Store_Dev b/setup_native/source/mac/ooo/DS_Store_Dev Binary files differnew file mode 100644 index 000000000000..2a6fcf9d71e5 --- /dev/null +++ b/setup_native/source/mac/ooo/DS_Store_Dev diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 10dac770fd63..3fa31f5626d1 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -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); } diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 9189b109bd6f..96bdec9b475a 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -620,6 +620,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 ################################################################################ |