Andrius Merkys pushed to branch master at Debian Java Maintainers / libejml-java
Commits: 75f88b39 by Andrius Merkys at 2019-05-15T11:12:11Z Adding a patch to use local maven repository. - - - - - f0a59fca by Andrius Merkys at 2019-05-15T12:42:11Z Relying on gradle buildsystem to build the package. - - - - - 7c533cc9 by Andrius Merkys at 2019-05-15T12:45:47Z Using maven-repo-helper to correct gversion's artifactId. Adding b-dep on gversion gradle plugin. - - - - - 29e13e29 by Andrius Merkys at 2019-05-15T13:03:54Z Adding a patch to turn off example compilation, as it fails. - - - - - afec086b by Andrius Merkys at 2019-05-15T13:23:03Z Listing all the poms and their jars in debian/libejml-java.poms. - - - - - fbcfb024 by Andrius Merkys at 2019-05-15T13:25:00Z Removing debian/libejml-java.jlibs, as jars are now installed by debian/libejml-java.pom. - - - - - 8 changed files: - debian/control - − debian/libejml-java.jlibs - + debian/libejml-java.poms - + debian/maven.rules - + debian/patches/add-mavenLocal.patch - + debian/patches/no-examples.patch - + debian/patches/series - debian/rules Changes: ===================================== debian/control ===================================== @@ -7,7 +7,9 @@ Build-Depends: debhelper (>= 12~), javahelper, default-jdk, ant, - gradle + gradle, + maven-repo-helper, + libgradle-gversion-plugin-java Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/java-team/libejml-java Vcs-Git: https://salsa.debian.org/java-team/libejml-java.git ===================================== debian/libejml-java.jlibs deleted ===================================== @@ -1 +0,0 @@ -EJML*.jar ===================================== debian/libejml-java.poms ===================================== @@ -0,0 +1,37 @@ +# 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] +# +main/build/debian/main.pom +main/ejml-cdense/build/debian/ejml-cdense.pom -artifact=main/ejml-cdense/build/libs/ejml-cdense*.jar --java-lib +main/ejml-zdense/build/debian/ejml-zdense.pom -artifact=main/ejml-zdense/build/libs/ejml-zdense*.jar --java-lib +main/ejml-fdense/build/debian/ejml-fdense.pom -artifact=main/ejml-fdense/build/libs/ejml-fdense*.jar --java-lib +main/ejml-all/build/debian/ejml-all.pom -artifact=main/ejml-all/build/libs/ejml-all*.jar --java-lib +main/ejml-simple/build/debian/ejml-simple.pom -artifact=main/ejml-simple/build/libs/ejml-simple*.jar --java-lib +main/ejml-experimental/build/debian/ejml-experimental.pom -artifact=main/ejml-experimental/build/libs/ejml-experimental*.jar --java-lib +main/ejml-dsparse/build/debian/ejml-dsparse.pom -artifact=main/ejml-dsparse/build/libs/ejml-dsparse*.jar --java-lib +main/ejml-ddense/build/debian/ejml-ddense.pom -artifact=main/ejml-ddense/build/libs/ejml-ddense*.jar --java-lib +main/ejml-core/build/debian/ejml-core.pom -artifact=main/ejml-core/build/libs/ejml-core*.jar --java-lib ===================================== debian/maven.rules ===================================== @@ -0,0 +1 @@ +com.peterabeles.gversion s/com.peterabeles.gversion.gradle.plugin/gversion/ * s/.*/debian/ * * ===================================== debian/patches/add-mavenLocal.patch ===================================== @@ -0,0 +1,14 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -1,3 +1,11 @@ ++pluginManagement { ++ repositories { ++ maven { ++ url "file:///usr/share/maven-repo" ++ } ++ } ++} ++ + include 'main:ejml-core','main:ejml-experimental','main:ejml-ddense','main:ejml-zdense', + 'main:ejml-simple','examples',"main:ejml-all",'main:ejml-fdense','main:ejml-cdense','main:autocode', + 'main:ejml-dsparse' ===================================== debian/patches/no-examples.patch ===================================== @@ -0,0 +1,20 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -7,5 +7,5 @@ + } + + include 'main:ejml-core','main:ejml-experimental','main:ejml-ddense','main:ejml-zdense', +- 'main:ejml-simple','examples',"main:ejml-all",'main:ejml-fdense','main:ejml-cdense','main:autocode', ++ 'main:ejml-simple',"main:ejml-all",'main:ejml-fdense','main:ejml-cdense','main:autocode', + 'main:ejml-dsparse' +--- a/build.gradle ++++ b/build.gradle +@@ -241,7 +241,7 @@ + project(':main:ejml-core').compileJava.dependsOn(createVersionFile) + + // Disable the creation of jars for distribution. If you don't do this it will crash +-[':main',':examples',':main:autocode'].each {String a -> ++[':main',':main:autocode'].each {String a -> + project(a) { + if( project.hasProperty('ossrhUsername') ) { + signArchives.enabled = false ===================================== debian/patches/series ===================================== @@ -0,0 +1,2 @@ +add-mavenLocal.patch +no-examples.patch ===================================== debian/rules ===================================== @@ -5,28 +5,8 @@ export JAVA_HOME := /usr/lib/jvm/default-java/ %: # dh $@ --buildsystem=gradle --with javahelper ## gradle-debian-helper is not backported to Jessie - dh $@ --with javahelper + dh $@ --with javahelper,maven-repo-helper override_dh_auto_build: - # dh_auto_build -- oneJar ## gradle-debian-helper is not backported to Jessie - ./gradlew --offline --no-daemon --stacktrace \ - --gradle-user-home debian/gradle-user-home \ - oneJar -# Simply use the provided PDF since this does nothing sensible -# ./gradlew --offline --no-daemon --stacktrace \ -# --gradle-user-home debian/gradle-user-home \ -# javadoc - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - ./gradlew --offline --no-daemon --stacktrace \ - --gradle-user-home debian/gradle-user-home \ - check -x test -endif - -override_dh_clean: - ./gradlew --offline --no-daemon --stacktrace \ - --gradle-user-home debian/gradle-user-home \ - clean -x build - rm -rf .gradle package/lib debian/gradle-user-home - dh_clean + dh_auto_build -- autogenerate + dh_auto_build View it on GitLab: https://salsa.debian.org/java-team/libejml-java/compare/2d05e0544d32884209f09e7462f14d447ddd29af...fbcfb024082960abd3875edd688b2e4ed85701b2 -- View it on GitLab: https://salsa.debian.org/java-team/libejml-java/compare/2d05e0544d32884209f09e7462f14d447ddd29af...fbcfb024082960abd3875edd688b2e4ed85701b2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits