From c6ea960290a598db55d3331159f2777e75b82a3a Mon Sep 17 00:00:00 2001 From: Gerald Schmidt Date: Sat, 22 Sep 2018 16:16:36 +0200 Subject: [PATCH] fixed missing dynlib dependencies --- .gitignore | 2 ++ mac/Makefile | 12 +++++++++++- mac/Makefile.diskimage | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 70d3584..436088e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ *.dmg *.app *.bz2 +xmlcopyeditor +xmlcopyeditor.exe diff --git a/mac/Makefile b/mac/Makefile index f80530b..2d5f613 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -25,7 +25,17 @@ bundle: Info.plist xmlcopyeditor version.plist InfoPlist.strings xmlcopyeditor.i cp -R ../src/xpm xmlcopyeditor.app/Contents/SharedSupport/ cp -R ../src/xsl xmlcopyeditor.app/Contents/SharedSupport/ cp xmlcopyeditor.icns xmlcopyeditor.app/Contents/Resources/ - for DYLIB in lib/libxml2.2 lib/libxslt.1 lib/libpcre.0 local/lib/libaspell.15 local/lib/libxerces-c-3.1; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/MacOS/xmlcopyeditor; done + # process xmlcopyeditor + for DYLIB in lib/libxml2.2 lib/libxslt.1 lib/libpcre.0 local/lib/libaspell.15 local/lib/libxerces-c-3.1 local/lib/libpng15.15 local/lib/libjpeg.8 local/lib/libtiff.5 lib/libexpat.1 lib/libz.1 lib/libiconv.2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/MacOS/xmlcopyeditor; done + chmod +w xmlcopyeditor.app/Contents/Frameworks/*.dylib + #process libtiff + for DYLIB in local/lib/libjpeg.8 lib/libz.1; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libtiff.5.dylib; done + #process libxslt + for DYLIB in lib/libxml2.2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libxslt.1.dylib; done + #process libxerces-c + for DYLIB in lib/libcurl.4; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libxerces-c-3.1.dylib; done + #process libcurl + for DYLIB in lib/libcrypto.35 lib/libssl.35 lib/libapple_nghttp2; do BASENAME=`basename /usr/$${DYLIB}.dylib`; echo "relinking $${BASENAME}"; cp /usr/$${DYLIB}.dylib xmlcopyeditor.app/Contents/Frameworks/; install_name_tool -change /usr/$${DYLIB}.dylib @executable_path/../Frameworks/$${BASENAME} xmlcopyeditor.app/Contents/Frameworks/libcurl.4.dylib; done dmg: make -f Makefile.diskimage clean: diff --git a/mac/Makefile.diskimage b/mac/Makefile.diskimage index 0fd628c..ae508be 100644 --- a/mac/Makefile.diskimage +++ b/mac/Makefile.diskimage @@ -25,7 +25,7 @@ SOURCE_DIR ?= . SOURCE_FILES ?= xmlcopyeditor.app Applications.lnk TEMPLATE_DMG ?= xmlcopyeditor.dmg -TEMPLATE_SIZE ?= 40m +TEMPLATE_SIZE ?= 60m ################################################################################ # DMG building. No editing should be needed beyond this point.