Fix build, based on build notes from build.md

1 files changed, 8 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index edb06a682d23..d3d21190fcb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,16 +9,10 @@ url="https://bitsquare.io/"
 license=('AGPL3')
 depends=('java-openjfx')
 makedepends=('maven' 'jdk8-openjdk' 'protobuf')
-source=("${pkgname}::git+https://github.com/bitsquare/bitsquare.git#tag=v${pkgver}"
-        "git+https://github.com/bitsquare/bitcoinj.git#commit=cf384d0f0ea41024a0686faf8f06d480d4451996"
-        "git+https://github.com/bitsquare/libdohj.git#commit=232124cbcc2141e5240e729cba7cab644615d9c6"
-        "git+https://github.com/bitsquare/btcd-cli4j.git#commit=9d7ff85ab450b96c890e569dc9b584eae7bf13ad"
+source=("${pkgname}::git+https://github.com/bisq-network/exchange.git#tag=v${pkgver}"
         "bisq.sh"
         "bisq.desktop")
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
             '175e18841dd216ca84391a89b0fba0b12bf575ec095d200ae9a3babc83693e31'
             '2f9da2f32bb7d023af78bcbf688bc8dc01f24e1d6c7e3227928e22338343587c')
 
@@ -31,22 +25,9 @@ build() {
   # Use a temporary local maven repository.
   local mvn_repo="$srcdir/mvn-repository"
 
-  cd "${srcdir}/bitcoinj" || exit
-  msg2 "Building bitcoinj ..."
-  mvn clean install -Dmaven.repo.local="$mvn_repo" -DskipTests -Dmaven.javadoc.skip=true
-
-  cd "${srcdir}/libdohj" || exit
-  msg2 "Building libdohj..."
-  mvn clean install -Dmaven.repo.local="$mvn_repo" -DskipTests -Dmaven.javadoc.skip=true
-
-  cd "${srcdir}/btcd-cli4j" || exit
-  msg2 "Building btcd-cli4j..."
-  mvn clean install -Dmaven.repo.local="$mvn_repo" -DskipTests -Dmaven.javadoc.skip=true
-
   cd "${srcdir}/${pkgname}" || exit
   msg2 "Building bisq..."
-  mvn clean package -Dmaven.repo.local="$mvn_repo" -DskipTests
-
+  mvn clean package verify -Dmaven.repo.local="$mvn_repo" -DskipTests -Dmaven.javadoc.skip=true
 }
 
 package() {
@@ -54,13 +35,13 @@ package() {
   install -D -m755 "bisq.sh" "${pkgdir}/usr/bin/bisq"
   install -D -m644 "${srcdir}/${pkgname}/gui/target/shaded.jar" "${pkgdir}/usr/share/java/bisq/shaded.jar"
 
+  install -D "${srcdir}/${pkgname}/gui/target/gui-0.5.3.jar" "${pkgdir}/usr/share/java/bisq"
+
+  install -d "${pkgdir}/usr/share/java/bisq/lib"
+  install -D "${srcdir}/${pkgname}/gui/target/lib/bcpg-jdk15on.jar" "${pkgdir}/usr/share/java/bisq/lib"
+  install -D "${srcdir}/${pkgname}/gui/target/lib/bcprov-jdk15on.jar" "${pkgdir}/usr/share/java/bisq/lib"
+
   # Install desktop launcher.
   install -Dm644 bisq.desktop "${pkgdir}/usr/share/applications/bisq.desktop"
   install -Dm644 "${srcdir}/${pkgname}/package/linux/icon.png" "${pkgdir}/usr/share/pixmaps/bisq.png"
-
-  # Install BouncyCastleProvider
-  # https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#3-copy-the-bountycastle-provider-jar-file
-  local mvn_repo="$srcdir/mvn-repository"
-  install -Dm644 "$mvn_repo/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar" \
-    "${pkgdir}/usr/lib/jvm/java-8-openjdk/jre/lib/ext/bcprov-jdk15on-1.56.jar"
 }