diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..8acd8f5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: cpp +compiler: + - gcc + - clang +sudo: required +dist: trusty +install: ./scripts/install_deps.sh +script: cd scripts && ./make_all.sh +branches: + only: + - master + - develop + - /.*travis/ +os: + - linux +email: + on_success: change + on_failure: change diff --git a/README.md b/README.md index e84d1d0..1aa8631 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/OneMoreGres/ScreenTranslator.svg)](https://travis-ci.org/OneMoreGres/ScreenTranslator.svg) + Screen Translator ================= diff --git a/ScreenTranslator.pro b/ScreenTranslator.pro index a611b31..04e4b09 100644 --- a/ScreenTranslator.pro +++ b/ScreenTranslator.pro @@ -84,4 +84,5 @@ OTHER_FILES += \ version.json \ README.md \ uncrustify.cfg\ + .travis.yml \ TODO.md diff --git a/scripts/make_all.sh b/scripts/make_all.sh index db51223..2412a56 100755 --- a/scripts/make_all.sh +++ b/scripts/make_all.sh @@ -6,8 +6,8 @@ cleanupDirInNeeded $WORK_DIR echo "Running all scripts for $PLATFORM" #./install_deps $@ #./get_tessdata.sh $@ -./get_deps.sh $@ -./make_deps.sh $@ +#./get_deps.sh $@ +#./make_deps.sh $@ ./make_app.sh $@ if [ "$PLATFORM" == "linux" ]; then ./make_deb.sh $@ diff --git a/scripts/make_app.sh b/scripts/make_app.sh index 9a736ae..a057155 100755 --- a/scripts/make_app.sh +++ b/scripts/make_app.sh @@ -6,6 +6,7 @@ cleanupDirInNeeded $APP_DIR cd $APP_DIR echo "Building app" -QT_SELECT=qt5 $QMAKE "CONFIG-=debug_and_release" "CONFIG+=release" $SRC_DIR +lrelease $SRC_DIR/ScreenTranslator.pro +$QMAKE -qt=qt5 "CONFIG-=debug_and_release" "CONFIG+=release" $SRC_DIR make $JOBS diff --git a/scripts/make_deb.sh b/scripts/make_deb.sh index f232a01..04bf46c 100755 --- a/scripts/make_deb.sh +++ b/scripts/make_deb.sh @@ -29,7 +29,9 @@ echo $CHANGELOG echo "Making deb" cp $SRC_DIR/LICENSE.md $DEB_DIR/DEBIAN/copyright +mkdir -p $DEB_DIR/usr/share/pixmaps/ cp $SRC_DIR/images/STIconBlue.png $DEB_DIR/usr/share/pixmaps/ScreenTranslator.png +mkdir -p $DEB_DIR/$INSTALL_DIR/ cp $APP_DIR/ScreenTranslator $DEB_DIR/$INSTALL_DIR/ScreenTranslator $STRIP -s $DEB_DIR/$INSTALL_DIR/ScreenTranslator cp -r $SRC_DIR/translators $DEB_DIR/$INSTALL_DIR/translators