From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- unoil/BUCK | 21 +++++++++++++++ unoil/CliUnoApi_oootypes.mk | 29 ++++++++++++++++++++ unoil/CustomTarget_javamaker.mk | 31 ++++++++++++++++++++++ unoil/Jar_unoil.mk | 16 +++++++++++ unoil/Makefile | 7 +++++ unoil/Module_unoil.mk | 27 +++++++++++++++++++ unoil/README.md | 3 +++ unoil/climaker/cli_oootypes_config | 28 ++++++++++++++++++++ unoil/climaker/incversions.txt | 22 ++++++++++++++++ unoil/climaker/version.txt | 23 ++++++++++++++++ unoil/pom.unoil.xml | 54 ++++++++++++++++++++++++++++++++++++++ 11 files changed, 261 insertions(+) create mode 100644 unoil/BUCK create mode 100644 unoil/CliUnoApi_oootypes.mk create mode 100644 unoil/CustomTarget_javamaker.mk create mode 100644 unoil/Jar_unoil.mk create mode 100644 unoil/Makefile create mode 100644 unoil/Module_unoil.mk create mode 100644 unoil/README.md create mode 100644 unoil/climaker/cli_oootypes_config create mode 100644 unoil/climaker/incversions.txt create mode 100644 unoil/climaker/version.txt create mode 100644 unoil/pom.unoil.xml (limited to 'unoil') diff --git a/unoil/BUCK b/unoil/BUCK new file mode 100644 index 000000000..e84663c81 --- /dev/null +++ b/unoil/BUCK @@ -0,0 +1,21 @@ +genrule( + name = 'unoil-src', + cmd = ' && '.join([ + 'cd $TMP', + 'echo "FAKE SOURCE ARCHIVE" > README', + 'zip -qr $OUT *', + ]), + out = 'unoil-src.jar', + visibility = ['PUBLIC'], +) + +genrule( + name = 'unoil-javadoc', + cmd = ' && '.join([ + 'cd $TMP', + 'echo "FAKE JAVADOC ARCHIVE" > README', + 'zip -qr $OUT *', + ]), + out = 'unoil-javadoc.jar', + visibility = ['PUBLIC'], +) diff --git a/unoil/CliUnoApi_oootypes.mk b/unoil/CliUnoApi_oootypes.mk new file mode 100644 index 000000000..69d0a128f --- /dev/null +++ b/unoil/CliUnoApi_oootypes.mk @@ -0,0 +1,29 @@ + +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +include $(SRCDIR)/unoil/climaker/version.txt + +$(eval $(call gb_CliUnoApi_CliUnoApi,cli_oootypes)) + +$(eval $(call gb_CliUnoApi_set_assembly_version,cli_oootypes,$(CLI_OOOTYPES_NEW_VERSION))) + +$(eval $(call gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config,unoil/climaker/version.txt)) + +$(eval $(call gb_CliUnoApi_set_keyfile,cli_oootypes,$(SRCDIR)/cli_ure/source/cliuno.snk)) + +$(eval $(call gb_CliUnoApi_set_policy,cli_oootypes,$(CLI_OOOTYPES_POLICY_ASSEMBLY),$(CLI_OOOTYPES_POLICY_VERSION))) + +$(eval $(call gb_CliUnoApi_wrap_api,cli_oootypes,offapi)) + +$(eval $(call gb_CliUnoApi_use_api,cli_oootypes,udkapi)) + +$(eval $(call gb_CliUnoApi_use_assembly,cli_oootypes,cli_uretypes)) + +# vim: set noet sw=4 ts=4: diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk new file mode 100644 index 000000000..97793d519 --- /dev/null +++ b/unoil/CustomTarget_javamaker.mk @@ -0,0 +1,31 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker)) + +unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker) + +$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done + +$(unoil_JAVADIR)/done : \ + $(call gb_UnoApi_get_target,offapi) \ + $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_Executable_get_runtime_dependencies,javamaker) \ + | $(unoil_JAVADIR)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) + $(call gb_Helper_abbreviate_dirs, \ + rm -r $(unoil_JAVADIR) && \ + $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) \ + $(call gb_UnoApi_get_target,offapi) \ + -X$(call gb_UnoApi_get_target,udkapi)) && \ + touch $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk new file mode 100644 index 000000000..b0265c93f --- /dev/null +++ b/unoil/Jar_unoil.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Jar_Jar,unoil)) + +$(eval $(call gb_Jar_add_manifest_classpath,unoil, \ + libreoffice.jar \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/unoil/Makefile b/unoil/Makefile new file mode 100644 index 000000000..ccb1c85a0 --- /dev/null +++ b/unoil/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk new file mode 100644 index 000000000..96c90e6b0 --- /dev/null +++ b/unoil/Module_unoil.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,unoil)) + +ifneq ($(ENABLE_JAVA),) +$(eval $(call gb_Module_add_targets,unoil,\ + CustomTarget_javamaker \ + Jar_unoil \ +)) +endif + +ifeq ($(COM),MSC) +ifneq ($(CPUNAME),AARCH64) +$(eval $(call gb_Module_add_targets,unoil,\ + CliUnoApi_oootypes \ +)) +endif +endif + +# vim:set noet sw=4 ts=4: diff --git a/unoil/README.md b/unoil/README.md new file mode 100644 index 000000000..3ee4882d0 --- /dev/null +++ b/unoil/README.md @@ -0,0 +1,3 @@ +# Java UNO IDL Code Generator + +Maps IDL into java classes definitions. This is for `offapi`, while `ridljar` is for `udkapi`. diff --git a/unoil/climaker/cli_oootypes_config b/unoil/climaker/cli_oootypes_config new file mode 100644 index 000000000..9f436e84b --- /dev/null +++ b/unoil/climaker/cli_oootypes_config @@ -0,0 +1,28 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/unoil/climaker/incversions.txt b/unoil/climaker/incversions.txt new file mode 100644 index 000000000..c5eaa3f90 --- /dev/null +++ b/unoil/climaker/incversions.txt @@ -0,0 +1,22 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +CLI_OOOTYPES_NEW_VERSION +CLI_OOOTYPES_OLD_VERSION +CLI_OOOTYPES_POLICY_VERSION + diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt new file mode 100644 index 000000000..ec48a082e --- /dev/null +++ b/unoil/climaker/version.txt @@ -0,0 +1,23 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +CLI_OOOTYPES_NEW_VERSION=1.0.9.0 +CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.8.0 +CLI_OOOTYPES_POLICY_VERSION=9.0.0.0 +CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes + diff --git a/unoil/pom.unoil.xml b/unoil/pom.unoil.xml new file mode 100644 index 000000000..9991ed572 --- /dev/null +++ b/unoil/pom.unoil.xml @@ -0,0 +1,54 @@ + + 4.0.0 + org.libreoffice + unoil + @version@ + jar + LibreOffice - Maps IDL into java classes definitions + Maps IDL into java classes definitions + https://www.libreoffice.org + + + + + org.libreoffice + libreoffice + @version@ + + + + + + + Mozilla Public License, Version 2.0 + https://www.mozilla.org/en-US/MPL/2.0 + repo + + + + + https://cgit.freedesktop.org/libreoffice/core + https://gerrit.libreoffice.org/#/admin/projects/core + + + + + The Document Foundation + + + + + + LibreOffice Development Mailing List + libreoffice@lists.freedesktop.org + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/archives/libreoffice + + + + + https://bugs.documentfoundation.org + LibreOffice Issue Tracker + + -- cgit v1.2.3