You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2012/01/17 15:34:52 UTC
svn commit: r1232430 - in /incubator/ooo/trunk/main:
scp2/source/ooo/scpaction_ooo.scp setup_native/prj/d.lst
solenv/bin/make_installer.pl solenv/bin/modules/installer/globals.pm
solenv/bin/modules/installer/scriptitems.pm
Author: jsc
Date: Tue Jan 17 14:34:52 2012
New Revision: 1232430
URL: http://svn.apache.org/viewvc?rev=1232430&view=rev
Log:
adapt setup package scripts to handle special DS_Store file for developer snapshot builds
Modified:
incubator/ooo/trunk/main/scp2/source/ooo/scpaction_ooo.scp
incubator/ooo/trunk/main/setup_native/prj/d.lst
incubator/ooo/trunk/main/solenv/bin/make_installer.pl
incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm
incubator/ooo/trunk/main/solenv/bin/modules/installer/scriptitems.pm
Modified: incubator/ooo/trunk/main/scp2/source/ooo/scpaction_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/scpaction_ooo.scp?rev=1232430&r1=1232429&r2=1232430&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/scpaction_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/scpaction_ooo.scp Tue Jan 17 14:34:52 2012
@@ -362,6 +362,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = "DS_Store";
+ DevCopy = "DS_Store_Dev";
LangPackCopy = "DS_Store_Langpack";
PatchCopy = "DS_Store_Patch";
Name = ".DS_Store";
Modified: incubator/ooo/trunk/main/setup_native/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/setup_native/prj/d.lst?rev=1232430&r1=1232429&r2=1232430&view=diff
==============================================================================
--- incubator/ooo/trunk/main/setup_native/prj/d.lst (original)
+++ incubator/ooo/trunk/main/setup_native/prj/d.lst Tue Jan 17 14:34:52 2012
@@ -34,6 +34,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
+..\source\mac\ooo\DS_Store_Dev %_DEST%\bin%_EXT%\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
..\source\mac\sdk\DS_Store_SDK %_DEST%\bin%_EXT%\osl\DS_Store_SDK
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
Modified: incubator/ooo/trunk/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/make_installer.pl?rev=1232430&r1=1232429&r2=1232430&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/make_installer.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/make_installer.pl Tue Jan 17 14:34:52 2012
@@ -258,7 +258,6 @@ if ( $installer::globals::globallogging
installer::ziplist::overwrite_ooovendor( $allvariableshashref );
if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3c.log", $allvariableshashref); }
-
########################################################
# Check if this is simple packaging mechanism
########################################################
@@ -341,6 +340,11 @@ if ($installer::globals::languages_defin
if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodinglist($includepatharrayref); }
+####################################################################
+# MacOS dmg build requires special DS_Store file to arrange icons
+####################################################################
+if (($installer::globals::ismacdmgbuild) && ($installer::globals::product eq "OpenOffice_Dev")) { $installer::globals::devsnapshotbuild = 1; }
+
#####################################################################
# Including additional inc files for variable settings, if defined
#####################################################################
@@ -483,6 +487,7 @@ if (( ! $allvariableshashref->{'XPDINSTA
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
+if (($installer::globals::devsnapshotbuild)) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
# $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref);
Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1232430&r1=1232429&r2=1232430&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm Tue Jan 17 14:34:52 2012
@@ -128,7 +128,7 @@ BEGIN
$setupscript_defined_in_productlist = 0;
$islinux = 0;
$issolaris = 0;
- $ismacosx = 0;
+ $ismacosx = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
$islinuxrpmbuild = 0;
@@ -346,6 +346,7 @@ BEGIN
$patch_user_dir = 0;
$addchildprojects = 0;
$languagepack = 0;
+ $devsnapshotbuild = 0;
$tab = 0;
$patch = 0;
$patchincludepath = "";
Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/scriptitems.pm?rev=1232430&r1=1232429&r2=1232430&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/scriptitems.pm Tue Jan 17 14:34:52 2012
@@ -605,7 +605,7 @@ sub use_patch_hostname
}
################################################################################
-# Using different HostName for language packs
+# Using langpack copy action for language packs
################################################################################
sub use_langpack_copy_scpaction
@@ -620,7 +620,7 @@ sub use_langpack_copy_scpaction
}
################################################################################
-# Using different HostName for language packs
+# Using copy patch action
################################################################################
sub use_patch_copy_scpaction
@@ -635,6 +635,21 @@ sub use_patch_copy_scpaction
}
################################################################################
+# Using dev copy patch action for developer snapshot builds
+################################################################################
+
+sub use_dev_copy_scpaction
+{
+ my ($scpactionsref) = @_;
+
+ for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
+ {
+ my $onescpaction = ${$scpactionsref}[$i];
+ if (( $onescpaction->{'DevCopy'} ) && ( $onescpaction->{'DevCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'DevCopy'}; }
+ }
+}
+
+################################################################################
# Shifting parent directories of URE and Basis layer, so that
# these directories are located below the Brand layer.
# Style: SHIFT_BASIS_INTO_BRAND_LAYER