Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OS X Installer Fixes #1629

Merged
merged 5 commits into from
Oct 25, 2016
Merged

OS X Installer Fixes #1629

merged 5 commits into from
Oct 25, 2016

Conversation

shehzan10
Copy link
Member

@shehzan10 shehzan10 commented Oct 17, 2016

  • Fixes Forge share/Forge/* being installed both in /usr/local/* and /usr/local/share/Forge/*` (the former was wrong).
  • Fixes postinstall script not working due to not having +x enabled.
  • Fixes how user is set in postinstall script.
  • Fixes installation errors due to brew installation commands for packages that may have already been installed.
    • This is done by checking if packages are already installed and then installing only if needed.
  • Fixes library symlinks becoming real files on their own. The copy from install directory to temp directory for symlinks was copying the files they point to rather than create symlinks. (No wonder the installers were so big in size). The installer size has become a 3rd of what it used to be.

[skip arrayfire ci]

These fixes have been retroactively been applied to the ArrayFire-v3.4.1_OSX.pkg installer available on the arrayfire.com/download site.

@shehzan10 shehzan10 added this to the v3.4.2 milestone Oct 17, 2016
…links

This issue probably originated around 3.3 where libaf*.dylib / libaf*.major.dylib
were not being treated as symlinks but were full versions of the library
on their own.
This was due to CMake copying symlinks as the files they point to rather
than symlinks.
@@ -14,13 +14,16 @@ if [ ! -f $brew ]; then
exit 1
fi

user=$(ps aux | grep console | grep -v 'grep\|root' | cut -d' ' -f1 | head -n1)
#user=$(ps aux | grep console | grep -v 'grep\|root' | cut -d' ' -f1 | head -n1)
user=$(stat -f '%Su' $HOME)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Member

@umar456 umar456 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make sure that this is working as expected and the libraries are being installed in the correct location.

@@ -261,10 +296,10 @@ IF(BUILD_GRAPHICS)
PKG_BUILD( PKG_NAME ForgeLibrary
DEPENDS OSX_INSTALL_SETUP_FORGE_LIB
TARGETS forge_lib_package
INSTALL_LOCATION /usr/local/
INSTALL_LOCATION /usr/local/lib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right. Was it really installing the libraries in the /usr/local directory? I don't see a change in the PKG_BUILD function that is associated with this change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shehzan10 clarified that this is indeed correct.

@umar456 umar456 merged commit 59189d4 into arrayfire:hotfix-3.4.2 Oct 25, 2016
@shehzan10 shehzan10 deleted the osx-installer-fixes branch November 11, 2016 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants