From 1988b98f133d2622f6033e2be7b5013da94a3e4d Mon Sep 17 00:00:00 2001 From: Navdeep Singh Sidhu Date: Sat, 20 Oct 2018 14:24:19 -0500 Subject: [PATCH] Updated Build guide, travis config and snap config * Added build instructions for OpenSuse * Updated package list for Ubuntu build * Added initial code for x86 and x64 build of AppImage to travis file * More experiments with snap config to fix old UI. Signed-off-by: Navdeep Singh Sidhu --- .travis.yml | 4 ++++ BUILDING.md | 18 +++++++++++++++++- snap/snapcraft.yaml | 19 ++++++++++++++----- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7eb257aac..30cd5609b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,10 @@ branches: only: - master +env: + - ARCH=x86_64 DOCKER_IMAGE=amd64/ubuntu:trusty + - ARCH=i686 DOCKER_IMAGE=i386/ubuntu:trusty + matrix: fast_finish: true include: diff --git a/BUILDING.md b/BUILDING.md index 4a6b3b231..3e6b15b79 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -55,7 +55,7 @@ The same process works for building the code in any platform supported by Qt ```bash $ sudo apt install build-essential git-core cmake libsqlite3-dev qt5-default qttools5-dev-tools \ - libsqlcipher-dev + libsqlcipher-dev qtbase5-dev libantlr-dev libqt5scintilla2-dev libqcustomplot-dev qttools5-dev $ git clone https://github.com/sqlitebrowser/sqlitebrowser $ cd sqlitebrowser $ mkdir build @@ -88,6 +88,22 @@ $ sudo make install This should complete without errors, and `sqlitebrowser` should now be launch-able from the command line. +### OpenSUSE + +```bash + + +$ zypper in -y build git-core, libQt5Core5, libQt5Core5-32bit, libqt5-qtbase, libqt5-qtbase-devel, libqt5-qttools, libqt5-qttools-devel, build, gcc-c++, gcc, sqlite3-devel, libsqlite3-0, cmake, antlr-devel, sqlcipher-devel +$ git clone https://github.com/sqlitebrowser/sqlitebrowser +$ cd sqlitebrowser +$ mkdir build +$ cd build +$ cmake -Dsqlcipher=1 -Wno-dev -DFORCE_INTERNAL_QSCINTILLA=ON .. +$ make +$ sudo make install +``` + + ### MacOS X The application can be compiled to a single executable binary file, similar to diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4b8188a3c..030ce9c41 100755 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -4,7 +4,7 @@ version-script: printf "`cat currentrelease | head -n 1 `-`git rev-list master --count`-` git -C . rev-parse --short HEAD`" summary: DB Browser for SQLite # 79 char long summary - description: | + description: | SQLite Database Browser is a visual tool used to create, design and edit database files compatible with SQLite. Its interface is based on Qt, and is meant to be used for users and developers that want to create databases, edit and search data using a familiar spreadsheet-like interface, without the need to learn complicated SQL commands. Controls and wizards are available for users to: * Create and compact database files * Create, define, modify and delete tables @@ -71,6 +71,7 @@ build-packages: - qtbase5-dev - dpkg-dev + - libgtk-3-dev make-parameters: - FLAVOR=qt5 plugin: make @@ -78,17 +79,25 @@ source-subdir: qt stage-packages: - libxkbcommon0 - # - ttf-ubuntu-font-family - # - dmz-cursor-theme - # - light-themes + - ttf-ubuntu-font-family + - dmz-cursor-theme + - light-themes + - adwaita-icon-theme + - gnome-themes-standard - shared-mime-info + - libgtk-3-0 - libqt5gui5 - libgdk-pixbuf2.0-0 - libqt5svg5 - appmenu-qt5 + - libglib2.0-bin + - libgtk-3-bin + - unity-gtk3-module + - libappindicator3-1 - locales-all - xdg-user-dirs - + - ibus-gtk3 + - libibus-1.0-5 dump: plugin: dump after: