diff --git a/.ci-build.yml b/.ci-build.yml index aa7e1dc99..bf245f74e 100644 --- a/.ci-build.yml +++ b/.ci-build.yml @@ -107,6 +107,7 @@ requires: - gsettings-desktop-schemas-dev - intltool - itstool + - libbiblesync-dev - libdbus-glib-1-dev - libgail-3-dev - libglade2-dev @@ -146,34 +147,6 @@ before_scripts: aur_install biblesync aur_install gtkhtml4 fi - if [ "${DISTRO_NAME}" == "ubuntu" ];then - # build biblesync from source - cd "${WORK_DIR}" - curl -Ls -o biblesync-1.2.0.tar.gz https://github.com/karlkleinpaste/biblesync/archive/1.2.0.tar.gz - tar xf biblesync-1.2.0.tar.gz - cd biblesync-1.2.0 - mkdir -p build - cd build - cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=/usr/lib .. - make -j$(nproc) - make install - # update sword from 1.7.3 to 1.8.1 - cd "${WORK_DIR}" - curl -Ls -o sword-1.8.1.tar.gz https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-1.8.1.tar.gz - curl -Ls -o sword-1.8.1-cmake.diff https://src.fedoraproject.org/rpms/sword/raw/master/f/sword-1.8.1-cmake.diff - curl -Ls -o sword-1.8.1-icu61.diff https://src.fedoraproject.org/rpms/sword/raw/master/f/sword-1.8.1-icu61.diff - curl -Ls -o sword-1.8.1-swig.diff https://src.fedoraproject.org/rpms/sword/raw/master/f/sword-1.8.1-swig.diff - tar xf sword-1.8.1.tar.gz - cd sword-1.8.1 - patch -p1 -i ../sword-1.8.1-cmake.diff - patch -p1 -i ../sword-1.8.1-icu61.diff - patch -p1 -i ../sword-1.8.1-swig.diff - mkdir -p build - cd build - cmake -DLIBSWORD_LIBRARY_TYPE="Shared" -DSYSCONF_INSTALL_DIR='/etc' -DSWORD_BUILD_TESTS="Yes" -DSWORD_BINDINGS="Python" -DCMAKE_INSTALL_PREFIX=/usr -DLIB_INSTALL_DIR=/usr/lib/x86_64-linux-gnu .. - make -j$(nproc) - make install - fi build_scripts: - | diff --git a/INSTALL.md b/INSTALL.md index 75768475d..e03f5c8db 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -250,22 +250,11 @@ Create a build directory as a sibling of the xiphos directory: Build Xiphos On *Debian*, *Ubuntu*, or *Linux Mint*: =================================================== -## 1. Install Biblesync - - $ curl -Ls -o biblesync-1.2.0.tar.gz https://github.com/karlkleinpaste/biblesync/archive/1.2.0.tar.gz - $ tar xf biblesync-1.2.0.tar.gz - $ cd biblesync-1.2.0 - $ mkdir -p build - $ cd build - $ cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=/usr/lib .. - $ make -j2 - $ make install - -## 2. Clone git +## 1. Clone git $ git https://github.com/crosswire/xiphos.git -## 3. Create and enter the build directory +## 2. Create and enter the build directory Create a build directory as a sibling of the xiphos directory: @@ -274,15 +263,15 @@ Create a build directory as a sibling of the xiphos directory: build xiphos $ cd build -## 4. Install the required dependencies: +## 3. Install the required dependencies: $ sudo apt-get install appstream-util cmake g++ desktop-file-utils fp-utils git gsettings-desktop-schemas-dev intltool itstool libdbus-glib-1-dev libgail-3-dev libglade2-dev libgtk-3-dev libminizip-dev libsword-dev libwebkit2gtk-4.1-dev libxml2-dev libxml2-utils make python-dev-is-python3 swig uuid-dev uuid-runtime yelp-tools xzip -## 5. Configuration: +## 4. Configuration: $ cmake -DCMAKE_INSTALL_PREFIX=/usr -DWEBKIT1=ON -DUSE_WEBKIT2=ON ../xiphos -## 6. Build and install +## 5. Build and install $ make -j$(nproc) && make install