scp2/source/ooo/scpaction_ooo.scp | 1 + setup_native/prj/d.lst | 1 + setup_native/source/mac/ooo/DS_Store_Dev |binary solenv/bin/make_installer.pl | 1 + solenv/bin/modules/installer/scriptitems.pm | 15 +++++++++++++++ 5 files changed, 18 insertions(+)
New commits: commit dab79744767c05fd5268866937e225b74e658cea Author: Thorsten Behrens <tbehr...@suse.com> Date: Thu Nov 3 18:57:23 2011 +0100 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. diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index dba0ce7..8dccba2 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 71290f1..6e8cae9 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 new file mode 100644 index 0000000..2a6fcf9 Binary files /dev/null and b/setup_native/source/mac/ooo/DS_Store_Dev differ diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 10dac77..3fa31f5 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 9189b10..96bdec9 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 ################################################################################ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits