Commit eb5dfa03 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Fix various typos

Summary: Found via `codespell -q 3 -S *.xpm,./3rdparty -L ba,fo,lod,pard,uint,vertexes`

Reviewers: rempt, #krita, woltherav

Reviewed By: #krita, woltherav

Subscribers: woltherav

Tags: #krita

Differential Revision: https://phabricator.kde.org/D24680
parent b3cde41a
......@@ -157,7 +157,7 @@ The PyDev integration can be configured to visually highlight portions of the co
as well as run autopep8 via shortcuts.
pep8.py and autopep8.py can suppress select rules via the "--ignore" command line argument.
To ignore the 79 charachers per line rule, pep8.py can be called like this:
To ignore the 79 characters per line rule, pep8.py can be called like this:
pep8.py --ignore=E501
......
# Building Krita for Android
First of all, I use linux to do my builds and testing. Although,
they _should_ work on Windows/macOS, I cannott give any guarentee
they _should_ work on Windows/macOS, I cannot give any guarantee
that it will.
## Setting up Android SDK and NDK
We right now use android ndk version `r18b` to do our builds. So,
We right now use Android NDK version `r18b` to do our builds. So,
I would recommend to use that. Download it from [google's website](https://developer.android.com/ndk/downloads/older_releases.html)
then extract it.
Next, Android SDK. You can either download Android Studio or just
the `sdk-tools`. Both could be downloaded from [google's website](https://developer.android.com/studio).
If you downloaded Android Studio then open sdk manager and download
If you downloaded Android Studio then open SDK manager and download
`Android SDK Build-Tools`.
(more info: https://developer.android.com/studio/intro/update#sdk-manager)
......
......@@ -688,11 +688,11 @@
The fact that a processing visitor does a really simple task
(processes a single node) that is very easy to report progress
using progress bars in the layer box. We just need to use progress
pxoxy of the node we process (=KisNodeProgressProxy=). Our
processings framework provides even easier way of doing this. You
just need to instantiate a =ProgressHelper= object and ask it to
create a =KoUpdater= object for you. And all is done. You can see
an example in =KisTransformProcessingVisitor= class.
proxy of the node we process (=KisNodeProgressProxy=). Our
processings framework provides an even easier way of doing this.
You just need to instantiate a =ProgressHelper= object and ask it
to create a =KoUpdater= object for you. And all is done. You can
see an example in =KisTransformProcessingVisitor= class.
** Testing
Usage of a common framework makes testing really simple. There is a
......
......@@ -120,7 +120,7 @@ KisBrush* KisAutoBrush::clone() const
return new KisAutoBrush(*this);
}
/* It's difficult to predict the mask height when exaclty when there are
/* It's difficult to predict the mask height when exactly when there are
* more than 2 spikes, so we return an upperbound instead. */
static KisDabShape lieAboutDabShape(KisDabShape const& shape)
{
......
......@@ -101,7 +101,7 @@ public:
*
* It is no longer a parametric shape when the path was manipulated
*
* @return true if it is a parametic shape, false otherwise
* @return true if it is a parametric shape, false otherwise
*/
bool isParametricShape() const;
......
......@@ -77,7 +77,7 @@ public:
with particular objects using setMapping(). The objects' signals
can then be connected to the map() slot which will emit the
mapped() signal with the string or integer associated with the
original signalling object. Mappings can be removed later using
original signaling object. Mappings can be removed later using
removeMappings().
Example: Suppose we want to create a custom widget that contains
......
......@@ -62,7 +62,7 @@
with particular objects using setMapping(). The objects' signals
can then be connected to the map() slot which will emit the
mapped() signal with the string or integer associated with the
original signalling object. Mappings can be removed later using
original signaling object. Mappings can be removed later using
removeMappings().
Example: Suppose we want to create a custom widget that contains
......
......@@ -1828,7 +1828,7 @@ int KisImage::workingThreadsLimit() const
void KisImage::notifySelectionChanged()
{
/**
* The selection is calculated asynchromously, so it is not
* The selection is calculated asynchronously, so it is not
* handled by disableUIUpdates() and other special signals of
* KisImageSignalRouter
*/
......
......@@ -971,7 +971,7 @@ public Q_SLOTS:
* image will be reloaded into UI by sigSizeChanged(), so there is
* no need to inform the UI about individual dirty rects.
*
* The last call to enableUIUpdates() will return the list of udpates
* The last call to enableUIUpdates() will return the list of updates
* that were requested while they were blocked.
*/
void disableUIUpdates() override;
......
......@@ -188,7 +188,7 @@ public:
/**
* The rendering of the image may not always happen in the order
* of the main graph. Pass-through nodes ake some subgraphs
* of the main graph. Pass-through nodes make some subgraphs
* linear, so it the order of rendering change. projectionLeaf()
* is a special interface of KisNode that represents "a graph for
* projection rendering". Therefore the nodes in projectionLeaf()
......@@ -209,7 +209,7 @@ protected:
* a requested rect. E.g. we change a rect of 2x2, then we want to
* apply a convolution filter with kernel 4x4 (changeRect is
* (2+2*3)x(2+2*3)=8x8) to that area. The rect that should be updated
* on the layer will be exaclty 8x8. More than that the needRect for
* on the layer will be exactly 8x8. More than that the needRect for
* that update will be 14x14. See \ref needeRect.
*/
virtual QRect changeRect(const QRect &rect, PositionToFilthy pos = N_FILTHY) const;
......
......@@ -57,7 +57,7 @@ KisHLineIterator2::KisHLineIterator2(KisDataManager *dataManager, qint32 x, qint
m_tileWidth = m_pixelSize * KisTileData::HEIGHT;
// let's prealocate first row
// let's preallocate first row
for (quint32 i = 0; i < m_tilesCacheSize; i++){
fetchTileDataForCache(m_tilesCache[i], m_leftCol + i, m_row);
}
......
......@@ -118,7 +118,7 @@ public:
/**
* Removes all the history that preceds the revision
* Removes all the history that precedes the revision
* pointed by oldestMemento. That is after calling to
* purgeHistory(someMemento) you won't be able to do
* rollback(someMemento) anymore.
......
......@@ -44,7 +44,7 @@ class KisMementoManager;
/**
* Provides abstraction to a tile.
* + A tile contains a part of a PaintDevice,
* but only the individual pixels are accesable
* but only the individual pixels are accessible
* and that only via iterators.
* + Actual tile data is stored in KisTileData that can be
* shared between many tiles
......
......@@ -185,7 +185,7 @@ public:
inline qint32 numUsers() const;
/**
* Conveniece method. Returns true iff the tile data is linked to
* Convenience method. Returns true iff the tile data is linked to
* information only and therefore can be swapped out easily.
*
* Effectively equivalent to: (mementoed() && numUsers() <= 1)
......
......@@ -62,7 +62,7 @@ KisVLineIterator2::KisVLineIterator2(KisDataManager *dataManager, qint32 x, qint
m_tileSize = m_lineStride * KisTileData::HEIGHT;
// let's prealocate first row
// let's preallocate first row
for (int i = 0; i < m_tilesCacheSize; i++){
fetchTileDataForCache(m_tilesCache[i], m_column, m_topRow + i);
}
......
......@@ -48,7 +48,7 @@ void KisLocklessStackTest::testOperations()
}
/************ BENCHMARKING INFRASTRACTURE ************************/
/************ BENCHMARKING INFRASTRUCTURE ************************/
#define NUM_TYPES 2
......
......@@ -102,7 +102,7 @@ public Q_SLOTS:
/**
* Change the internal data of the resource to the given byte
* array. If the byte array is not valid, setData returns
* false, otherwwise true.
* false, otherwise true.
*/
bool setData(QByteArray data);
......
......@@ -570,7 +570,7 @@ void KoBorder::paintBorderSide(QPainter &painter, QPointF lineStart, QPointF lin
lineEnd.setY(lineEnd.y() + inwardsAcross * displacement);
}
// Adjust for neigboring inner lines.
// Adjust for neighboring inner lines.
if (neighbour1 && neighbour1->style == BorderDouble) {
displacement = neighbour1->outerPen.widthF() + neighbour1->spacing;
if (isVertical) {
......
......@@ -70,7 +70,7 @@ public:
void setSortByPosition(bool enable);
/**
* Numberred entries
* Numbered entries
* If text:numbered-entries attribute is true then bibliography entries or citations will be numbered.
*/
bool numberedEntries() const;
......
......@@ -79,7 +79,7 @@ protected:
/**
* The order in which channels() returns is not the same as the internal representation,
* that of the pixel internally. This method converts external usage to internal usage.
* This method uses some basic assumtpions about the layout of the pixel, so _extremely_
* This method uses some basic assumptions about the layout of the pixel, so _extremely_
* exotic spaces might want to override this (see makeExternalToInternal source for
* those assumptions)
**/
......
......@@ -2,7 +2,7 @@
* \mainpage
* Pigment is a Color Manipulation System with pluggable color spaces. Color spaces
* can be based on the <a href="http://www.littlecms.com">LCMS library</a>, or using
* the <a href="http://www.opengtl.org">OpenCTL</a> implmenetation of the Color
* the <a href="http://www.opengtl.org">OpenCTL</a> implmentation of the Color
* Transformation Langboth are optional.
*
* Pigment color spaces offers support for many common manipulations and for
......
......@@ -793,7 +793,7 @@ inline T cfShadeIFSIllusions(T src, T dst) {
template<class T>
inline T cfFogLightenIFSIllusions(T src, T dst) {
using namespace Arithmetic;
//Known as Bright Blending mode found in IFS Illusions. Picked this name because the shading reminds me of fog when overlaying with a gradientt.
//Known as Bright Blending mode found in IFS Illusions. Picked this name because the shading reminds me of fog when overlaying with a gradient.
qreal fsrc = scale<qreal>(src);
qreal fdst = scale<qreal>(dst);
......@@ -844,7 +844,7 @@ inline T cfModuloShift(T src, T dst) {
template<class T>
inline T cfModuloShiftContinuous(T src, T dst) {
using namespace Arithmetic;
//This blending mode do not behave like difference/equilavent with destination layer inverted if you use group layer on addition while the content of group layer contains several addition-mode layers, it works as expected on float images. So, no need to change this.
//This blending mode do not behave like difference/equivalent with destination layer inverted if you use group layer on addition while the content of group layer contains several addition-mode layers, it works as expected on float images. So, no need to change this.
qreal fsrc = scale<qreal>(src);
qreal fdst = scale<qreal>(dst);
......
......@@ -96,7 +96,7 @@ struct OptimizedOpsSelector<KoRgbF32Traits>
static KoCompositeOp* createAlphaDarkenOp(const KoColorSpace *cs) {
// TODO: optimized code is disabled for 4.2 release,
// becasue it causes bug https://bugs.kde.org/show_bug.cgi?id=404133
// because it causes bug https://bugs.kde.org/show_bug.cgi?id=404133
if (useCreamyAlphaDarken()) {
return new KoCompositeOpAlphaDarken<KoRgbF32Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
} else {
......
......@@ -190,7 +190,7 @@ static inline void write_channels_32(quint8 *data,
Vc::float_v::AsArg c3) {
/**
* FIXME: make conversion float->int
* use methematical rounding
* use mathematical rounding
*/
const quint32 lowByteMask = 0xFF;
......
......@@ -110,7 +110,7 @@ int main(int argc, char** argv)
file.close();
if (QProcess::execute(cmd) != 0) {
errorPigment << "An error has occurred when executing : '" << cmd << "' the most likely cause is that 'dot' command is missing, and that you should install graphviz (from http://www.graphiz.org)";
errorPigment << "An error has occurred when executing : '" << cmd << "' the most likely cause is that 'dot' command is missing, and that you should install graphviz (from http://www.graphviz.org)";
}
} else {
errorPigment << "Unknown output type : " << outputType;
......
......@@ -726,7 +726,7 @@ void KisApplication::checkAutosaveFiles()
// all autosave files for our application
QStringList autosaveFiles = dir.entryList(filters, QDir::Files | QDir::Hidden);
// Visibile autosave files
// Visible autosave files
filters = QStringList() << QString("krita-*-*-autosave.kra");
autosaveFiles += dir.entryList(filters, QDir::Files);
......
......@@ -946,8 +946,8 @@ bool KisDocument::exportDocumentSync(const QUrl &url, const QByteArray &mimeType
{
/**
* The caller guarantees that noone else uses the document (usually,
* it is a temporary docuent created specifically for exporting), so
* The caller guarantees that no one else uses the document (usually,
* it is a temporary document created specifically for exporting), so
* we don't need to copy or lock the document. Instead we should just
* ensure the barrier lock is synced and then released.
*/
......
......@@ -269,7 +269,7 @@ QString KisImportExportManager::askForAudioFileName(const QString &defaultDir, Q
mimeTypes << "audio/flac";
dialog.setMimeTypeFilters(mimeTypes);
dialog.setCaption(i18nc("@titile:window", "Open Audio"));
dialog.setCaption(i18nc("@title:window", "Open Audio"));
return dialog.filename();
}
......
......@@ -620,7 +620,7 @@ void KisMainWindow::notifyChildViewDestroyed(KisView *view)
{
/**
* If we are the last view of the window, Qt will not activate another tab
* before destroying tab/window. In ths case we should clear oll the dangling
* before destroying tab/window. In this case we should clear all the dangling
* pointers manually by setting the current view to null
*/
viewManager()->inputManager()->removeTrackedCanvas(view->canvasBase());
......@@ -2418,7 +2418,7 @@ void KisMainWindow::configChanged()
* Dirty workaround for a bug in Qt (checked on Qt 5.6.1):
*
* If you make a window "Show on top" and then switch to the tabbed mode
* the window will contiue to be painted in its initial "mid-screen"
* the window will continue to be painted in its initial "mid-screen"
* position. It will persist here until you explicitly switch to its tab.
*/
if (viewMode == QMdiArea::TabbedView) {
......
......@@ -96,7 +96,7 @@ public:
/**
* @brief renameGroup
* @param oldName
* @return new name if change accpeted, empty string if cancelled
* @return new name if change accepted, empty string if cancelled
*/
QString renameGroup(const QString &oldName);
void changeGroupRowCount(const QString &name, int newRowCount);
......
......@@ -630,8 +630,8 @@ void KisCanvas2::resetCanvas(bool useOpenGL)
void KisCanvas2::startUpdateInPatches(const QRect &imageRect)
{
/**
* We don't do patched loading for openGL canvas, becasue it loads
* the tiles, which are bascially "patches". Therefore, big chunks
* We don't do patched loading for openGL canvas, because it loads
* the tiles, which are basically "patches". Therefore, big chunks
* of memory are never allocated.
*/
if (m_d->currentCanvasIsOpenGL) {
......
......@@ -212,7 +212,7 @@ public:
return *this == defaultGrid();
}
/// Transform the grids using the given \p tranform. Please note that \p transform
/// Transform the grids using the given \p transform. Please note that \p transform
/// should be in 'image' coordinate system.
/// Used with image-wide transformations.
void transform(const QTransform &transform);
......
......@@ -121,7 +121,7 @@ public:
bool isDefault() const;
/// Transform the guides using the given \p tranform. Please note that \p transform
/// Transform the guides using the given \p transform. Please note that \p transform
/// should be in 'document' coordinate system.
/// Used with image-wide transformations.
void transform(const QTransform &transform);
......
......@@ -97,7 +97,7 @@ private:
* The rect that was requested during creation
* of the patch. It equals to patchRect withount
* borders
* These borders are introdused for more accurate
* These borders are introduced for more accurate
* smooth scaling to reduce border effects
* (IN m_image PIXELS, relative to m_image's topLeft);
......
......@@ -208,7 +208,7 @@ KisUpdateInfoSP KisPrescaledProjection::updateCache(const QRect &dirtyImageRect)
}
/**
* We needn't this stuff ouside KisImage's area. We're not displaying
* We needn't this stuff outside KisImage's area. We're not displaying
* anything painted outside the image anyway.
*/
QRect croppedImageRect = dirtyImageRect & m_d->image->bounds();
......
......@@ -50,7 +50,7 @@ class KRITAUI_EXPORT KisNodeDummy : public QObject
public:
/**
* Take care tha KisNodeDummy does not take ownership over
* Take care that KisNodeDummy does not take ownership over
* the \p nodeShape since the handling of the removal of the
* children of the shape is done by flake. So please handle it
* manually.
......
......@@ -87,8 +87,8 @@ void KisToolInvocationAction::deactivate(int shortcut)
if (!inputManager()) return;
/**
* Activate call might ave come before actual input manager or tool proxy
* was attached. So we may end up wil null activatedToolProxy.
* Activate call might have come before actual input manager or tool proxy
* was attached. So we may end up with null activatedToolProxy.
*/
if (d->activatedToolProxy) {
d->activatedToolProxy->deactivateToolAction(KisTool::Primary);
......
......@@ -75,7 +75,7 @@ public:
/// Use to communicate a progress report to the section delegate on an action (a value of -1 or a QVariant() disable the progress bar
ProgressRole,
/// Speacial activation role which is emitted when the user Atl-clicks on a section
/// Special activation role which is emitted when the user Atl-clicks on a section
/// The item is first activated with ActiveRole, then a separate AlternateActiveRole comes
AlternateActiveRole,
......
......@@ -186,7 +186,7 @@ public:
/// it will return false if we are in the middle of creating the assistant.
virtual bool isAssistantComplete() const;
/// Transform the assistant using the given \p tranform. Please note that \p transform
/// Transform the assistant using the given \p transform. Please note that \p transform
/// should be in 'document' coordinate system.
/// Used with image-wide transformations.
virtual void transform(const QTransform &transform);
......
......@@ -96,7 +96,7 @@ protected:
}
/**
* Re-implement this to set te widgets with the values in @p setting.
* Re-implement this to set the widgets with the values in @p setting.
*/
virtual void readOptionSetting(const KisPropertiesConfigurationSP setting) {
Q_UNUSED(setting);
......
......@@ -174,7 +174,7 @@ void KisSafeDocumentLoader::fileChangedCompressed(bool sync)
m_d->initialFileTimeStamp = initialFileInfo.lastModified();
if (s_fileSystemWatcher->files().contains(m_d->path) == false && initialFileInfo.exists()) {
//When a path is renamed it is removed, so we ought to readd it.
//When a path is renamed it is removed, so we ought to re-add it.
s_fileSystemWatcher->addPath(m_d->path);
}
......
......@@ -104,7 +104,7 @@ KisOpenGLUpdateInfoSP KisOpenGLUpdateInfoBuilder::buildUpdateInfo(const QRect &r
/**
* Why the rect is artificial? That's easy!
* It does not represent any real piece of the image. It is
* intentionally stretched to get through the overlappping
* intentionally stretched to get through the overlapping
* stripes of neutrality and poke neighbouring tiles.
* Thanks to the rect we get the coordinates of all the tiles
* involved into update process
......
......@@ -1025,7 +1025,7 @@ QVector<QRect> KisOpenGLCanvas2::updateCanvasProjection(const QVector<KisUpdateI
{
#ifdef Q_OS_MACOS
/**
* On OSX openGL defferent (shared) contexts have different execution queues.
* On OSX openGL different (shared) contexts have different execution queues.
* It means that the textures uploading and their painting can be easily reordered.
* To overcome the issue, we should ensure that the textures are uploaded in the
* same openGL context as the painting is done.
......
......@@ -87,7 +87,7 @@ public:
/**
* Called by KisToolProxy when the primary is no longer possible
* to be started now, e.g. when its modifiers and released. The
* tool is supposed revert all the preparetions it has doen in
* tool is supposed to revert all the preparations it has done in
* activatePrimaryAction().
*/
virtual void deactivatePrimaryAction();
......
......@@ -207,7 +207,7 @@ void KisNewsWidget::calculateVersionUpdateStatus()
}
// minor versions are the same, so maybe bugfix version is different
// sometimes we don't communicate this, implictly make 0 if it doesn't exist
// sometimes we don't communicate this, implicitly make 0 if it doesn't exist
if (onlineReleaseAnnouncement[2].isNull()) {
onlineReleaseAnnouncement[2] = "0";
}
......
......@@ -662,7 +662,7 @@ QString KisAdvancedColorSpaceSelector::nameWhitePoint(QVector <double> whitePoin
return name;
}
//B (0.34980, 0.35270) (4874K) (Direct Sunlight at noon)(obsolete)
//C (0.31039, 0.31905) (6774K) (avarage/north sky daylight)(obsolete)
//C (0.31039, 0.31905) (6774K) (average/north sky daylight)(obsolete)
//D50 (0.34773, 0.35952) (5003K) (Horizon Light, default color of white paper, ICC profile standard illuminant)
if ((whitePoint[0]>0.34773-0.005 && whitePoint[0]<0.34773 + 0.005) &&
(whitePoint[1]>0.35952-0.005 && whitePoint[1]<0.35952 + 0.005)){
......
......@@ -369,7 +369,7 @@ void KisCurveWidget::paintEvent(QPaintEvent *)
curveX = d->m_curve.points().at(i).x();
curveY = d->m_curve.points().at(i).y();
int handleSize = 12; // how big should control points be (diamater size)
int handleSize = 12; // how big should control points be (diameter size)
if (i == d->m_grab_point_index) {
// active point is slightly more "bold"
......
......@@ -67,7 +67,7 @@ public:
/// returns the internal ID for the paint op (brush engine)
QString currentPaintOpId();
///fill the cutoutOverlay rect with the cotent of an image, used to get the image back when selecting a preset
///fill the cutoutOverlay rect with the content of an image, used to get the image back when selecting a preset
///@param image image that will be used, should be image of an existing preset resource
void setPresetImage(const QImage& image);
......
......@@ -103,7 +103,7 @@ KisDlgInternalColorSelector::KisDlgInternalColorSelector(QWidget *parent, KoColo
connect(m_d->paletteChooser, SIGNAL(sigPaletteSelected(KoColorSet*)), this, SLOT(slotChangePalette(KoColorSet*)));
connect(m_ui->cmbNameList, SIGNAL(sigColorSelected(KoColor)), SLOT(slotColorUpdated(KoColor)));
// For some bizare reason, the modal dialog doesn't like having the colorset set, so let's not.
// For some bizarre reason, the modal dialog doesn't like having the colorset set, so let's not.
if (config.paletteBox) {
//TODO: Add disable signal as well. Might be not necessary...?
KConfigGroup cfg(KSharedConfig::openConfig()->group(""));
......
......@@ -44,7 +44,7 @@ public:
int baseLength();
/// Set the base length
/// @param length base length for the items, will be clamped if ouside range
/// @param length base length for the items, will be clamped if outside range
void setBaseLength(int length);
Q_SIGNALS:
......
......@@ -49,7 +49,7 @@ public:
/**
* Returns all action collections of the current snapshot
*
* WARNING: the collections are owned by the shapshot! Don't destroy
* WARNING: the collections are owned by the snapshot! Don't destroy
* the snapshot before you are done with the collections!
*/
QMap<QString, KActionCollection*> actionCollections();
......
......@@ -29,7 +29,7 @@
*
* The group can thus look like one solid bar: ( button1 | button2 | button3 )
*
* For groupping layout can be used. For exclusive checkable behaviour assign QButtonGroup on the buttons.
* For grouping layout can be used. For exclusive checkable behaviour assign QButtonGroup on the buttons.
*/
class KRITAWIDGETUTILS_EXPORT KoGroupButton : public KisHighlightedToolButton
{
......
......@@ -192,7 +192,7 @@ void KoProgressUpdater::updateUi()
{
// This function runs in the app main thread. All the progress
// updates arrive at the KoUpdaterPrivate instances through
// queued connections, so until we relinguish control to the
// queued connections, so until we relinquish control to the
// event loop, the progress values cannot change, and that
// won't happen until we return from this function (which is
// triggered by a timer)
......
......@@ -78,7 +78,7 @@ public:
void capturedShortcut(const QVariant &, const QModelIndex &);
/**
* Add @p action at hierchy level @p level.
* Add @p action at hierarchy level @p level.
*
* Filters out QActions (TODO: hmm) and unnamed actions before adding.
*
......
......@@ -113,7 +113,7 @@ bool KCheckAccelerators::eventFilter(QObject *obj, QEvent *e)
return false;
}
switch (e->type()) { // just simplify debuggin
switch (e->type()) { // just simplify debugging
case QEvent::ShortcutOverride:
if (key && (static_cast<QKeyEvent *>(e)->key() == key)) {
block = true;
......
......@@ -102,7 +102,7 @@
to KAction properties.
-->
<!ELEMENT Action EMPTY>
<!-- We defined only a few standard KAction properties here. Theoritically we can have
<!-- We defined only a few standard KAction properties here. Theoretically we can have
any property here -->
<!ATTLIST Action
name CDATA #REQUIRED
......
......@@ -100,7 +100,7 @@ out is designed to be copy pasted into osxdeploy.sh in the osasrcipt section
USAGE: dmgstyle.sh [option] <args>
Options:
<empty> No option fetchs dummy design window state for paste in osxdeploy
<empty> No option fetches dummy design window state for paste in osxdeploy
set set default values changing the background to image in <args>
"
}
......
......@@ -108,7 +108,7 @@ print_if_error() {
fi
}
# print status messges
# print status messages
print_msg() {
printf "\e[32m%s\e[0m\n" "${1}"
printf "%s\n" "${1}" >> ${OUPUT_LOG}
......@@ -476,7 +476,7 @@ print_usage () {
printf "BUILDSTEPS:\t\t"
printf "\n builddeps \t\t Run cmake step for 3rd party dependencies, optionally takes a [pkg] arg"
printf "\n rebuilddeps \t\t Rerun make and make install step for 3rd party deps, optionally takes a [pkg] arg
\t\t\t usefull for cleaning install directory and quickly reinstall all deps."
\t\t\t useful for cleaning install directory and quickly reinstall all deps."
printf "\n fixboost \t\t Fixes broken boost \@rpath on OSX"
printf "\n build \t\t\t Builds krita"
printf "\n buildtarball \t\t\t Builds krita from provided [file] tarball"
......
......@@ -9,7 +9,7 @@
# A short explanation of what it does:
# - Copies krita.app contents to kritadmg folder
# - Copies i/share to Contents/Resources excluding unnecesary files
# - Copies i/share to Contents/Resources excluding unnecessary files
# - Copies translations, qml and quicklook PlugIns
# - Copies i/plugins and i/lib/plugins to Contents/PlugIns
......@@ -21,13 +21,13 @@
# make install
# the script changes dir to installation/bin to run macdeployqt as it can be buggy
# if not runned from the same folder as the binary is on.
# if not run from the same folder as the binary is on.
# - Fix rpath from krita bin
# - Find missing libraries from plugins and copy to Framworks or plugins.
# - Find missing libraries from plugins and copy to Frameworks or plugins.
# This uses oTool iterative to find all unique libraries, then it searches each
# library fond in <kritadmg> folder, and if not found attempts to copy contents
# to the appropiate folder, either Frameworks (if frameworks is in namefile, or
# to the appropriate folder, either Frameworks (if frameworks is in namefile, or
# library has plugin isnot in path), or plugin if otherwise.
# - Builds DMG
......@@ -44,7 +44,7 @@ if test -z ${BUILDROOT}; then
exit
fi
# print status messges
# print status messages
print_msg() {
printf "\e[32m${1}\e[0m\n" "${@:2}"
# printf "%s\n" "${1}" >> ${OUPUT_LOG}
......@@ -101,14 +101,14 @@ print_usage () {
\t\t\t security add-generic-password -a \"AC_USERNAME\" -w <secret_password> -s \"KRITA_AC_PASS\"
-notarize-pass \t If given, the Apple acount password. Otherwise an attempt will be macdeployqt_exists
-notarize-pass \t If given, the Apple account password. Otherwise an attempt will be macdeployqt_exists
\t\t\t to get the password from keychain using the account given in <notarize-ac> option.
-style \t\t Style file defined from 'dmgstyle.sh' output
-bg \t\t Set a background image for dmg folder.
\t\t\t osxdeploy needs an input image to attach to the dmg background
\t\t\t image recomended size is at least 950x500
\t\t\t image recommended size is at least 950x500
"
}
......@@ -253,7 +253,7 @@ add_lib_to_list() {
# Add to libs_used
# converts absolute buildroot path to @rpath
find_needed_libs () {
# echo "Analizing libraries with oTool..." >&2
# echo "Analyzing libraries with oTool..." >&2
local libs_used="" # input lib_lists founded
for libFile in ${@}; do
......@@ -334,7 +334,7 @@ krita_findmissinglibs() {
strip_python_dmginstall() {
# reduce size of framework python
# Removes tests, installers, pyenv, distutils
echo "Removing unnecesary files from Python.Framework to be packaged..."
echo "Removing unnecessary files from Python.Framework to be packaged..."
PythonFrameworkBase="${KRITA_DMG}/krita.app/Contents/Frameworks/Python.framework"
cd ${PythonFrameworkBase}
......@@ -545,7 +545,7 @@ signBundle() {
# sign Frameworks and libs
cd ${KRITA_DMG}/krita.app/Contents/Frameworks
# remove debug version as both versions cant be signed.
# remove debug version as both versions can't be signed.
rm ${KRITA_DMG}/krita.app/Contents/Frameworks/QtScript.framework/Versions/Current/QtScript_debug
find . -type f -perm 755 -or -name "*.dylib" -or -name "*.so" | batch_codesign
find . -type d -name "*.framework" | xargs printf "%s/Versions/Current\n" | batch_codesign
......@@ -592,7 +592,7 @@ notarize_build() {
if [[ -n "$(grep 'Error' <<< ${altoolResponse})" ]]; then
printf "ERROR: xcrun altool exited with the following error! \n\n%s\n\n" "${altoolResponse}"
printf "This could mean there is an error in AppleID autentication!\n"
printf "This could mean there is an error in AppleID authentication!\n"
printf "aborting notarization\n"
NOTARIZE="false"
return
......@@ -664,7 +664,7 @@ createDMG () {
chmod -Rf go-w "/Volumes/${DMG_title}"