Skip to content
Snippets Groups Projects
Commit 3c365ff3 authored by Emmanuel Bourg's avatar Emmanuel Bourg
Browse files

Import Debian version 1.8

eclipse-debian-helper (1.8) unstable; urgency=medium

  * Do not return an error if bundle.properties is missing at the install phase
  * Standards-Version updated to 4.5.0
  * Switch to debhelper level 13

eclipse-debian-helper (1.7) unstable; urgency=medium

  * Generate a pom.xml file for the pomless bundles

eclipse-debian-helper (1.6) unstable; urgency=medium

  * Mount the bundle dependencies before the default dependencies
    in the compilation classpath
  * Standards-Version updated to 4.4.0
parent 2d24a216
Branches apertis/v2021dev3 apertis/v2021pre apertis/v2022dev0
No related tags found
1 merge request!1Update from debian/bullseye for apertis/v2022dev2
Pipeline #520634 canceled
eclipse-debian-helper (1.8) unstable; urgency=medium
* Do not return an error if bundle.properties is missing at the install phase
* Standards-Version updated to 4.5.0
* Switch to debhelper level 13
-- Emmanuel Bourg <ebourg@apache.org> Mon, 05 Oct 2020 12:05:39 +0200
eclipse-debian-helper (1.7) unstable; urgency=medium
* Generate a pom.xml file for the pomless bundles
-- Emmanuel Bourg <ebourg@apache.org> Wed, 17 Jul 2019 15:19:13 +0200
eclipse-debian-helper (1.6) unstable; urgency=medium
* Mount the bundle dependencies before the default dependencies
in the compilation classpath
* Standards-Version updated to 4.4.0
-- Emmanuel Bourg <ebourg@apache.org> Thu, 11 Jul 2019 13:31:38 +0200
eclipse-debian-helper (1.5) unstable; urgency=medium
* Improved the detection of the bundle name
......
11
......@@ -3,8 +3,8 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg@apache.org>
Build-Depends: debhelper (>= 11),
Standards-Version: 4.2.1
Build-Depends: debhelper-compat (= 13),
Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/eclipse-debian-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/eclipse-debian-helper
Homepage: https://salsa.debian.org/java-team/eclipse-debian-helper
......
......@@ -63,11 +63,11 @@
<!-- Compile the source files to target/classes -->
<javac srcdir="${bundle.dir.@{name}}/target/sources" destdir="${bundle.dir.@{name}}/target/classes" debug="yes" release="@{release}" includeantruntime="false" encoding="@{encoding}">
<classpath>
<fileset dir="." includesfile="${bundle.dir.@{name}}/target/dependencies"/>
<bundle-classpath/>
<pathelement path="/usr/share/java/eclipse-osgi.jar"/>
<pathelement path="/usr/share/java/org.eclipse.osgi.jar"/>
<pathelement path="/usr/share/java/osgi.compendium.jar"/>
<fileset dir="." includesfile="${bundle.dir.@{name}}/target/dependencies"/>
<bundle-classpath/>
</classpath>
</javac>
......@@ -101,9 +101,32 @@
<concat destfile="debian/bundles.properties" append="true">@{name} ${bundle.version.@{name}} ${shortname.@{name}} lib${shortname.@{name}}-java ${bundle.depends.@{name}} @{basedir}${line.separator}</concat>
<!-- Prepare the pom to be installed in the package -->
<copy file="${bundle.dir.@{name}}/pom.xml" todir="${bundle.dir.@{name}}/target"/>
<replace file="${bundle.dir.@{name}}/target/pom.xml" token="-SNAPSHOT" value=""/>
<replace file="${bundle.dir.@{name}}/target/pom.xml" token="&lt;packaging&gt;eclipse-plugin&lt;/packaging&gt;" value="&lt;packaging&gt;jar&lt;/packaging&gt;"/>
<if>
<resourceexists>
<file file="${bundle.dir.@{name}}/pom.xml"/>
</resourceexists>
<then>
<!-- bundle with a pom, adjust the version and the packaging type -->
<copy file="${bundle.dir.@{name}}/pom.xml" todir="${bundle.dir.@{name}}/target"/>
<replace file="${bundle.dir.@{name}}/target/pom.xml" token="-SNAPSHOT" value=""/>
<replace file="${bundle.dir.@{name}}/target/pom.xml" token="&lt;packaging&gt;eclipse-plugin&lt;/packaging&gt;" value="&lt;packaging&gt;jar&lt;/packaging&gt;"/>
</then>
<else>
<!-- pomless bundle, let's generate one -->
<propertyregex property="groupId.@{name}" input="@{name}" regexp="([^\.]+\.[^\.]+\.[^\.]+).*" select="\1" defaultValue="@{name}" global="true" override="true"/>
<property name="artifactId.@{name}" value="@{name}"/>
<echo>Generating pom.xml for @{name} (${groupId.@{name}}:${artifactId.@{name}})</echo>
<echoxml file="${bundle.dir.@{name}}/target/pom.xml">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId.@{name}}</groupId>
<artifactId>${artifactId.@{name}}</artifactId>
<version>${bundle.version.@{name}}</version>
<packaging>jar</packaging>
</project>
</echoxml>
</else>
</if>
<property name="@{name}.done" value="true"/>
</then>
......
......@@ -65,6 +65,9 @@ sub install {
my $this=shift;
my $file = "debian/bundles.properties";
if (!-e $file) {
return;
}
open(my $data, '<', $file) or die "Could not open '$file' $!\n";
while (my $line = <$data>) {
# Parse the line
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment