[simplyhtml] 04/04: make simplyhtml.sh work: rewrite generated classpath, fix installation of help jar

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository simplyhtml.

commit 502465b647ebcc6bb17bf204784229a69d626a33
Author: Felix Natter <fnatter at gmx.net>
Date:   Fri Apr 15 16:08:21 2016 +0200

    make simplyhtml.sh work: rewrite generated classpath, fix installation of help jar
---
 debian/links                  |  2 --
 debian/maven.publishedRules   |  1 +
 debian/maven.rules            |  2 +-
 debian/patches/01_build.patch | 36 ++++++++++++++++++++++++++++++++----
 debian/rules                  |  6 ++++++
 5 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/debian/links b/debian/links
deleted file mode 100644
index 104b556..0000000
--- a/debian/links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java/SimplyHTML-0.16.13.jar usr/share/java/SimplyHTML.jar
-usr/share/java/SimplyHTMLHelp-0.16.13.jar usr/share/java/SimplyHTMLHelp.jar
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 8b13789..5f7d3e4 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1 +1,2 @@
 
+com.lightdev.app.shtm.simplyhtml SimplyHTML jar s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 5f7d3e4..821fbb1 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,2 @@
-
 com.lightdev.app.shtm.simplyhtml SimplyHTML jar s/.*/debian/ * *
+org.dpolivaev.mnemonicsetter mnemonicsetter jar s/.*/debian/ * *
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
index 5da6a5d..e49af7b 100644
--- a/debian/patches/01_build.patch
+++ b/debian/patches/01_build.patch
@@ -39,11 +39,38 @@
 -		}
 -    }
 +    //jcenter()
-+    //	maven { url "http://dl.bintray.com/freeplane/freeplane" } 
++    //	maven { url "http://dl.bintray.com/freeplane/freeplane" }
  }
  
  dependencies {
-@@ -88,9 +73,7 @@
+@@ -65,6 +50,15 @@
+     }  
+ }
+ 
++def rename(String jarName) {
++    return jarName.replace('javahelp.jar', 'jhall.jar')
++}
++
++def removeVersionFrom(String jarName) {
++    final int lastMinus = jarName.lastIndexOf('-')
++    return jarName.substring(0, lastMinus) + '.jar'
++}
++
+ // lib.jar
+ task mainJar(type: Jar, dependsOn: classes) {  
+ 	baseName = 'SimplyHTML'
+@@ -72,8 +66,8 @@
+         exclude project.ext.helpExcludes
+     }
+ 	manifest {
+-	def classPath = (configurations.compile.collect { it.name } +
+-                   helpJar.outputs.files.collect { it.name }).join(' ')
++	def classPath = (configurations.compile.collect { rename(removeVersionFrom(it.name)) } +
++                   helpJar.outputs.files.collect { removeVersionFrom(it.name) }).join(' ')
+     attributes(
+ 		'Implementation-Title': project.name,
+         'Implementation-Version': project.version,
+@@ -88,9 +82,7 @@
      from sourceSets.main.allSource
  }
  
@@ -54,7 +81,7 @@
  publishing {
      publications {
          simplyhtml(MavenPublication) {
-@@ -103,6 +86,24 @@
+@@ -103,6 +95,24 @@
          }
      }
  }
@@ -79,11 +106,12 @@
  
  javadoc {
      enabled = true
-@@ -110,4 +111,8 @@
+@@ -110,4 +120,9 @@
      failOnError = false
  }
  
 +build.dependsOn mainJar
++build.dependsOn helpJar
 +build.dependsOn javadoc
 +build.dependsOn createPom
 +
diff --git a/debian/rules b/debian/rules
index 75a3f43..02acd28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,5 +8,11 @@ override_dh_auto_build:
 	/usr/bin/docbook-to-man debian/simplyhtml.sgml > simplyhtml.1
 	cp debian/simplyhtml.sh simplyhtml
 
+# we need a wildcarded install with renaming for SimplyHTMLHelp.jar,
+# that's why we override this!
+override_dh_auto_install:
+	dh_auto_install
+	cp build/libs/SimplyHTMLHelp-*.jar debian/simplyhtml/usr/share/java/SimplyHTMLHelp.jar
+
 get-orig-source:
 	uscan --repack --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git