[Libreoffice-commits] core.git: 5 commits - Makefile.in scp2/source solenv/bin
David Tardon
dtardon at redhat.com
Wed May 8 08:27:26 PDT 2013
Makefile.in | 2 +-
scp2/source/ooo/directory_ooo.scp | 10 ++++++++++
scp2/source/ooo/file_extra_ooo.scp | 3 ---
solenv/bin/modules/installer.pm | 3 ++-
solenv/bin/modules/installer/simplepackage.pm | 3 +--
5 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 6e1deb99e80a5618f071cbd95529a23d9d80c7e3
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 8 17:14:34 2013 +0200
fix the internal structure of MacOS X dmg
Because of commit e70ea92b3632c376975dd85dbcb26e7ca6b95498 "scp: remove
unused macros", which removed the top-level Applications symlink, the
dmg contained an extra dir, e.g.,
LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86/LibreOfficeDev.app instead of
just LibreOfficeDev.app . This symlink used by the installer to
determine the dir to use as top-level for the installation
(solenv/bin/modules/installer/simplepackage.pm:274).
Also revert "Eek, it is hard to get the right path to the .app that is
being built", which was only needed because of the other problem.
This reverts commit 1c25b01fce27c85affee920441b9b09a7bfe0501.
Change-Id: Ib5792c7710decd021a62cd33fd841ebe26613fbc
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5b946f5..08ea22d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,6 +69,16 @@ Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
End
#endif
+#if defined MACOSX
+Unixlink gid_Unixlink_Applications
+ BIN_FILE_BODY;
+ Styles = ();
+ Dir = PD_PROGDIR;
+ Name = "Applications";
+ Target = "/Applications";
+End
+#endif
+
Directory gid_Dir_Wizards
Styles = (CREATE);
ParentID = gid_Brand_Dir_Program;
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index f1f5403..e49a93c 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -433,7 +433,7 @@ sub create_package
# participate in the signing and their validity can be
# guaranteed.
- $systemcall = "codesign --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v $localtempdir/$folder/*/$volume_name_classic_app.app";
+ $systemcall = "codesign --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v $localtempdir/$folder/$volume_name_classic_app.app";
print "... $systemcall ...\n";
my $returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
commit a71b30f6c20197eb07249aa91a85c83eb3d4fb2d
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 8 17:25:43 2013 +0200
drop pointless self-assignment
Well, it is possible that it is special perl syntax for something, but
somehow I doubt that .-)
Change-Id: I213f56c9c2b32919b7bd0c53a4639c59418345c1
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 3b8c8a3..f1f5403 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -280,7 +280,6 @@ sub create_package
my $volume_name = $allvariables->{'PRODUCTNAME'};
my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
my $volume_name_classic_app = $volume_name; # "app" should not contain version number
- $volume_name_classic = $volume_name_classic;
if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
$volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
$volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
commit e559c20c033e8c714857d0813973602a703e711f
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 8 16:39:46 2013 +0200
fix after rename of the packages
This might have caused problems with the MacOS X daily builds. Dunno. I
have no idea what is the difference between .DS_Store and .DS_Store_Dev
(they are binary) and how essential that file is.
Change-Id: Id09e6f85c101cd5b60d20b6cc9960050f8cdbac4
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 762c412..9c47bd6 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -331,7 +331,8 @@ sub run {
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
- if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibO-dev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
+ # TODO: why is this not done in scp2 based on the value of $(ENABLE_RELEASE_BUILD)?
+ if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref);
commit 898514cc0429cb48e551998f72ea8492af6e8ae4
Author: David Tardon <dtardon at redhat.com>
Date: Tue May 7 14:17:34 2013 +0200
patchfiles are obsolete and not used for filelists anyway
Change-Id: I148dab301bd2f2b31871b732c7392bf6b5d92392
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index a654ecb..0933ff7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -71,7 +71,6 @@ File gid_File_Extra_Cfgsrv
TXT_FILE_BODY;
Styles = (FILELIST);
Name = "extras_cfgsrvnolang.filelist";
- Patchfiles = ();
End
File gid_File_sd_web
@@ -181,7 +180,6 @@ File gid_File_Extra_Gallsystem
TXT_FILE_BODY;
Styles = (FILELIST);
Name = "extras_gallsystem.filelist";
- Patchfiles = ();
End
File gid_File_Extra_Gallwwwback
@@ -203,7 +201,6 @@ File gid_File_Extra_Palettes
USER_FILE_BODY;
Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
Name = "extras_palettes.filelist";
- Patchfiles = ();
End
File gid_File_Extra_Tpllayoutimpr
commit e78646e0c82e7ffbb60b0835c22b8611f6de0b99
Author: David Tardon <dtardon at redhat.com>
Date: Tue May 7 12:29:34 2013 +0200
fix after rename
Change-Id: I94d3adec33117f0faeacaf74d0e6d48f45f819ad
diff --git a/Makefile.in b/Makefile.in
index 74b53aa..68ac28c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,8 +94,8 @@ gbuild_modules := $(filter-out Module%,$(subst /, ,$(subst $(SRCDIR)/,,$(wildcar
$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
gbuild_TARGETS := AllLangHelp \
+ AllLangPackage \
AllLangResTarget \
- AllLangZip \
AutoInstallLibs \
CliLibrary \
CliNativeLibrary \
More information about the Libreoffice-commits
mailing list