From 0fe5486a39b9eec8eea2a222659b65da24f11492 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 21:23:58 +0200 Subject: [PATCH 01/11] Add JabRef Icon to installer Change watermark from Install4j to JabRef Update to 7.0.8 --- jabref.install4j | 17 +++++++++++++---- scripts/download-install4j-and-jres.sh | 2 +- scripts/extract-install4j.sh | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/jabref.install4j b/jabref.install4j index a79be056141..bf4950dec39 100644 --- a/jabref.install4j +++ b/jabref.install4j @@ -1,5 +1,5 @@ - + @@ -42,7 +42,10 @@ - + + + + @@ -116,6 +119,9 @@ + + + @@ -766,6 +772,9 @@ return console.askOkCancel(message, true); + + + @@ -1054,7 +1063,7 @@ return console.askYesNo(message, true); false - install4j + JabRef @@ -1262,7 +1271,7 @@ return console.askYesNo(message, true); - icon:${installer:sys.installerApplicationMode}_header.png + ./src/main/resources/icons/JabRef-icon-64.png diff --git a/scripts/download-install4j-and-jres.sh b/scripts/download-install4j-and-jres.sh index 0e99d438c6e..921989c6d9d 100755 --- a/scripts/download-install4j-and-jres.sh +++ b/scripts/download-install4j-and-jres.sh @@ -5,7 +5,7 @@ if [ ! -d ~/downloads ]; then mkdir ~/downloads fi cd ~/downloads -wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_4.tar.gz +wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz # fetch JREs if [ ! -d ~/.install4j7/jres ]; then diff --git a/scripts/extract-install4j.sh b/scripts/extract-install4j.sh index 4e8cfcc7dd3..9e960280b81 100755 --- a/scripts/extract-install4j.sh +++ b/scripts/extract-install4j.sh @@ -1,4 +1,4 @@ #!/bin/bash -tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz +tar -xf ~/downloads/install4j_unix_7_0_8.tar.gz # fix directory name (until install4j 6.1.5 it was install4j6 -mv install4j7.0.4 install4j7 +mv install4j7.0.8 install4j7 From 3765e51c60155fae949dc310cff306d304acfdf8 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 21:24:17 +0200 Subject: [PATCH 02/11] add jabref icon as png in 64x64 --- src/main/resources/icons/JabRef-icon-64.png | Bin 0 -> 3454 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/icons/JabRef-icon-64.png diff --git a/src/main/resources/icons/JabRef-icon-64.png b/src/main/resources/icons/JabRef-icon-64.png new file mode 100644 index 0000000000000000000000000000000000000000..e807e0448d315ea926ba1b8d296b70e6e705fa6c GIT binary patch literal 3454 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 literal 0 HcmV?d00001 From 5f3d32979138ccce526e0beebdceebc4321ff2e9 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 21:43:45 +0200 Subject: [PATCH 03/11] add cache clearing when checkstum saves --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d21c1c05c59..d14c250e674 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - checkout - run: scripts/download-install4j-and-jres.sh - save_cache: - key: install4j + key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} paths: - "~/downloads" - "~/.install4j7" @@ -26,7 +26,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j + key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY @@ -47,7 +47,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j + key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY From cb90ba4587255e2d69c54db9980663e5a38efa41 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 21:52:16 +0200 Subject: [PATCH 04/11] try around with caching in circle ci --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d14c250e674..796f40f297b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - checkout - run: scripts/download-install4j-and-jres.sh - save_cache: - key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} paths: - "~/downloads" - "~/.install4j7" @@ -26,7 +26,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY @@ -47,7 +47,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j-{{ checksum "scripts/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY From d1806a447d6cc8c1072f85ab18e8d12ef332c1cb Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 21:58:56 +0200 Subject: [PATCH 05/11] test again --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 796f40f297b..fa92dec678a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - checkout - run: scripts/download-install4j-and-jres.sh - save_cache: - key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "scripts/extract-install4j.sh" }} paths: - "~/downloads" - "~/.install4j7" @@ -26,7 +26,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "scripts/extract-install4j.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY @@ -47,7 +47,7 @@ jobs: - restore_cache: key: dependency-cache - restore_cache: - key: install4j-{{ checksum "/home/circleci/download-install4j-and-jres.sh" }} + key: install4j-{{ checksum "scripts/extract-install4j.sh" }} - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY From 3be3de29b246f89a17b3853221af28872c96ed06 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 22:02:56 +0200 Subject: [PATCH 06/11] show progress in wget --- scripts/download-install4j-and-jres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/download-install4j-and-jres.sh b/scripts/download-install4j-and-jres.sh index 921989c6d9d..cdd5aee3b20 100755 --- a/scripts/download-install4j-and-jres.sh +++ b/scripts/download-install4j-and-jres.sh @@ -5,7 +5,7 @@ if [ ! -d ~/downloads ]; then mkdir ~/downloads fi cd ~/downloads -wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz +wget --quiet -nc --show-progress http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz # fetch JREs if [ ! -d ~/.install4j7/jres ]; then From 51ff392f72c0fc01b4aee65c05bd7626f9e02243 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 27 Oct 2018 22:06:21 +0200 Subject: [PATCH 07/11] move checkout before install4j cache --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa92dec678a..e9e4452ea17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,10 +5,10 @@ jobs: docker: - image: circleci/openjdk:8-jdk steps: + - checkout - restore_cache: keys: - - install4j - - checkout + - install4j-{{ checksum "scripts/extract-install4j.sh" }} - run: scripts/download-install4j-and-jres.sh - save_cache: key: install4j-{{ checksum "scripts/extract-install4j.sh" }} @@ -25,9 +25,9 @@ jobs: steps: - restore_cache: key: dependency-cache + - checkout - restore_cache: key: install4j-{{ checksum "scripts/extract-install4j.sh" }} - - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY - run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace @@ -46,9 +46,9 @@ jobs: steps: - restore_cache: key: dependency-cache + - checkout - restore_cache: key: install4j-{{ checksum "scripts/extract-install4j.sh" }} - - checkout - run: scripts/extract-install4j.sh - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY - run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace From 216b7ae9f77d6503ad60c85cff235789f8452279 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sun, 28 Oct 2018 12:10:09 +0100 Subject: [PATCH 08/11] add custom jar --- jabref.install4j | 10 ++-- .../preferences/PreferencesService.java.orig | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/jabref/preferences/PreferencesService.java.orig diff --git a/jabref.install4j b/jabref.install4j index bf4950dec39..b4be54813d4 100644 --- a/jabref.install4j +++ b/jabref.install4j @@ -1,6 +1,6 @@ - + @@ -102,13 +102,15 @@ - + + + - + @@ -150,7 +152,7 @@ - + diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java.orig b/src/main/java/org/jabref/preferences/PreferencesService.java.orig new file mode 100644 index 00000000000..28974c413fe --- /dev/null +++ b/src/main/java/org/jabref/preferences/PreferencesService.java.orig @@ -0,0 +1,48 @@ +package org.jabref.preferences; + +import java.nio.file.Path; +import java.util.List; +import java.util.Map; + +import org.jabref.gui.keyboard.KeyBindingRepository; +import org.jabref.logic.journals.JournalAbbreviationPreferences; +import org.jabref.logic.openoffice.OpenOfficePreferences; +import org.jabref.model.metadata.FilePreferences; + +public interface PreferencesService { + + JournalAbbreviationPreferences getJournalAbbreviationPreferences(); + + void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository); + + KeyBindingRepository getKeyBindingRepository(); + + void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences); + + FilePreferences getFilePreferences(); + + Path getWorkingDir(); + + void setWorkingDir(Path dir); + +<<<<<<< HEAD + OpenOfficePreferences getOpenOfficePreferences(); + + void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences); + + PreviewPreferences getPreviewPreferences(); +======= + Map> getEntryEditorTabList(); + + Boolean getEnforceLegalKeys(); + + Map getCustomTabsNamesAndFields(); + + void setCustomTabsNameAndFields(String name, String fields, int defNumber); + + public void purgeSeries(String prefix, int number); + + public void updateEntryEditorTabList(); +>>>>>>> upstream/master + +} From b2158e19580b4e09de27a5b6a6e997b004c4d01b Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sun, 28 Oct 2018 12:16:34 +0100 Subject: [PATCH 09/11] move icon resources --- jabref.install4j | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jabref.install4j b/jabref.install4j index b4be54813d4..91cc751589c 100644 --- a/jabref.install4j +++ b/jabref.install4j @@ -1,6 +1,6 @@ - + @@ -103,7 +103,7 @@ - + From 22e42e4b81714611889306b528ad170610e4de36 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sun, 28 Oct 2018 12:28:48 +0100 Subject: [PATCH 10/11] add jar --- buildres/customIcon.jar | Bin 0 -> 4432 bytes jabref.install4j | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 buildres/customIcon.jar diff --git a/buildres/customIcon.jar b/buildres/customIcon.jar new file mode 100644 index 0000000000000000000000000000000000000000..88f58e222109fe0a2accf89f3785eb397076d0e9 GIT binary patch literal 4432 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 fP@Jau5AiepNxF$X - + @@ -103,7 +103,7 @@ - + From 668dcde2ccff580fd4436be3d054d0fb00da956e Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sun, 28 Oct 2018 12:35:28 +0100 Subject: [PATCH 11/11] revert custom icon jar does not work --- buildres/customIcon.jar | Bin 4432 -> 0 bytes jabref.install4j | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 buildres/customIcon.jar diff --git a/buildres/customIcon.jar b/buildres/customIcon.jar deleted file mode 100644 index 88f58e222109fe0a2accf89f3785eb397076d0e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4432 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 fP@Jau5AiepNxF$X - - - +