diff options
| author | Rene Engelhard <rene@debian.org> | 2020-05-08 14:19:45 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-03-10 16:19:45 +0100 |
| commit | f5caffb74a5336014e84121b90196769d9a29d56 (patch) | |
| tree | ea24bce0ebdccfa0183bfee817939406f831d8e7 /solenv | |
| parent | 907e5fa4fe13efb26fc0dc3e5ead611da734daaa (diff) | |
Adapt buck build to jars merged into libreoffice.jar
Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and
35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars
were merged into libreoffice.jar. Adapt the buck build correspondingly.
Preserve the publishing of merged jars for now with dummy content and
consider to remove them in future releases.
Test Plan:
1. To replace version number with upcoming release version:
$ solenv/bin/version.py 7.1.0
2. To install the API to local Maven repository:
$ VERBOSE=1 buck build api_install
3. To deploy the API to Maven Central:
$ VERBOSE=1 buck build api_deploy
Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit ea8d6cd59670854cb153c4e984cb4044093e5994)
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/version.py | 3 | ||||
| -rw-r--r-- | solenv/buck/build.defs | 2 | ||||
| -rw-r--r-- | solenv/maven/BUCK | 3 | ||||
| -rwxr-xr-x | solenv/maven/mvn.py | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/solenv/bin/version.py b/solenv/bin/version.py index b1164483f660..3193b3fa39f1 100755 --- a/solenv/bin/version.py +++ b/solenv/bin/version.py @@ -12,6 +12,7 @@ M = { 'ridl': 'ridljar', 'unoil': 'unoil', 'unoloader': 'ridljar', + 'libreoffice': 'ridljar', } parser = OptionParser() @@ -40,7 +41,7 @@ def replace_in_file(filename, src_pattern): src_pattern = re.compile(r'^(\s*<version>)([-.@\w]+)(</version>\s*)$', re.MULTILINE) -for a in ['juh', 'jurt', 'officebean', 'ridl', 'unoil', 'unoloader']: +for a in ['juh', 'jurt', 'libreoffice', 'officebean', 'ridl', 'unoil', 'unoloader']: replace_in_file(os.path.join(M[a], 'pom.%s.xml' % a), src_pattern) src_pattern = re.compile(r"^(LIBREOFFICE_VERSION = ')([-.@\w]+)(')$", diff --git a/solenv/buck/build.defs b/solenv/buck/build.defs index b7b81ec8cb3c..f6a1a7463b94 100644 --- a/solenv/buck/build.defs +++ b/solenv/buck/build.defs @@ -1,11 +1,13 @@ def java_sources( name, srcs, + root = None, visibility = [] ): java_library( name = name, resources = srcs, + resources_root = root, visibility = visibility, ) diff --git a/solenv/maven/BUCK b/solenv/maven/BUCK index f5bca38be2a3..fd1252df0c37 100644 --- a/solenv/maven/BUCK +++ b/solenv/maven/BUCK @@ -16,6 +16,7 @@ maven_package( 'ridl': '//:ridl', 'unoil': '//:unoil', 'unoloader': '//:unoloader', + 'libreoffice': '//:libreoffice', }, src = { 'juh': '//javaunohelper:juh-src', @@ -24,6 +25,7 @@ maven_package( 'ridl': '//ridljar:ridl-src', 'unoil': '//unoil:unoil-src', 'unoloader': '//ridljar/source/unoloader:unoloader-src', + 'libreoffice': '//ridljar:libreoffice-src', }, doc = { 'juh': '//javaunohelper:juh-javadoc', @@ -32,6 +34,7 @@ maven_package( 'ridl': '//ridljar:ridl-javadoc', 'unoil': '//unoil:unoil-javadoc', 'unoloader': '//ridljar/source/unoloader:unoloader-javadoc', + 'libreoffice': '//ridljar:libreoffice-javadoc', }, ) diff --git a/solenv/maven/mvn.py b/solenv/maven/mvn.py index caa15eeb9fd8..5b45447daa07 100755 --- a/solenv/maven/mvn.py +++ b/solenv/maven/mvn.py @@ -18,6 +18,7 @@ M = { 'ridl': 'ridljar', 'unoil': 'unoil', 'unoloader': 'ridljar', + 'libreoffice': 'ridljar', } opts = OptionParser() |