[simplyhtml] 01/01: move to new gradle build system, publish maven artifact
Felix Natter
fnatter-guest at moszumanska.debian.org
Wed Apr 13 10:42:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit f62eab20f0c177221bff32dfce0b5a1e899cbaec
Author: Felix Natter <fnatter at gmx.net>
Date: Wed Apr 13 12:42:17 2016 +0200
move to new gradle build system, publish maven artifact
---
debian/changelog | 2 +-
debian/clean | 3 +
debian/control | 13 ++--
debian/install | 2 -
debian/maven.cleanIgnoreRules | 1 +
debian/maven.ignoreRules | 1 +
debian/maven.publishedRules | 1 +
debian/maven.rules | 2 +
debian/patches/01_build.patch | 101 +++++++++++++++++++++++++++++++
debian/patches/10_build_xml.patch | 24 --------
debian/patches/40_fix_codeless_jar.patch | 20 ------
debian/patches/series | 3 +-
debian/rules | 21 ++-----
debian/simplyhtml-doc.docs | 2 +-
debian/simplyhtml.poms | 1 +
15 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5847212..f91e839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ simplyhtml (0.16.15-1) UNRELEASED; urgency=medium
* New upstream version.
* Use/patch new gradle build system.
- * require java7
+ * Require java7 runtime
-- Felix Natter <fnatter at gmx.net> Mon, 11 Apr 2016 12:11:25 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..1eb7477
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+simplyhtml
+simplyhtml.1
+pom.xml
diff --git a/debian/control b/debian/control
index 8ac2382..ee3f8e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Felix Natter <fnatter at gmx.net>
Section: web
Priority: optional
-Build-Depends: debhelper (>= 9),
- cdbs
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: default-jdk,
libgnu-regexp-java,
javahelp2,
- ant,
- docbook-to-man
+ libmnemonicsetter-java,
+ docbook-to-man,
+ gradle,
+ gradle-debian-helper,
+ maven-repo-helper
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/simplyhtml.git
Vcs-Git: git://anonscm.debian.org/pkg-java/simplyhtml.git
@@ -17,8 +19,9 @@ Homepage: http://sf.net/projects/simplyhtml
Package: simplyhtml
Architecture: all
-Depends: default-jre | java6-runtime,
+Depends: default-jre | java7-runtime,
libgnu-regexp-java,
+ libmnemonicsetter-java,
${misc:Depends}
Recommends: javahelp2
Suggests: simplyhtml-doc
diff --git a/debian/install b/debian/install
index 444b4f8..5a0314b 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1 @@
-dist/lib/SimplyHTML-0.16.13.jar usr/share/java
-dist/lib/SimplyHTMLHelp-0.16.13.jar usr/share/java
simplyhtml usr/bin
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..5f7d3e4
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+com.lightdev.app.shtm.simplyhtml SimplyHTML jar s/.*/debian/ * *
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
new file mode 100644
index 0000000..cb2d464
--- /dev/null
+++ b/debian/patches/01_build.patch
@@ -0,0 +1,101 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,10 +1,11 @@
+-plugins {
+- id "com.jfrog.bintray" version "1.6"
+-}
++//plugins {
++// id "com.jfrog.bintray" version "1.6"
++//}
+
+ apply plugin: 'java'
+ apply plugin: 'eclipse'
+-apply plugin: 'maven-publish'
++//apply plugin: 'maven-publish'
++apply plugin: 'maven'
+
+ group 'com.lightdev.app.shtm.simplyhtml'
+ version = '0.16.15'
+@@ -13,30 +14,16 @@
+ sourceCompatibility='1.7'
+
+ repositories {
+- jcenter()
+- maven { url "http://dl.bintray.com/freeplane/freeplane" }
++ //jcenter()
++ // maven { url "http://dl.bintray.com/freeplane/freeplane" }
++ flatDir name: '/usr/share/java', dir: '/usr/share/java'
+ }
+
+-bintray {
+- user = System.getenv('BINTRAY_USER')
+- key = System.getenv('BINTRAY_KEY')
+- publications = ['simplyhtml']
+- pkg {
+- repo = 'freeplane'
+- name = 'simplyhtml'
+- userOrg = 'freeplane'
+- licenses = ['GPL-3.0', 'GPL-2.0']
+- vcsUrl = 'https://github.com/dpolivaev/simplyhtml.git'
+- version {
+- name = project.version
+- }
+- }
+-}
+
+ dependencies {
+- compile 'javax.help:javahelp:2.0.05',
+- 'gnu-regexp:gnu-regexp:1.1.4',
+- 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'
++ compile 'javax.help:javahelp:2.0.05',
++ 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'
++ compile ':gnu-regexp'
+ }
+
+ sourceSets {
+@@ -89,9 +76,7 @@
+ from sourceSets.main.allSource
+ }
+
+-build.dependsOn mainJar
+-build.dependsOn javadoc
+-
++/*
+ publishing {
+ publications {
+ simplyhtml(MavenPublication) {
+@@ -104,6 +89,24 @@
+ }
+ }
+ }
++*/
++
++task createPom << {
++ pom {
++ artifactId = 'SimplyHTML'
++ project {
++ inceptionYear '2011'
++ licenses {
++ license {
++ name 'GNU General Public License, Version 2'
++ url 'http://www.gnu.org/licenses/gpl-2.0.html'
++ distribution 'repo'
++ }
++ }
++ }
++ }.writeTo("pom.xml")
++}
++
+
+ javadoc {
+ enabled = true
+@@ -111,4 +114,8 @@
+ failOnError = false
+ }
+
++build.dependsOn mainJar
++build.dependsOn javadoc
++build.dependsOn createPom
++
+ apply from: './dist.gradle'
+\ No newline at end of file
diff --git a/debian/patches/10_build_xml.patch b/debian/patches/10_build_xml.patch
deleted file mode 100644
index 659726c..0000000
--- a/debian/patches/10_build_xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-adapt paths to jar dependencies (/usr/share/java/*.jar)
---- a/src/build.xml
-+++ b/src/build.xml
-@@ -10,16 +10,16 @@
- <property name="dist.src" value="${dist}/src" />
- <property name="dist.help" value="${dist}/help" />
- <property name="dist.lib" value="${dist}/lib" />
-- <property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML.jar"/>
-- <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp.jar"/>
-+ <property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.16.13.jar"/>
-+ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.16.13.jar"/>
- <property name="SimplyHTMLsources.jar" value="${dist.lib}/SimplyHTML-sources.jar"/>
- <property name="post" value="../post" />
- <property name="debug" value="on" />
- <property name="java_source_version" value="1.6" />
- <property name="java_target_version" value="1.6" />
- <property name="build.compiler" value="modern" />
-- <property name="jhall.jar" value="..\lib\jhall.jar" />
-- <property name="gnu-regexp.jar" value="..\lib\gnu-regexp-1.1.4.jar" />
-+ <property name="jhall.jar" value="/usr/share/java/jhall.jar" />
-+ <property name="gnu-regexp.jar" value="/usr/share/java/gnu-regexp.jar" />
- <property name="classpath" value="${jhall.jar}:${gnu-regexp.jar}"/>
-
- <target name="srcjar">
diff --git a/debian/patches/40_fix_codeless_jar.patch b/debian/patches/40_fix_codeless_jar.patch
deleted file mode 100644
index 6581cf0..0000000
--- a/debian/patches/40_fix_codeless_jar.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-use <zip> ant target for SimplyHTMLHelp-XXX.jar because (as opposed to <jar>)
-this will not create a manifest file. This fixes a lintian "codeless jar" warning.
-
---- a/src/build.xml
-+++ b/src/build.xml
-@@ -100,12 +100,12 @@
- <include name="com/lightdev/app/shtm/resources/**"/>
- </fileset>
- </jar>
-- <jar jarfile="${SimplyHTMLHelp.jar}"
-+ <zip destfile="${SimplyHTMLHelp.jar}"
- update="true">
- <fileset dir="${src}">
- <include name="com/lightdev/app/shtm/help/**"/>
- </fileset>
-- </jar>
-+ </zip>
- <copy file="${jhall.jar}" tofile="${dist.lib}/jhall.jar" />
- <copy file="${gnu-regexp.jar}" tofile="${dist.lib}/gnu-regexp.jar" />
- <zip destfile="${dist}/SimplyHTML_bin_${version}.zip">
diff --git a/debian/patches/series b/debian/patches/series
index c50dbcc..50bb18b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-10_build_xml.patch
-40_fix_codeless_jar.patch
+01_build.patch
diff --git a/debian/rules b/debian/rules
index e5a3929..75a3f43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,12 @@
#!/usr/bin/make -f
-# debian/rules for Commons Fileupload (uses CDBS)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@ --with maven_repo_helper --buildsystem=gradle
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_ANT_BUILD_TARGET := full-dist
-DEB_BUILDDIR := src
-
-LIBRARY=SimplyHTML
-VERSION=0.16.13
-
-build:
+override_dh_auto_build:
+ dh_auto_build -- build
/usr/bin/docbook-to-man debian/simplyhtml.sgml > simplyhtml.1
cp debian/simplyhtml.sh simplyhtml
-clean::
- -rm -f simplyhtml.1
- -rm -f simplyhtml
- -rm -fr bin
-
get-orig-source:
uscan --repack --rename
diff --git a/debian/simplyhtml-doc.docs b/debian/simplyhtml-doc.docs
index c37789c..2579210 100644
--- a/debian/simplyhtml-doc.docs
+++ b/debian/simplyhtml-doc.docs
@@ -1 +1 @@
-dist/api/
+build/docs/javadoc/
diff --git a/debian/simplyhtml.poms b/debian/simplyhtml.poms
new file mode 100644
index 0000000..c65a514
--- /dev/null
+++ b/debian/simplyhtml.poms
@@ -0,0 +1 @@
+pom.xml --has-package-version --artifact=build/libs/SimplyHTML-*.jar --java-lib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git
More information about the pkg-java-commits
mailing list