[libreoffice] 01/01: install maven stuff for juh, jurt, ridl and unoil
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit 1c130152fdb881db51543513ddafb212ff5c6df2
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 27 21:11:57 2013 +0200
install maven stuff for juh,jurt,ridl and unoil
---
changelog | 6 +++++-
libreoffice-java-common.poms | 28 ++++++++++++++++++++++++++++
pom.juh.xml.in | 33 +++++++++++++++++++++++++++++++++
pom.jurt.xml.in | 33 +++++++++++++++++++++++++++++++++
pom.ridl.xml.in | 33 +++++++++++++++++++++++++++++++++
pom.unoil.xml.in | 33 +++++++++++++++++++++++++++++++++
rules | 26 +++++++++++++++++++++++++-
ure.poms | 30 ++++++++++++++++++++++++++++++
8 files changed, 220 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 314dd7c..29c315e 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,12 @@ libreoffice (1:4.1.4-3) UNRELEASED; urgency=low
* debian/control.ure.in:
- add missing second a in "additional" (closes: #734512)
+ * debian/pom.*.xml.in, debian/*.poms, debian/rules:
+ - install maven stuff for juh,jurt,ridl and unoil (based on the poms from
+ http://bertfrees.github.io/snapshots/org/libreoffice/), thanks Sebastian
+ Humenda
- -- Rene Engelhard <rene@debian.org> Tue, 07 Jan 2014 20:41:08 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Feb 2014 09:48:12 +0100
libreoffice (1:4.1.4-2) unstable; urgency=medium
diff --git a/libreoffice-java-common.poms b/libreoffice-java-common.poms
new file mode 100644
index 0000000..fcc4eec
--- /dev/null
+++ b/libreoffice-java-common.poms
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+debian/pom.unoil.xml --no-parent --has-package-version
diff --git a/pom.juh.xml.in b/pom.juh.xml.in
new file mode 100644
index 0000000..bec8297
--- /dev/null
+++ b/pom.juh.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.libreoffice</groupId>
+ <artifactId>juh</artifactId>
+ <version>@version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${artifactId}.jar</file>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.jurt.xml.in b/pom.jurt.xml.in
new file mode 100644
index 0000000..2b0529b
--- /dev/null
+++ b/pom.jurt.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.libreoffice</groupId>
+ <artifactId>jurt</artifactId>
+ <version>@version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${artifactId}.jar</file>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.ridl.xml.in b/pom.ridl.xml.in
new file mode 100644
index 0000000..d890e02
--- /dev/null
+++ b/pom.ridl.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.libreoffice</groupId>
+ <artifactId>ridl</artifactId>
+ <version>@version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${artifactId}.jar</file>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.unoil.xml.in b/pom.unoil.xml.in
new file mode 100644
index 0000000..506f0db
--- /dev/null
+++ b/pom.unoil.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.libreoffice</groupId>
+ <artifactId>unoil</artifactId>
+ <version>@version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${artifactId}.jar</file>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/rules b/rules
index 695b090..5a6fa32 100755
--- a/rules
+++ b/rules
@@ -835,6 +835,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
endif
ifeq "$(ENABLE_JAVA)" "y"
+ BUILD_DEP += , maven-repo-helper
ifeq "$(JDK)" "default"
BUILD_DEPS += , java-common (>= 0.49)
JAVA_HOME=/usr/lib/jvm/default-java
@@ -1399,7 +1400,7 @@ clean-debdir:
rm -rf debian/usr
find debian -name "*.links" ! -name "libreoffice-dev-doc.links" \
- -exec rm {} \;
+ !-name "libreoffice-java-common.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/*.bug-script
rm -f debian/scripts/aotcompile.py*
@@ -1413,6 +1414,7 @@ clean-debdir:
rm -f debian/catalog.xml
rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
+ rm -f debian/pom*.xml
dh_clean
@@ -2581,6 +2583,19 @@ ifeq (,$(filter lpsolve, $(SYSTEM_STUFF)))
$(PKGDIR)-core/$(OODIR)/program
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ # somehow --has-package-version doesn't overwrite version and without <version>...</version>
+ # we get a NullPointerException when calling mh_installjar
+ for i in juh jurt ridl; do \
+ sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \
+ < debian/pom.$$i.xml.in > debian/pom.$$i.xml; \
+ done
+ mh_installpoms -pure
+ for i in juh jurt ridl; do \
+ mh_installjar -pure -l debian/pom.$$i.xml `find solver -name "$$i.jar"`; \
+ done
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@ -2940,6 +2955,15 @@ endif
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
+ifeq "$(ENABLE_JAVA)" "y"
+ # somehow --has-package-version doesn't overwrite version and without <version>...</version>
+ # we get a NullPointerException when calling mh_installjar
+ sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \
+ < debian/pom.unoil.xml.in > debian/pom.unoil.xml
+ mh_installpoms -plibreoffice-java-common
+ mh_installjar -plibreoffice-java-common -l debian/pom.unoil.xml `find solver -name "unoil.jar"`
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
diff --git a/ure.poms b/ure.poms
new file mode 100644
index 0000000..fcecee3
--- /dev/null
+++ b/ure.poms
@@ -0,0 +1,30 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+debian/pom.juh.xml --no-parent --has-package-version
+debian/pom.jurt.xml --no-parent --has-package-version
+debian/pom.ridl.xml --no-parent --has-package-version
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: