Skip to content

Commit 55a5e20

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into khodand-patch-2
2 parents 955a0c5 + 40e924b commit 55a5e20

File tree

52 files changed

+338
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+338
-221
lines changed

‎.github/config.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
2-
#Configuration for TODO Probot
3-
todo:
4-
keyword: "@todoIssue"
5-
6-
7-
8-
91
# Configuration for request-info - https://github.com/behaviorbot/request-info
102
# *Required* Comment to reply with
113
requestInfoReplyComment: >

‎.mergify.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ pull_request_rules:
88
- "#commented-reviews-by=0" # no discussion happened in reviews
99
- "#changes-requested-reviews-by=0" # no more changes were requested
1010
# - "#status-success = 6" # all checks succeeded
11-
- status-success="continuous-integration/travis-ci/pr"
12-
- status-success="continuous-integration/appveyor/pr"
1311
- status-success="Mergeable"
1412
- status-success="CodeFactor"
1513

‎appveyor.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ install:
115115
- dir C:\Qt
116116

117117

118-
before_build:
119-
- curl https://raw.githubusercontent.com/MestreLion/git-tools/master/git-restore-mtime-bare > .fix-mtime.py
120-
- python "%PYTHON_PATH%\Tools\scripts\2to3.py" -v -p -w -n -f all .fix-mtime.py
121-
- sed -ri "s#line.(startswith|split)\(#line.\1\(b#g" .fix-mtime.py
122-
- python .fix-mtime.py
123-
- git submodule foreach --recursive python %cd%\.fix-mtime.py
118+
# before_build:
119+
# - curl https://raw.githubusercontent.com/MestreLion/git-tools/master/git-restore-mtime-bare > .fix-mtime.py
120+
# - python "%PYTHON_PATH%\Tools\scripts\2to3.py" -v -p -w -n -f all .fix-mtime.py
121+
# - sed -ri "s#line.(startswith|split)\(#line.\1\(b#g" .fix-mtime.py
122+
# - python .fix-mtime.py
123+
# - git submodule foreach --recursive python %cd%\.fix-mtime.py
124124

125125

126126
build_script:

‎buildScripts/travis/install.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ rm -f build.log
55

66
case $TRAVIS_OS_NAME in
77
osx)
8-
[ -d "$TRIK_QT/5.12.5" ] || plugins/robots/thirdparty/trikRuntime/trikRuntime/scripts/install_qt_mac.sh "$TRIK_QT" >> build.log 2>&1 & QT_INSTALLER_PID=$!
8+
[ -d "$TRIK_QT/5.12.6" ] || plugins/robots/thirdparty/trikRuntime/trikRuntime/scripts/install_qt_mac.sh "$TRIK_QT" >> build.log 2>&1 & QT_INSTALLER_PID=$!
99
export HOMEBREW_NO_AUTO_UPDATE=1
1010
brew tap "hudochenkov/sshpass"
1111
TRIK_BREW_PACKAGES="ccache coreutils libusb pkg-config gnu-sed sshpass"
1212
brew install $TRIK_BREW_PACKAGES || brew upgrade $TRIK_BREW_PACKAGES
1313
wait $QT_INSTALLER_PID
14+
echo "FINISHED Qt installation"
15+
find $TRIK_QT/5.12.6 -name qmake -perm +111 -type f -or -type l
1416
;;
1517
linux)
1618
docker pull trikset/linux-builder

‎buildScripts/travis/script.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -xuevo pipefail
44
CODECOV=true
55
case $TRAVIS_OS_NAME in
66
osx)
7-
export PATH="$TRIK_QT/5.12.5/clang_64/bin:$PATH"
7+
export PATH="$TRIK_QT/5.12.6/clang_64/bin:$PATH"
88
export PATH="/usr/local/opt/ccache/libexec:$PATH"
99
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
1010
;;

‎installer/packages/qreal-base/ru.qreal.root/meta/prebuild-linux-gnu.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cp $INSTALLER_ROOT/platform/$PRODUCT-linux-gnu-platform.config $PWD/../
1616

1717
cp -pr $BIN_DIR/libqrkernel.so* $PWD/../data/lib/
1818
cp -pr $BIN_DIR/libqrgraph.so* $PWD/../data/lib/
19-
#cp -pr $BIN_DIR/libquazip.so* $PWD/../data/lib/
19+
cp -L $(pkg-config --variable=sharedlibdir zlib)/libz.so $PWD/../data/lib/libz.so.1
2020
cp -pr $BIN_DIR/libqrrepo.so* $PWD/../data/lib/
2121
cp -pr $BIN_DIR/libqrutils.so* $PWD/../data/lib/
2222
cp -pr $BIN_DIR/libqrtext.so* $PWD/../data/lib/
@@ -58,6 +58,7 @@ cp -pr $QT_DIR/lib/libicuuc.so* $PWD/../
5858

5959
cp $QT_DIR/plugins/platforms/libqxcb.so $PWD/../data/bin/platforms/
6060
cp $QT_DIR/plugins/imageformats/libqsvg.so $PWD/../data/bin/imageformats/
61+
cp $QT_DIR/plugins/imageformats/libqjpeg.so $PWD/../data/bin/imageformats/
6162
cp $QT_DIR/plugins/iconengines/libqsvgicon.so $PWD/../data/bin/iconengines/
6263

6364
rsync -av /usr/lib/$(uname -i)-linux-gnu/libstdc++.so* $PWD/../data/lib/

‎installer/packages/qreal-base/ru.qreal.root/meta/prebuild-mac.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mkdir -p "$BUNDLE_CONTENTS/Lib/plugins/tools"
1111

1212
cp -pR $BIN_DIR/libqrkernel*.dylib "$BUNDLE_CONTENTS/Lib"
1313
cp -pR $BIN_DIR/libqrgraph*.dylib "$BUNDLE_CONTENTS/Lib"
14-
#cp -pR $BIN_DIR/libquazip*.dylib "$BUNDLE_CONTENTS/Lib"
14+
cp -P $(pkg-config --variable=libdir zlib)/libz*.dylib "$BUNDLE_CONTENTS/Lib"
1515
cp -pR $BIN_DIR/libqrrepo*.dylib "$BUNDLE_CONTENTS/Lib"
1616
cp -pR $BIN_DIR/libqrutils*.dylib "$BUNDLE_CONTENTS/Lib"
1717
cp -pR $BIN_DIR/libqrtext*.dylib "$BUNDLE_CONTENTS/Lib"
@@ -80,6 +80,7 @@ mkdir "$BUNDLE_CONTENTS/MacOS/iconengines"
8080

8181
cp $QT_DIR/plugins/platforms/libqcocoa.dylib "$BUNDLE_CONTENTS/MacOS/platforms"
8282
cp $QT_DIR/plugins/imageformats/libqsvg.dylib "$BUNDLE_CONTENTS/MacOS/imageformats"
83+
cp $QT_DIR/plugins/imageformats/libqjpeg.dylib "$BUNDLE_CONTENTS/MacOS/imageformats"
8384
cp $QT_DIR/plugins/iconengines/libqsvgicon.dylib "$BUNDLE_CONTENTS/MacOS/iconengines"
8485

8586
fix_qreal_dependencies "$BUNDLE_CONTENTS/MacOS/platforms/libqcocoa.dylib" $QT_DIR/lib $LIB_PATH

‎installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ cp $QT_DIR/bin/libstdc++-6.dll $PWD/../data
5151

5252
cp $QT_DIR/plugins/platforms/qwindows.dll $PWD/../data/platforms
5353
cp $QT_DIR/plugins/imageformats/qsvg.dll $PWD/../data/imageformats
54+
cp $QT_DIR/plugins/imageformats/qjpeg.dll $PWD/../data/imageformats
5455
cp $QT_DIR/plugins/iconengines/qsvgicon.dll $PWD/../data/iconengines

‎installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-linux-gnu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ mkdir -p $PWD/../data/resources/examples/
2323
rsync -av --remove-source-files $PWD/../data/examples/ $PWD/../data/resources/examples/
2424

2525
cd $PWD/../data/lib/
26-
ln -s libusb-1.0.so libusb-1.0.so.0
26+
ln -svf libusb-1.0.so libusb-1.0.so.0

‎installer/packages/trik-studio/ru.qreal.root.trik.python/meta/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<Version></Version>
99
<ReleaseDate>2017-11-14</ReleaseDate>
1010
<SortingPriority>5</SortingPriority>
11-
<Default>false</Default>
11+
<Default>true</Default>
1212
<ForcedInstallation>false</ForcedInstallation>
1313
</Package>

0 commit comments

Comments
 (0)