diff --git a/packaging/macos/Makefile b/packaging/macos/Makefile deleted file mode 100644 index bd0d783de6..0000000000 --- a/packaging/macos/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Build file for creating DMG files. -# -# The DMG packager looks for a template.dmg.bz2 for using as its -# DMG template. If it doesn't find one, it generates a clean one. -# -# If you create a DMG template, you should make one containing all -# the files listed in $(SOURCE_FILES) below, and arrange everything to suit -# your style. The contents of the files themselves does not matter, so -# they can be empty (they will be overwritten later). -# -# Remko Tronçon -# http://el-tramo.be/about -# Licensed under the MIT License. See COPYING for details. - - -################################################################################ -# Customizable variables -################################################################################ - -NAME ?= krita -VERSION ?= 4.0.0-prealpha - -SOURCE_DIR ?= /Users/boud/master -SOURCE_FILES ?= krita.app - -TEMPLATE_DMG ?= template.dmg - - -################################################################################ -# DMG building. No editing should be needed beyond this point. -################################################################################ - -MASTER_DMG=$(NAME)-$(VERSION).dmg -WC_DMG=wc.dmg -WC_DIR=wc - -.PHONY: all -all: $(MASTER_DMG) - -$(TEMPLATE_DMG): $(TEMPLATE_DMG).bz2 - bunzip2 -k $< - -$(TEMPLATE_DMG).bz2: - @echo - @echo --------------------- Generating empty template -------------------- - mkdir template - hdiutil create -fs HFSX -layout SPUD -size 250m "$(TEMPLATE_DMG)" -srcfolder template -format UDRW -volname "$(NAME)" -quiet - rmdir template - bzip2 "$(TEMPLATE_DMG)" - @echo - -$(WC_DMG): $(TEMPLATE_DMG) - cp $< $@ - -$(MASTER_DMG): $(WC_DMG) $(addprefix $(SOURCE_DIR)/,$(SOURCE_FILES)) - @echo - @echo --------------------- Creating Disk Image -------------------- - mkdir -p $(WC_DIR) - hdiutil attach "$(WC_DMG)" -noautoopen -quiet -mountpoint "$(WC_DIR)" - for i in $(SOURCE_FILES); do \ - rm -rf "$(WC_DIR)/$$i"; \ - ditto -rsrc "$(SOURCE_DIR)/$$i" "$(WC_DIR)/$$i"; \ - done - #rm -f "$@" - #hdiutil create -srcfolder "$(WC_DIR)" -format UDZO -imagekey zlib-level=9 "$@" -volname "$(NAME) $(VERSION)" -scrub -quiet - WC_DEV=`hdiutil info | grep "$(WC_DIR)" | grep "Apple_HFS" | awk '{print $$1}'` && \ - hdiutil detach $$WC_DEV -quiet -force - rm -f "$(MASTER_DMG)" - hdiutil convert "$(WC_DMG)" -quiet -format UDZO -imagekey zlib-level=9 -o "$@" - rm -rf $(WC_DIR) - @echo - -.PHONY: clean -clean: - -rm -rf $(TEMPLATE_DMG) $(MASTER_DMG) $(WC_DMG) diff --git a/packaging/macos/b.sh b/packaging/macos/b.sh deleted file mode 100755 index c9d3abcfaa..0000000000 --- a/packaging/macos/b.sh +++ /dev/null @@ -1,53 +0,0 @@ -export QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11 -export MACOSX_DEPLOYMENT_TARGET=10.11 -export SDKROOT=/Applications/Xcode.app/Contents/developer/Platforms/MacOSX.platform/developer/SDKs/MacOSX10.13.sdk - -# Be verbose -set -x -# Exit on error -set -e -/usr/bin/make ext_zlib -/usr/bin/make ext_giflib -/usr/bin/make ext_png -/usr/bin/make ext_lcms2 -/usr/bin/make ext_jpeg -/usr/bin/make ext_openssl -/usr/bin/make ext_qt - -export PATH=/Applications/CMake.app/Contents/bin/:/Users/boud/bin:/Users/boud/dev/deps/bin:/Users/boud/dev/deps/lib:/Users/boud/dev/i/bin:/Users/boud/i/lib:$PATH -export LIBRARY_PATH=/Users/boud/dev/deps/lib:/Users/boud/dev/i/lib:$LIBRARY_PATH -export C_INCLUDE_PATH=/Users/boud/dev/deps/include:/Users/boud/dev/i/include:$C_INCLUDE_PATH -export CPLUS_INCLUDE_PATH=/Users/boud/dev/deps/include:/Users/boud/dev/i/include:$CPLUS_INCLUDE_PATH -#export KRITA_PLUGIN_PATH=/Users/boud/dev/i/ -export PKG_CONFIG_PATH=/Users/boud/dev/deps/lib/pkgconfig:/Users/boud/dev/deps/share/pkgconfig:$PKG_CONFIG_PATH - -/usr/bin/make ext_python -/usr/bin/make ext_boost -/usr/bin/make ext_eigen3 -/usr/bin/make ext_exiv2 -/usr/bin/make ext_fftw3 -/usr/bin/make ext_ilmbase -/usr/bin/make ext_ocio -/usr/bin/make ext_openexr -install_name_tool -add_rpath /Users/boud/dev/deps/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./b44ExpLogTable -install_name_tool -add_rpath /Users/boud/dev/deps/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./dwaLookups -/usr/bin/make ext_openexr -/usr/bin/make ext_tiff -/usr/bin/make ext_vc -/usr/bin/make ext_libraw -/usr/bin/make ext_gettext -/usr/bin/make ext_kcrash -/usr/bin/make ext_gsl -/usr/bin/make ext_freetype -/usr/bin/make ext_fontconfig -install_name_tool -add_rpath /Users/boud/dev/deps/lib ./ext_fontconfig/ext_fontconfig-prefix/src/ext_fontconfig-build/fc-cache/.libs/fc-cache -/usr/bin/make ext_fontconfig -/usr/bin/make ext_poppler - -export DEPS_INSTALL_PREFIX=/Users/boud/dev/deps -export PYTHONPATH=$DEPS_INSTALL_PREFIX/sip:$DEPS_INSTALL_PREFIX/lib/python3.5/site-packages:$DEPS_INSTALL_PREFIX/lib/python3.5 -export PYTHONHOME=$DEPS_INSTALL_PREFIX - -/usr/bin/make ext_sip -/usr/bin/make ext_pyqt - diff --git a/packaging/macos/build-deps.sh b/packaging/macos/build-deps.sh deleted file mode 100755 index 4264f69994..0000000000 --- a/packaging/macos/build-deps.sh +++ /dev/null @@ -1,19 +0,0 @@ -cmake --build . --config RelWithDebInfo --target ext_boost -cmake --build . --config RelWithDebInfo --target ext_eigen3 -cmake --build . --config RelWithDebInfo --target ext_exiv2 -cmake --build . --config RelWithDebInfo --target ext_fftw3 -cmake --build . --config RelWithDebInfo --target ext_ilmbase -cmake --build . --config RelWithDebInfo --target ext_jpeg -cmake --build . --config RelWithDebInfo --target ext_lcms2 -cmake --build . --config RelWithDebInfo --target ext_ocio -cmake --build . --config RelWithDebInfo --target ext_openexr -install_name_tool -add_rpath /Users/boud/dev/i/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./b44ExpLogTable -install_name_tool -add_rpath /Users/boud/dev/i/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./dwaLookups -cmake --build . --config RelWithDebInfo --target ext_openexr -cmake --build . --config RelWithDebInfo --target ext_png -cmake --build . --config RelWithDebInfo --target ext_tiff -cmake --build . --config RelWithDebInfo --target ext_vc -cmake --build . --config RelWithDebInfo --target ext_libraw -cmake --build . --config RelWithDebInfo --target ext_giflib -cmake --build . --config RelWithDebInfo --target ext_kwindowsystem -cmake --build . --config RelWithDebInfo --target ext_gsl diff --git a/packaging/macos/build-release.sh b/packaging/macos/build-release.sh deleted file mode 100755 index a9bfe0f780..0000000000 --- a/packaging/macos/build-release.sh +++ /dev/null @@ -1,13 +0,0 @@ -export MACOSX_DEPLOYMENT_TARGET=10.11 -cmake ../krita-4.0.3 \ - -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/i-krita-4.0.3 \ - -DCMAKE_PREFIX_PATH=/Users/boud/dev/deps \ - -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF \ - -DKDE4_BUILD_TESTS=OFF \ - -DPACKAGERS_BUILD=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUNDLE_INSTALL_DIR=$HOME/dev/i/bin \ - -DFOUNDATION_BUILD=ON \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -make -j4 install -../deploy5.sh diff --git a/packaging/macos/configure.sh b/packaging/macos/configure.sh deleted file mode 100755 index 6fb42875c1..0000000000 --- a/packaging/macos/configure.sh +++ /dev/null @@ -1,31 +0,0 @@ -export MACOSX_DEPLOYMENT_TARGET=10.11 -export SDKROOT=/Applications/Xcode.app/Contents/developer/Platforms/MacOSX.platform/developer/SDKs/MacOSX10.13.sdk - -./configure \ - -skip qt3d \ - -skip qtactiveqt \ - -skip qtcanvas3d \ - -skip qtconnectivity \ - -skip qtdeclarative \ - -skip qtdoc \ - -skip qtenginio \ - -skip qtgraphicaleffects \ - -skip qtlocation \ - -skip qtmultimedia \ - -skip qtsensors \ - -skip qtserialport \ - -skip qtwayland \ - -skip qtwebchannel \ - -skip qtwebengine \ - -skip qtwebsockets \ - -skip qtxmlpatterns \ - -opensource -confirm-license -release \ - -no-qml-debug -no-mtdev -no-journald \ - -openssl-linked -no-libproxy \ - -no-pulseaudio -no-alsa -no-nis \ - -no-cups -no-tslib -no-pch \ - -no-dbus -no-gstreamer -no-system-proxies \ - -no-openssl -no-libproxy -no-pulseaudio \ - -nomake examples \ - -prefix /Users/boud/dev/deps - -sdk macosx10.13 diff --git a/packaging/macos/deploy.sh b/packaging/macos/deploy.sh deleted file mode 100755 index 12002ea932..0000000000 --- a/packaging/macos/deploy.sh +++ /dev/null @@ -1,32 +0,0 @@ -set -e # stop on errors -set -x # be verbose -/Users/boud/dev/fixrpath.sh $1 -rm -rf ~/dev/krita.app/ -rm -rf ~/dev/krita.dmg -cp -r ~/dev/i-$1/bin/krita.app ~/dev -cp -r ~/dev/i-$1/share/* ~/dev/krita.app/Contents/Resources -cp -r ~/dev/deps/translations ~/dev/krita.app/Contents/Resources -cd ~/dev/krita.app/Contents -ln -s Resources share -mkdir -p ~/dev/krita.app/Contents/Library/QuickLook -cp -r ~/dev/i-$1/lib/plugins/kritaquicklook.qlgenerator ~/dev/krita.app/Contents/Library/QuickLook - -~/dev/deps/bin/macdeployqt ~/dev/krita.app \ - -verbose=0 \ - -executable=/Users/boud/dev/krita.app/Contents/MacOS/krita \ - -libpath=/Users/boud/dev/i-$1/lib:/Users/boud/dev/deps/lib \ - -qmldir=/Users/boud/dev/deps/qml \ - -extra-plugins=/Users/boud/dev/i-$1/lib/kritaplugins/ \ - -extra-plugins=/Users/boud/dev/i-$1/lib/plugins/ \ - -extra-plugins=/Users/boud/dev/i-$1/plugins/ \ - -extra-plugins=/Users/boud/dev/deps/plugins - -#cp -r /Users/boud/dev/i-$1/lib/qml Resources -#cp -r /Users/boud/dev/deps/lib/python3.5 Frameworks/ -#cp -r /Users/boud/dev/i-$1/lib/krita-python-libs Frameworks/ -# XXX: fix rpath for krita.so -#cp -r /Users/boud/dev/deps/sip Frameworks/ - -install_name_tool -delete_rpath @loader_path/../../../../lib ~/dev/krita.app/Contents/MacOS/krita -rm -rf /Users/boud/dev/krita.app/Contents/PlugIns/kf5/org.kde.kwindowsystem.platforms -codesign -s "Boudewijn Rempt" --deep --continue --timestamp ~/dev/krita.app diff --git a/packaging/macos/deploy5.sh b/packaging/macos/deploy5.sh deleted file mode 100755 index c734dbd5b2..0000000000 --- a/packaging/macos/deploy5.sh +++ /dev/null @@ -1,31 +0,0 @@ -set -e # stop on errors -set -x # be verbose -/Users/boud/dev/fixrpath.sh -rm -rf ~/dev/krita.app/ -rm -rf ~/dev/krita.dmg -cp -r ~/dev/i/bin/krita.app ~/dev -cp -r ~/dev/i/share/* ~/dev/krita.app/Contents/Resources -cp -r ~/dev/deps/translations ~/dev/krita.app/Contents/Resources -cd ~/dev/krita.app/Contents -ln -s Resources share -mkdir -p ~/dev/krita.app/Contents/Library/QuickLook -cp -r ~/dev/i/lib/plugins/kritaquicklook.qlgenerator ~/dev/krita.app/Contents/Library/QuickLook - -~/dev/deps/bin/macdeployqt ~/dev/krita.app \ - -verbose=0 \ - -executable=/Users/boud/dev/krita.app/Contents/MacOS/krita \ - -qmldir=/Users/boud/dev/deps/qml \ - -extra-plugins=/Users/boud/dev/i/lib/kritaplugins/ \ - -extra-plugins=/Users/boud/dev/i/lib/plugins/ \ - -extra-plugins=/Users/boud/dev/i/plugins/ \ - -extra-plugins=/Users/boud/dev/deps/plugins - -cp -r /Users/boud/dev/i/lib/qml Resources -cp -r /Users/boud/dev/deps/lib/python3.5 Frameworks/ -cp -r /Users/boud/dev/i/lib/krita-python-libs Frameworks/ -# XXX: fix rpath for krita.so -cp -r /Users/boud/dev/deps/sip Frameworks/ - - -#install_name_tool -delete_rpath @loader_path/../../../../lib ~/dev/krita.app/Contents/MacOS/krita - diff --git a/packaging/macos/env.sh b/packaging/macos/env.sh deleted file mode 100644 index 915f495d57..0000000000 --- a/packaging/macos/env.sh +++ /dev/null @@ -1,24 +0,0 @@ -export PATH=/Applications/CMake.app/Contents/bin/:/Users/boud/bin:/Users/boud/dev/deps/bin:/Users/boud/dev/deps/lib:/Users/boud/dev/i-krita/bin:/Users/boud/i/lib:$PATH -export LIBRARY_PATH=/Users/boud/dev/deps/lib:/Users/boud/dev/i-krita/lib:$LIBRARY_PATH -export C_INCLUDE_PATH=/Users/boud/dev/deps/include:/Users/boud/dev/i-krita/include:$C_INCLUDE_PATH -export CPLUS_INCLUDE_PATH=/Users/boud/dev/deps/include:/Users/boud/dev/i-krita/include:$CPLUS_INCLUDE_PATH -#export KRITA_PLUGIN_PATH=/Users/boud/dev/i-krita/ -export PKG_CONFIG_PATH=/Users/boud/dev/deps/lib/pkgconfig:/Users/boud/dev/deps/share/pkgconfig:$PKG_CONFIG_PATH - -alias ls='ls -AFG' - -prepend() { [ -d "$2" ] && eval $1=\"$2\$\{$1:+':'\$$1\}\" && export $1 ; } - -# This will make the debug output prettier -export KDE_COLOR_DEBUG=1 -export QTEST_COLORED=1 - -# We only support from 10.11 up -export QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11 -export MACOSX_DEPLOYMENT_TARGET=10.11 -export SDKROOT=/Applications/Xcode.app/Contents/developer/Platforms/MacOSX.platform/developer/SDKs/MacOSX10.1.sdk - -# Python -#export DEPS_INSTALL_PREFIX=/Users/boud/dev/deps -#export PYTHONPATH=$DEPS_INSTALL_PREFIX/sip:$DEPS_INSTALL_PREFIX/lib/python3.5/site-packages:$DEPS_INSTALL_PREFIX/lib/python3.5 -#export PYTHONHOME=$DEPS_INSTALL_PREFIX diff --git a/packaging/macos/fixrpath.sh b/packaging/macos/fixrpath.sh deleted file mode 100755 index 57be6f13c0..0000000000 --- a/packaging/macos/fixrpath.sh +++ /dev/null @@ -1,10 +0,0 @@ -install_name_tool -add_rpath /Users/boud/dev/i-$1/lib ~/dev/i-$1/bin/krita.app/Contents/MacOS/krita -install_name_tool -add_rpath /Users/boud/dev/deps/lib ~/dev/i-$1/bin/krita.app/Contents/MacOS/krita -install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib /Users/boud/dev/i-$1/bin/krita.app/Contents/MacOS/krita - - -FILES="$(find /Users/boud/dev/i-$1/lib/ -name '*so' -o -name '*dylib')" -for FILE in $FILES ; do - echo $FILE - install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib $FILE -done diff --git a/packaging/macos/macdeploy-qt.diff b/packaging/macos/macdeploy-qt.diff deleted file mode 100644 index 92794936a6..0000000000 --- a/packaging/macos/macdeploy-qt.diff +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp -index 81639f2..a7b28d1 100644 ---- a/src/macdeployqt/macdeployqt/main.cpp -+++ b/src/macdeployqt/macdeployqt/main.cpp -@@ -57,6 +57,7 @@ int main(int argc, char **argv) - qDebug() << " -always-overwrite : Copy files even if the target file exists"; - qDebug() << " -codesign= : Run codesign with the given identity on all executables"; - qDebug() << " -appstore-compliant: Skip deployment of components that use private API"; -+ qDebug() << " -extra-plugins= : Deploy plugins from given extra directory"; - qDebug() << ""; - qDebug() << "macdeployqt takes an application bundle as input and makes it"; - qDebug() << "self-contained by copying in the Qt frameworks and plugins that"; -@@ -96,6 +97,7 @@ int main(int argc, char **argv) - extern bool runCodesign; - extern QString codesignIdentiy; - extern bool appstoreCompliant; -+ QStringList extraPluginDirectories; - - for (int i = 2; i < argc; ++i) { - QByteArray argument = QByteArray(argv[i]); -@@ -151,6 +153,13 @@ int main(int argc, char **argv) - } else if (argument == QByteArray("-appstore-compliant")) { - LogDebug() << "Argument found:" << argument; - appstoreCompliant = true; -+ } else if (argument.startsWith(QByteArray("-extra-plugins"))) { -+ LogDebug() << "Argument found:" << argument; -+ int index = argument.indexOf('='); -+ if (index == -1) -+ LogError() << "Missing extra plugins directory"; -+ else -+ extraPluginDirectories << argument.mid(index+1); - } else if (argument.startsWith("-")) { - LogError() << "Unknown argument" << argument << "\n"; - return 1; -@@ -178,10 +187,13 @@ int main(int argc, char **argv) - deploymentInfo.deployedFrameworks = deploymentInfo.deployedFrameworks.toSet().toList(); - } - -- if (plugins && !deploymentInfo.qtPath.isEmpty()) { -+ if ((plugins && !deploymentInfo.qtPath.isEmpty()) || !extraPluginDirectories.isEmpty()) { - deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins"; - LogNormal(); -- deployPlugins(appBundlePath, deploymentInfo, useDebugLibs); -+ if (plugins && !deploymentInfo.qtPath.isEmpty()) -+ deployPlugins(appBundlePath, deploymentInfo, useDebugLibs); -+ if (!extraPluginDirectories.isEmpty()) -+ deployExtraPlugins(appBundlePath, deploymentInfo, useDebugLibs, extraPluginDirectories); - createQtConf(appBundlePath); - } - -diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp -index d20b219..4a9aa1f 100644 ---- a/src/macdeployqt/shared/shared.cpp -+++ b/src/macdeployqt/shared/shared.cpp -@@ -1020,6 +1020,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl - } - } - -+void deployExtraPlugins(const ApplicationBundleInfo &appBundleInfo, -+ const QString pluginDestinationPath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories) -+{ -+ foreach (const QString &extraPluginDir, extraPluginDirectories) { -+ LogNormal() << "Deploying plugins from" << extraPluginDir; -+ -+ // search for dylib and so files, both work as plugins on mac os -+ QDir dir(extraPluginDir); -+ dir.setFilter(QDir::Files); -+ dir.setNameFilters(QStringList() << "*.dylib" << "*.so"); -+ QDirIterator dirIterator(dir, QDirIterator::Subdirectories); -+ QStringList pluginList; -+ while (dirIterator.hasNext()) { -+ dirIterator.next(); -+ if (!QFileInfo(dirIterator.filePath()).isFile()) -+ continue; -+ pluginList.append(dir.relativeFilePath(dirIterator.filePath())); -+ } -+ -+ // deploy all found plugins -+ foreach (const QString &plugin, pluginList) { -+ QString sourcePath = extraPluginDir + "/" + plugin; -+ const QString destinationPath = pluginDestinationPath + "/" + extraPluginDir.split("/", QString::SkipEmptyParts).last() + "/" + plugin; -+ QDir dir; -+ dir.mkpath(QFileInfo(destinationPath).path()); -+ -+ if (copyFilePrintStatus(sourcePath, destinationPath)) { -+ runStrip(destinationPath); -+ -+ QList frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs); -+ deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath); -+ -+ } -+ } -+ } -+} -+ - void createQtConf(const QString &appBundlePath) - { - // Set Plugins and imports paths. These are relative to App.app/Contents. -@@ -1061,6 +1098,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, - deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs); - } - -+void deployExtraPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories) -+{ -+ ApplicationBundleInfo applicationBundle; -+ applicationBundle.path = appBundlePath; -+ applicationBundle.binaryPath = findAppBinary(appBundlePath); -+ -+ const QString pluginDestinationPath = appBundlePath + "/" + "Contents/PlugIns"; -+ deployExtraPlugins(applicationBundle, pluginDestinationPath, deploymentInfo, useDebugLibs, extraPluginDirectories); -+} -+ - void deployQmlImport(const QString &appBundlePath, const QSet &rpaths, const QString &importSourcePath, const QString &importName) - { - QString importDestinationPath = appBundlePath + "/Contents/Resources/qml/" + importName; -diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h -index ea678c2..f10efd3 100644 ---- a/src/macdeployqt/shared/shared.h -+++ b/src/macdeployqt/shared/shared.h -@@ -100,6 +100,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis - DeploymentInfo deployQtFrameworks(QList frameworks,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath); - void createQtConf(const QString &appBundlePath); - void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs); -+void deployExtraPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories); - bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInfo, QStringList &qmlDirs); - void changeIdentification(const QString &id, const QString &binaryPath); - void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath); diff --git a/packaging/macos/notes.txt b/packaging/macos/notes.txt deleted file mode 100644 index a2875ce713..0000000000 --- a/packaging/macos/notes.txt +++ /dev/null @@ -1,50 +0,0 @@ -OSX Build Notes - -Setup: - -~/dev/b: build location for all dependencies (run cmake ../krita/3rdparty in /dev/b) -~/dev/d: download location for all dependencies -~/dev/i: install location for all dependencies -~/dev/build: manual build location -~/dev/krita: source checkout - -deploy.sh: for creating the krita.app bundle - -cmake command to configure krita: - -cmake ../krita \ - -DCMAKE_PREFIX_PATH=$HOME/dev/i \ - -DCMAKE_LIBRARY_PATH=$HOME/dev/i/lib \ - -Wno-dev \ - -DCMAKE_INSTALL_PREFIX=$HOME/dev/i \ - -DBUILD_TESTING=OFF \ - -DDEFINE_NO_DEPRECATED=1 \ - -DBUILD_doc=FALSE \ - -DBUNDLE_INSTALL_DIR=$HOME/dev/i/bin - - -cmake command to configure the ext projects - -cmake ../krita/3rdparty/ -DCMAKE_INSTALL_PREFIX=$HOME/dev/i/ -DEXTERNALS_DOWNLOAD_DIR=$HOME/dev/d/ -DINSTALL_ROOT=$HOME/dev/i/ - -cmake line for qt creator - --DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DDEFINE_NO_DEPRECATED=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$HOME/dev/i -DCMAKE_INCLUDE_PATH=$HOME/dev/i/include -DQT_QMAKE_EXECUTABLE=$HOME/dev/i/bin/qmake -DCMAKE_PREFIX_PATH=$HOME/dev/i - -rm -rf ~/krita.app/ -rm -rf ~/krita.dmg -cp -r ~/dev/i/bin/krita.app ~ -cp -r ~/dev/i/share ~/krita.app/Contents/ -macdeployqt ~/krita.app \ - -verbose=1 \ - -extra-plugins=$HOME/dev/i/lib/kritaplugins/ \ - -extra-plugins=$HOME/dev/i/lib/kf5/ \ - -extra-plugins=$HOME/dev/i/lib/plugins/ \ - -extra-plugins=$HOME/dev/i/plugins/ \ - -dmg -mkdir ~/krita.app/Contents/PlugIns/kritaplugins -mv ~/krita.app/Contents/PlugIns/*so ~/krita.app/Contents/PlugIns/kritaplugins - -To make open_exr build, manual step after it fails because dwalookups cannot find Half: -install_name_tool -add_rpath /Users/boud/dev/i/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./b44ExpLogTable -install_name_tool -add_rpath /Users/boud/dev/i/lib /Users/boud/dev/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./dwaLookups diff --git a/packaging/macos/run-cmake-3rdparty.sh b/packaging/macos/run-cmake-3rdparty.sh deleted file mode 100755 index a1a958e9b1..0000000000 --- a/packaging/macos/run-cmake-3rdparty.sh +++ /dev/null @@ -1,10 +0,0 @@ -export MACOSX_DEPLOYMENT_TARGET=10.11 -export QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11 -export MACOSX_DEPLOYMENT_TARGET=10.11 -export SDKROOT=/Applications/Xcode.app/Contents/developer/Platforms/MacOSX.platform/developer/SDKs/MacOSX10.13.sdk - -/Applications/CMake.app/Contents/bin/cmake ../krita/3rdparty/ \ - -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/deps \ - -DINSTALL_ROOT=/Users/boud/dev/deps \ - -DEXTERNALS_DOWNLOAD_DIR=/Users/boud/Downloads \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 diff --git a/packaging/macos/run-cmake-gmic-qt.sh b/packaging/macos/run-cmake-gmic-qt.sh deleted file mode 100755 index 84a05f6893..0000000000 --- a/packaging/macos/run-cmake-gmic-qt.sh +++ /dev/null @@ -1,7 +0,0 @@ -export MACOSX_DEPLOYMENT_TARGET=10.11 -cmake ../gmic-qt \ - -DGMIC_QT_HOST=krita \ - -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/i \ - -DCMAKE_PREFIX_PATH=/Users/boud/dev/deps \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 diff --git a/packaging/macos/run-cmake-krita.sh b/packaging/macos/run-cmake-krita.sh deleted file mode 100755 index 53d2e01c86..0000000000 --- a/packaging/macos/run-cmake-krita.sh +++ /dev/null @@ -1,17 +0,0 @@ -export MACOSX_DEPLOYMENT_TARGET=10.11 -export DEPS_INSTALL_PREFIX=/Users/boud/dev/deps -export PYTHONPATH=$DEPS_INSTALL_PREFIX/sip:$DEPS_INSTALL_PREFIX/lib/python3.5/site-packages:$DEPS_INSTALL_PREFIX/lib/python3.5 -export PYTHONHOME=$DEPS_INSTALL_PREFIX -cmake ../$1 \ - -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/i-$1 \ - -DCMAKE_PREFIX_PATH=/Users/boud/dev/deps \ - -DDEFINE_NO_DEPRECATED=0 \ - -DBUILD_TESTING=OFF \ - -DFOUNDATION_BUILD=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUNDLE_INSTALL_DIR=$HOME/dev/i-$1/bin \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \ - -DHIDE_SAFE_ASSERTS=ON \ - -DBUILD_TESTING=FALSE \ - -DPYQT_SIP_DIR_OVERRIDE=$DEPS_INSTALL_PREFIX/share/sip/ \ - -DHAVE_MEMORY_LEAK_TRACKER=FALSE