summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-08 17:14:34 +0200
committerPetr Mladek <pmladek@suse.cz>2013-05-29 14:42:39 +0200
commitc8ce9f6d498ea0d9f09d96fac63a4a2a1c619edc (patch)
tree052387be1184218b6166bb7edb5c018564f8eacb
parentcca26b7772ab341605f85f06dd08b403db0ecfb0 (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 3b8c8a3d6ef5..b12ab8616f6d 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -434,7 +434,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";