diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml index 4f7237bc166..3e86ac97267 100644 --- a/.github/workflows/refresh-csl-subtrees.yml +++ b/.github/workflows/refresh-csl-subtrees.yml @@ -14,7 +14,6 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: true - fetch-depth: 0 submodules: 'true' show-progress: 'false' - name: Initialize git @@ -22,28 +21,16 @@ jobs: git config --local core.editor /usr/bin/cat git config user.name 'github-actions[bot]' git config user.email 'github-actions[bot]@users.noreply.github.com' - - name: Update buildres/csl/csl-styles + - name: Update src/main/resources/csl-styles run: | - cd buildres/csl/csl-styles + cd src/main/resources/csl-styles git checkout master git pull - cd .. - cd .. - cd .. - cp buildres/csl/csl-styles/acm-siggraph.csl src/main/resources/csl-styles/ - cp buildres/csl/csl-styles/apa.csl src/main/resources/csl-styles/ - cp buildres/csl/csl-styles/ieee.csl src/main/resources/csl-styles/ - cp buildres/csl/csl-styles/turabian-author-date.csl src/main/resources/csl-styles/ - - name: Update buildres/csl/csl-locales + - name: Update src/main/resources/csl-locales run: | - cd buildres/csl/csl-locales + cd src/main/resources/csl-locales git checkout master git pull - cd .. - cd .. - cd .. - cp buildres/csl/csl-locales/locales.json src/main/resources/csl-locales/ - cp buildres/csl/csl-locales/locales-en-US.xml src/main/resources/csl-locales/ - uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }} diff --git a/.gitmodules b/.gitmodules index 4aba43b8d12..39f867d9511 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ path = buildres/abbrv.jabref.org url = https://github.com/JabRef/abbrv.jabref.org.git [submodule "buildres/csl-styles"] - path = buildres/csl/csl-styles + path = src/main/resources/csl-styles url = https://github.com/citation-style-language/styles.git [submodule "buildres/csl-locales"] - path = buildres/csl/csl-locales + path = src/main/resources/csl-locales url = https://github.com/citation-style-language/locales.git diff --git a/build.gradle b/build.gradle index 6fd0b982d39..594caf871c1 100644 --- a/build.gradle +++ b/build.gradle @@ -264,14 +264,6 @@ clean { } processResources { - gradle.taskGraph.whenReady { - if (gradle.taskGraph.hasTask(":jpackage")) { - logger.info('Adding buildres/csl to resources') - from("buildres/csl") - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } - } - filteringCharset = 'UTF-8' filesMatching("build.properties") { diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md index 6077ce797e4..e932bc29895 100644 --- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md +++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md @@ -25,7 +25,7 @@ In the following, we will use `c:\git-repositories` as base folder: cd \ mkdir git-repositories cd git-repositories -git clone https://github.com/JabRef/jabref.git JabRef +git clone --recurse-submodules https://github.com/JabRef/jabref.git JabRef cd JabRef git remote rename origin upstream git remote add origin https://github.com/YOUR_USERNAME/jabref.git @@ -34,9 +34,9 @@ git branch --set-upstream-to=origin/main main ``` {: .important } -> Note that putting the repo JabRef directly on `C:\` or any other drive letter on Windows causes compile errors (**negative example**: `C:\jabref`). +> `--recurse-submodules` is necessary to have the required files available to JabRef. (Background: It concerns the files from [citation-style-language/styles](https://github.com/citation-style-language/styles) and more). > -> Further, if you are building on Windows, make sure that the absolute path to the location of the clone does not contain folders starting with '`u`' (**negative example**: `C:\university\jabref`) as this may currently also cause [compile errors](https://github.com/JabRef/jabref/issues/9783). +> Note that putting the repo JabRef directly on `C:\` or any other drive letter on Windows causes compile errors (**negative example**: `C:\jabref`). > > Please really ensure that you pass `JabRef` as parameter. Otherwise, you will get `java.lang.IllegalStateException: Module entity with name: jabref should be available`. See [IDEA-317606](https://youtrack.jetbrains.com/issue/IDEA-317606/Changing-only-the-case-of-the-Gradle-root-project-name-causes-exception-while-importing-project-java.lang.IllegalStateException) for details. diff --git a/buildres/csl/csl-locales b/src/main/resources/csl-locales similarity index 100% rename from buildres/csl/csl-locales rename to src/main/resources/csl-locales diff --git a/src/main/resources/csl-locales/locales-en-US.xml b/src/main/resources/csl-locales/locales-en-US.xml deleted file mode 100644 index ee80017ca21..00000000000 --- a/src/main/resources/csl-locales/locales-en-US.xml +++ /dev/null @@ -1,655 +0,0 @@ - - - - - Andrew Dunning - - - Sebastian Karcher - - - Rintze M. Zelle - - - Denis Meier - - - Brenton M. Wiernik - - This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License - 2015-10-10T23:31:02+00:00 - - - - - - - - - - - - - - advance online publication - album - audio recording - film - henceforth - loc. cit. - no place - n.p. - no publisher - n.p. - on - op. cit. - original work published - personal communication - podcast - podcast episode - preprint - radio broadcast - radio series - radio series episode - special issue - special section - television broadcast - television series - television series episode - video - working paper - accessed - and - and others - anonymous - anon. - at - available at - by - circa - c. - cited - - edition - editions - - ed. - et al. - forthcoming - from - ibid. - in - in press - internet - letter - no date - n.d. - online - presented at the - - reference - references - - - ref. - refs. - - retrieved - scale - version - - - preprint - journal article - magazine article - newspaper article - bill - - broadcast - - classic - collection - dataset - document - entry - dictionary entry - encyclopedia entry - event - - graphic - hearing - interview - legal case - legislation - manuscript - map - video recording - musical score - pamphlet - conference paper - patent - performance - periodical - personal communication - post - blog post - regulation - report - review - book review - software - audio recording - presentation - standard - thesis - treaty - webpage - - - journal art. - mag. art. - newspaper art. - - - doc. - - graph. - interv. - MS - video rec. - rep. - rev. - bk. rev. - audio rec. - - - AD - BC - BCE - CE - - - - - - - - : - , - ; - - - th - st - nd - rd - th - th - th - - - first - second - third - fourth - fifth - sixth - seventh - eighth - ninth - tenth - - - - act - acts - - - appendix - appendices - - - article - articles - - - canon - canons - - - location - locations - - - equation - equations - - - rule - rules - - - scene - scenes - - - table - tables - - - - - - - title - titles - - - book - books - - - chapter - chapters - - - column - columns - - - figure - figures - - - folio - folios - - - number - numbers - - - line - lines - - - note - notes - - - opus - opera - - - page - pages - - - page - pages - - - paragraph - paragraphs - - - part - parts - - - section - sections - - - sub verbo - sub verbis - - - verse - verses - - - volume - volumes - - - - - app. - apps. - - - art. - arts. - - - loc. - locs. - - - eq. - eqs. - - - r. - rr. - - - sc. - scs. - - - tbl. - tbls. - - - - - - - tit. - tits. - - - bk. - bks. - - - chap. - chaps. - - - col. - cols. - - - fig. - figs. - - - fol. - fols. - - - no. - nos. - - - l. - ll. - - - n. - nn. - - - op. - opp. - - - p. - pp. - - - p. - pp. - - - para. - paras. - - - pt. - pts. - - - sec. - secs. - - - s.v. - s.vv. - - - v. - vv. - - - vol. - vols. - - - - - - ¶¶ - - - § - §§ - - - - - chair - chairs - - - compiler - compilers - - - contributor - contributors - - - curator - curators - - - executive producer - executive producers - - - guest - guests - - - host - hosts - - - narrator - narrators - - - organizer - organizers - - - performer - performers - - - producer - producers - - - writer - writers - - - series creator - series creators - - - director - directors - - - editor - editors - - - editor - editors - - - illustrator - illustrators - - - translator - translators - - - editor & translator - editors & translators - - - - - comp. - comps. - - - contrib. - contribs. - - - cur. - curs. - - - exec. prod. - exec. prods. - - - narr. - narrs. - - - org. - orgs. - - - perf. - perfs. - - - prod. - prods. - - - writ. - writs. - - - cre. - cres. - - - dir. - dirs. - - - ed. - eds. - - - ed. - eds. - - - ill. - ills. - - - tran. - trans. - - - ed. & tran. - eds. & trans. - - - - chaired by - compiled by - with - curated by - executive produced by - with guest - hosted by - narrated by - organized by - performed by - produced by - written by - created by - by - directed by - edited by - edited by - illustrated by - interview by - to - by - translated by - edited & translated by - - - comp. by - w. - cur. by - exec. prod. by - w. guest - hosted by - narr. by - org. by - perf. by - prod. by - writ. by - cre. by - dir. by - ed. by - ed. by - illus. by - trans. by - ed. & trans. by - - - January - February - March - April - May - June - July - August - September - October - November - December - - - Jan. - Feb. - Mar. - Apr. - May - Jun. - Jul. - Aug. - Sep. - Oct. - Nov. - Dec. - - - Spring - Summer - Autumn - Winter - - diff --git a/src/main/resources/csl-locales/locales.json b/src/main/resources/csl-locales/locales.json deleted file mode 100644 index 6e18177c74a..00000000000 --- a/src/main/resources/csl-locales/locales.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "primary-dialects": { - "af": "af-ZA", - "ar": "ar", - "bg": "bg-BG", - "ca": "ca-AD", - "cs": "cs-CZ", - "cy": "cy-GB", - "da": "da-DK", - "de": "de-DE", - "el": "el-GR", - "en": "en-US", - "es": "es-ES", - "et": "et-EE", - "eu": "eu", - "fa": "fa-IR", - "fi": "fi-FI", - "fr": "fr-FR", - "he": "he-IL", - "hi": "hi-IN", - "hr": "hr-HR", - "hu": "hu-HU", - "id": "id-ID", - "is": "is-IS", - "it": "it-IT", - "ja": "ja-JP", - "km": "km-KH", - "ko": "ko-KR", - "la": "la", - "lt": "lt-LT", - "lv": "lv-LV", - "mn": "mn-MN", - "nb": "nb-NO", - "nl": "nl-NL", - "nn": "nn-NO", - "pl": "pl-PL", - "pt": "pt-PT", - "ro": "ro-RO", - "ru": "ru-RU", - "sk": "sk-SK", - "sl": "sl-SI", - "sr": "sr-RS", - "sv": "sv-SE", - "th": "th-TH", - "tr": "tr-TR", - "uk": "uk-UA", - "vi": "vi-VN", - "zh": "zh-CN" - }, - "language-names": { - "af-ZA": [ - "Afrikaans", - "Afrikaans" - ], - "ar": [ - "العربية", - "Arabic" - ], - "bg-BG": [ - "Български", - "Bulgarian" - ], - "ca-AD": [ - "Català", - "Catalan" - ], - "cs-CZ": [ - "Čeština", - "Czech" - ], - "cy-GB": [ - "Cymraeg", - "Welsh" - ], - "da-DK": [ - "Dansk", - "Danish" - ], - "de-AT": [ - "Deutsch (Österreich)", - "German (Austria)" - ], - "de-CH": [ - "Deutsch (Schweiz)", - "German (Switzerland)" - ], - "de-DE": [ - "Deutsch (Deutschland)", - "German (Germany)" - ], - "el-GR": [ - "Ελληνικά", - "Greek" - ], - "en-GB": [ - "English (UK)", - "English (UK)" - ], - "en-US": [ - "English (US)", - "English (US)" - ], - "es-CL": [ - "Español (Chile)", - "Spanish (Chile)" - ], - "es-ES": [ - "Español (España)", - "Spanish (Spain)" - ], - "es-MX": [ - "Español (México)", - "Spanish (Mexico)" - ], - "et-EE": [ - "Eesti keel", - "Estonian" - ], - "eu": [ - "Euskara", - "Basque" - ], - "fa-IR": [ - "فارسی", - "Persian" - ], - "fi-FI": [ - "Suomi", - "Finnish" - ], - "fr-CA": [ - "Français (Canada)", - "French (Canada)" - ], - "fr-FR": [ - "Français (France)", - "French (France)" - ], - "he-IL": [ - "עברית", - "Hebrew" - ], - "hi-IN": [ - "हिंदी", - "Hindi" - ], - "hr-HR": [ - "Hrvatski", - "Croatian" - ], - "hu-HU": [ - "Magyar", - "Hungarian" - ], - "id-ID": [ - "Bahasa Indonesia", - "Indonesian" - ], - "is-IS": [ - "Íslenska", - "Icelandic" - ], - "it-IT": [ - "Italiano", - "Italian" - ], - "ja-JP": [ - "日本語", - "Japanese" - ], - "km-KH": [ - "ភាសាខ្មែរ", - "Khmer" - ], - "ko-KR": [ - "한국어", - "Korean" - ], - "la": [ - "Latina", - "Latin" - ], - "lt-LT": [ - "Lietuvių kalba", - "Lithuanian" - ], - "lv-LV": [ - "Latviešu", - "Latvian" - ], - "mn-MN": [ - "Монгол", - "Mongolian" - ], - "nb-NO": [ - "Norsk bokmål", - "Norwegian (Bokmål)" - ], - "nl-NL": [ - "Nederlands", - "Dutch" - ], - "nn-NO": [ - "Norsk nynorsk", - "Norwegian (Nynorsk)" - ], - "pl-PL": [ - "Polski", - "Polish" - ], - "pt-BR": [ - "Português (Brasil)", - "Portuguese (Brazil)" - ], - "pt-PT": [ - "Português (Portugal)", - "Portuguese (Portugal)" - ], - "ro-RO": [ - "Română", - "Romanian" - ], - "ru-RU": [ - "Русский", - "Russian" - ], - "sk-SK": [ - "Slovenčina", - "Slovak" - ], - "sl-SI": [ - "Slovenščina", - "Slovenian" - ], - "sr-RS": [ - "Српски / Srpski", - "Serbian" - ], - "sv-SE": [ - "Svenska", - "Swedish" - ], - "th-TH": [ - "ไทย", - "Thai" - ], - "tr-TR": [ - "Türkçe", - "Turkish" - ], - "uk-UA": [ - "Українська", - "Ukrainian" - ], - "vi-VN": [ - "Tiếng Việt", - "Vietnamese" - ], - "zh-CN": [ - "中文 (中国大陆)", - "Chinese (PRC)" - ], - "zh-TW": [ - "中文 (台灣)", - "Chinese (Taiwan)" - ] - } -} diff --git a/buildres/csl/csl-styles b/src/main/resources/csl-styles similarity index 100% rename from buildres/csl/csl-styles rename to src/main/resources/csl-styles diff --git a/src/main/resources/csl-styles/acm-siggraph.csl b/src/main/resources/csl-styles/acm-siggraph.csl deleted file mode 100644 index 285d6074f1c..00000000000 --- a/src/main/resources/csl-styles/acm-siggraph.csl +++ /dev/null @@ -1,141 +0,0 @@ - - diff --git a/src/main/resources/csl-styles/apa-6th-edition.csl b/src/main/resources/csl-styles/apa-6th-edition.csl deleted file mode 100644 index 775857accbe..00000000000 --- a/src/main/resources/csl-styles/apa-6th-edition.csl +++ /dev/null @@ -1,1566 +0,0 @@ - - diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl deleted file mode 100644 index 772c25e3345..00000000000 --- a/src/main/resources/csl-styles/apa.csl +++ /dev/null @@ -1,1697 +0,0 @@ - - diff --git a/src/main/resources/csl-styles/ieee.csl b/src/main/resources/csl-styles/ieee.csl deleted file mode 100644 index 04c375f09b7..00000000000 --- a/src/main/resources/csl-styles/ieee.csl +++ /dev/null @@ -1,467 +0,0 @@ - - diff --git a/src/main/resources/csl-styles/turabian-author-date.csl b/src/main/resources/csl-styles/turabian-author-date.csl deleted file mode 100644 index afb896007ff..00000000000 --- a/src/main/resources/csl-styles/turabian-author-date.csl +++ /dev/null @@ -1,657 +0,0 @@ - -