Changeset 7a6cc12 in subsurface


Ignore:
Timestamp:
Jul 3, 2017, 1:30:10 PM (2 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
6012351
Parents:
65f6db6
Message:

Mac packaging - don't move Grantlee plugins

I don't know why we moved them from the 5.0 subdirectory, but that
seems to break things now. Odd.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/macosx/make-package.sh

    r20254a43 r7a6cc12  
    6060done
    6161
    62 # it seems the compiler in XCode 4.6 doesn't build Grantlee5 correctly,
    63 # so cheat and copy over pre-compiled binaries created with a newer compiler
    64 # and adjust their references to the Grantlee template library
    65 #
    66 # -disabled for now as this is still under more investigation-
    67 # cp -a /Users/hohndel/src/tmp/Subsurface.app/Contents Subsurface.app/
    68 #cp ${DIR}/tmp/Subsurface.app/Contents/Frameworks/lib{sql,usb,zip}* Subsurface.app/Contents/Frameworks
    69 
    7062# clean up shared library dependency in the Grantlee plugins
    7163for i in Subsurface.app/Contents/PlugIns/grantlee/5.0/*.so; do
     
    7365        SONAME=$(basename $OLD )
    7466        install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} $i;
    75         mv $i Subsurface.app/Contents/PlugIns/grantlee
     67        OLD=$(otool -L $i | grep QtCore | cut -d\  -f1 | tr -d "\t")
     68        install_name_tool -change ${OLD} @executable_path/../Frameworks/QtCore.framework/QtCore $i;
    7669done
    77 rmdir Subsurface.app/Contents/PlugIns/grantlee/5.0
    7870
    7971# copy things into staging so we can create a nice DMG
Note: See TracChangeset for help on using the changeset viewer.