summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-08 17:14:34 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-08 17:26:41 +0200
commit6e1deb99e80a5618f071cbd95529a23d9d80c7e3 (patch)
tree85562288d572a9b793a9f769978aa3595d8b782e
parenta71b30f6c20197eb07249aa91a85c83eb3d4fb2d (diff)
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
-rw-r--r--scp2/source/ooo/directory_ooo.scp10
-rwxr-xr-xsolenv/bin/modules/installer/simplepackage.pm2
2 files changed, 11 insertions, 1 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5b946f516578..08ea22dbf021 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 f1f54030660d..e49a93c0bbc3 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";