From df4ef0df7af24af983e203c122243197351a0309 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 09:47:52 +0100 Subject: [PATCH] Fix install4j location --- circle.yml | 4 +--- scripts/prepare-install4j.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 9ee9a6fa11d..3dfc7c5ec42 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ dependencies: # openssl aes-256-cbc -e -in ./buildres/jabref-cert-2016.p12 -out jabref-cert-2016.p12.enc -k {PASSWORD} #- openssl aes-256-cbc -d -in ./buildres/jabref-cert-2016.p12.enc -out ./buildres/jabref-cert-2016.p12 -k $CERTIFICATE - scripts/prepare-install4j.sh - - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY + - cd org.jabref.gui && install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW override: # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation. @@ -44,8 +44,6 @@ deployment: # if upload fails, it is accepted; CircleCI provides deep links to the binaries as fallback - timeout 580 scripts/upload-to-builds.jabref.org.sh || exit 0 - - general: artifacts: - "build/releases" diff --git a/scripts/prepare-install4j.sh b/scripts/prepare-install4j.sh index 3718b432a98..acfb562c172 100755 --- a/scripts/prepare-install4j.sh +++ b/scripts/prepare-install4j.sh @@ -14,7 +14,7 @@ cd ~/jabref # version 7.0.1 is NOT zipped any more - old command line: "-xzf" tar -xf ~/downloads/install4j_unix_7_0_3.tar.gz # fix directory name (until install4j 6.1.5 it was install4j6 -mv install4j7.0.3 install4j7 +mv install4j7.0.3 org.jabref.gui/install4j7 # fetch JREs if [ ! -d ~/.install4j7/jres/ ]; then