[Git][java-team/eclipse-debian-helper][master] 4 commits: Clarified the parsing of debian/bundles.properties in eclipse_bundles.pm

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-debian-helper


Commits:
276b498c by Emmanuel Bourg at 2018-09-27T13:22:29Z
Clarified the parsing of debian/bundles.properties in eclipse_bundles.pm

- - - - -
c1b0ed47 by Emmanuel Bourg at 2018-09-27T13:41:19Z
Add a symlink in /usr/lib/eclipse/plugins/ when installing a plugin

- - - - -
300c01da by Emmanuel Bourg at 2018-09-27T22:20:48Z
New parameter to set the shortname of a bundle

- - - - -
476f3990 by Emmanuel Bourg at 2018-09-27T22:21:07Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- src/ant/build-eclipse-bundle.xml
- src/perl/eclipse_bundles.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+eclipse-debian-helper (1.3) unstable; urgency=medium
+
+  * Add a symlink in /usr/lib/eclipse/plugins/ when installing a plugin
+  * New parameter to set the shortname of a bundle
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 28 Sep 2018 00:21:02 +0200
+
 eclipse-debian-helper (1.2) unstable; urgency=medium
 
   * Made the source encoding configurable


=====================================
src/ant/build-eclipse-bundle.xml
=====================================
@@ -5,6 +5,7 @@
 
   <macrodef name="make-bundle">
     <attribute name="name"                      description="The name of the bundle (for example org.eclipse.foo.bar)"/>
+    <attribute name="shortname" default=""      description="The short name of the bundle (for example eclipse-foo-bar)"/>
     <attribute name="depends" default=""        description="The comma separated list of local bundles used as dependencies"/>
     <attribute name="basedir" default="bundles" description="The base directory holding all the bundles"/>
     <attribute name="release" default="8"       description="The version of Java targeted"/>
@@ -92,6 +93,10 @@
             </sequential>
           </for>
           <bundle2shortname bundle="@{name}" property="shortname.@{name}"/>
+          <if>
+            <not><equals arg1="@{shortname}" arg2="" /></not>
+            <then><var name="shortname.@{name}" value="@{shortname}"/></then>
+          </if>
           <concat destfile="debian/bundles.properties" append="true">@{name}	${bundle.version.@{name}}	${shortname.@{name}}	lib${shortname.@{name}}-java	${bundle.depends.@{name}}${line.separator}</concat>
 
           <!-- Prepare the pom to be installed in the package -->


=====================================
src/perl/eclipse_bundles.pm
=====================================
@@ -64,15 +64,28 @@ sub install {
 	my $file = "debian/bundles.properties";
 	open(my $data, '<', $file) or die "Could not open '$file' $!\n";
 	while (my $line = <$data>) {
+		# Parse the line
 		chomp $line;
 		my @fields = split(/\s/ , $line);
+		my $bundle       = $fields[0];
+		my $version      = $fields[1];
+		my $shortname    = $fields[2];
+		my $package      = $fields[3];
+		my $dependencies = $fields[4];
 
 		# Install the Maven artifacts
-		$this->doit_in_builddir("mh_installpom", "-p$fields[3]", "--no-parent", "-e$fields[1]", "$this->{bundledir}/$fields[0]/target/pom.xml");
-		$this->doit_in_builddir("mh_installjar", "-p$fields[3]", "--java-lib", "-e$fields[1]", "--usj-name=$fields[2]", "$this->{bundledir}/$fields[0]/target/pom.xml", "$this->{bundledir}/$fields[0]/target/$fields[0].jar");
+		$this->doit_in_builddir("mh_installpom", "-p$package", "--no-parent", "-e$version", "$this->{bundledir}/$bundle/target/pom.xml");
+		$this->doit_in_builddir("mh_installjar", "-p$package", "--java-lib", "-e$version", "--usj-name=$shortname", "$this->{bundledir}/$bundle/target/pom.xml", "$this->{bundledir}/$bundle/target/$bundle.jar");
 
 		# Specify the bundle dependencies in the substvars file
-		addsubstvar($fields[3], "bundle:Depends", $fields[4]);
+		addsubstvar($package, "bundle:Depends", $dependencies);
+
+		# Add a symlink in /usr/lib/eclipse/plugins/ for plugins
+		open(PROJECT_FILE, "$this->{bundledir}/$bundle/.project");
+		if (grep{/org.eclipse.pde.PluginNature/} <PROJECT_FILE>) {
+			$this->doit_in_builddir("dh_link", "-p$package", "/usr/share/java/$shortname.jar", "/usr/lib/eclipse/plugins/${bundle}_${version}.jar");
+		}
+		close PROJECT_FILE;
 	}
 }
 



View it on GitLab: https://salsa.debian.org/java-team/eclipse-debian-helper/compare/637086e68e687d7298b91c5b02a3089aec60d016...476f3990487784212b1d90677fb246e5f9fb5701

-- 
View it on GitLab: https://salsa.debian.org/java-team/eclipse-debian-helper/compare/637086e68e687d7298b91c5b02a3089aec60d016...476f3990487784212b1d90677fb246e5f9fb5701
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180927/98d708be/attachment.html>