[med-svn] [Git][med-team/megan-ce][master] 3 commits: Setting build.patch as first patch
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sat Jan 8 14:37:10 GMT 2022
Pierre Gruet pushed to branch master at Debian Med / megan-ce
Commits:
24b03ce3 by Pierre Gruet at 2022-01-08T15:25:25+01:00
Setting build.patch as first patch
- - - - -
80b892f9 by Pierre Gruet at 2022-01-08T15:33:20+01:00
Merging jloda and classpath patches
- - - - -
04602583 by Pierre Gruet at 2022-01-08T15:36:55+01:00
Setting or refreshing headers of patches
- - - - -
5 changed files:
- debian/patches/build.patch
- debian/patches/fix_class_path.patch
- debian/patches/no_module_info.patch
- debian/patches/series
- − debian/patches/use_debian_packaged_jloda.patch
Changes:
=====================================
debian/patches/build.patch
=====================================
@@ -1,6 +1,11 @@
+Description: fixing build paths and classpath in build.xml for a Debian build
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2022-01-08
+
--- a/antbuild/build.xml
+++ b/antbuild/build.xml
-@@ -18,15 +18,14 @@
+@@ -18,8 +18,8 @@
-->
<project name="MEGAN" default="jar" basedir=".">
@@ -10,26 +15,27 @@
+ <property name="ant.build.javac.target" value="13"/>-->
<property name="jfxDir" value="../../javafx/lib"/>
- <property name="buildSrcDir" value="../antbuild/src"/>
+ <property name="jlodaAntDir" value="../../jloda/antbuild"/>
+@@ -27,26 +27,23 @@
<property name="buildModulesDir" value="../antbuild/modules"/>
<path id="build.classpath">
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="/usr/share/java/" includes="jloda.jar"/>
- <fileset dir="/usr/share/java/" includes="colt.jar"/>
- <fileset dir="/usr/share/java/" includes="commons-math3.jar"/>
-@@ -43,31 +42,29 @@
+ <fileset dir="${jlodaAntDir}" includes="jloda.jar"/>
+ </path>
<path id="build.modulepath">
- <fileset dir="/usr/share/java/" includes="jloda.jar"/>
+ <fileset dir="../../jloda/jars" includes="*.jar"/>
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="${jfxDir}" includes="*.jar"/>
+ <fileset dir="../antbuild" includes="jloda.jar"/>
</path>
<path id="run.modulepath">
- <fileset dir="/usr/share/java/" includes="jloda.jar"/>
+ <fileset dir="../../jloda/jars" includes="*.jar"/>
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="${jfxDir}" includes="*.jar"/>
+ <fileset dir="../antbuild" includes="jloda.jar"/>
<fileset dir="../antbuild" includes="megan.jar"/>
</path>
@@ -39,8 +45,11 @@
<mkdir dir="${buildSrcDir}/megan"/>
<mkdir dir="${buildModulesDir}/megan"/>
</target>
+@@ -55,15 +52,15 @@
+ <ant antfile="${jlodaAntDir}/build.xml" target="jar"/>
+ </target>
-- <target name="copy_sources">
+- <target name="copy_sources" depends="jloda">
+ <target name="copy_sources" depends="init">
<copy todir="${buildSrcDir}/megan">
- <fileset dir="../../megan-ce/src"/>
@@ -55,7 +64,7 @@
includes="**/*.html **/*.fxml **/*.png **/*.gif **/*.css **/*.txt **/*.map **/*.info **/*.tre **/*.lvl"/>
</copy>
</target>
-@@ -79,6 +76,7 @@
+@@ -75,6 +72,7 @@
debug="on"
modulepathref="build.modulepath"
>
=====================================
debian/patches/fix_class_path.patch
=====================================
@@ -1,14 +1,18 @@
Author: Felix Natter <fnatter at gmx.net>
-Last-Update: Sat, 20 May 2017 19:36:42 +0200
-Description: Somehow CLASS_PATH in debian/rules is not used during build
- so patching build.xml here
-
+Last-Update: 2022-01-08
+Description: setting paths of Debian jars used during the build
--- a/antbuild/build.xml
+++ b/antbuild/build.xml
-@@ -28,6 +28,17 @@
+@@ -22,22 +22,29 @@
+ <property name="ant.build.javac.target" value="13"/>-->
+
+ <property name="jfxDir" value="../../javafx/lib"/>
+- <property name="jlodaAntDir" value="../../jloda/antbuild"/>
+ <property name="buildSrcDir" value="../antbuild/src"/>
+ <property name="buildModulesDir" value="../antbuild/modules"/>
+
<path id="build.classpath">
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="/usr/share/java/" includes="jloda.jar"/>
+- <fileset dir="${jlodaAntDir}" includes="jloda.jar"/>
+ <fileset dir="/usr/share/java/" includes="colt.jar"/>
+ <fileset dir="/usr/share/java/" includes="commons-math3.jar"/>
+ <fileset dir="/usr/share/java/" includes="gson.jar"/>
@@ -18,8 +22,38 @@ Description: Somehow CLASS_PATH in debian/rules is not used during build
+ <fileset dir="/usr/share/java/" includes="javafx-fxml.jar"/>
+ <fileset dir="/usr/share/java/" includes="javafx-graphics.jar"/>
+ <fileset dir="/usr/share/java/" includes="javafx-swing.jar"/>
++ <fileset dir="/usr/share/java/" includes="jloda.jar"/>
+ <fileset dir="/usr/share/java/" includes="sis-jhdf5.jar"/>
+ <fileset dir="/usr/share/java/" includes="xerial-sqlite-jdbc.jar"/>
</path>
<path id="build.modulepath">
+- <fileset dir="../../jloda/jars" includes="*.jar"/>
+ <fileset dir="../antbuild" includes="jloda.jar"/>
+ </path>
+
+ <path id="run.modulepath">
+- <fileset dir="../../jloda/jars" includes="*.jar"/>
+- <fileset dir="../antbuild" includes="jloda.jar"/>
+ <fileset dir="../antbuild" includes="megan.jar"/>
+ </path>
+
+@@ -48,10 +55,6 @@
+ <mkdir dir="${buildModulesDir}/megan"/>
+ </target>
+
+- <target name="jloda" depends="init">
+- <ant antfile="${jlodaAntDir}/build.xml" target="jar"/>
+- </target>
+-
+ <target name="copy_sources" depends="init">
+ <copy todir="${buildSrcDir}/megan">
+ <fileset dir="../src"/>
+@@ -98,7 +101,6 @@
+ <delete dir="${buildModulesDir}" includeEmptyDirs="true"/>
+ <delete dir="${buildSrcDir}" includeEmptyDirs="true"/>
+ <delete file="megan.jar"/>
+- <delete file="jloda.jar"/>
+ </target>
+
+ </project>
=====================================
debian/patches/no_module_info.patch
=====================================
@@ -1,3 +1,8 @@
+Description: omitting module-path related stuff for the build
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2022-01-08
+
--- a/src/module-info.java
+++ /dev/null
@@ -1,154 +0,0 @@
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,4 @@
-use_debian_packaged_jloda.patch
+build.patch
fix_class_path.patch
do_not_check_for_update.patch
-build.patch
no_module_info.patch
=====================================
debian/patches/use_debian_packaged_jloda.patch deleted
=====================================
@@ -1,59 +0,0 @@
-Author: Andreas Tille <tille at debian.org>,
- Pierre Gruet <pgt at debian.org>
-Last-Update: Sat, 25 Dec 2021 22:08:42 +0100
-Description: Linking to /usr/share/java/jloda.jar
-
---- a/antbuild/build.xml
-+++ b/antbuild/build.xml
-@@ -22,27 +22,24 @@
- <property name="ant.build.javac.target" value="13"/>
-
- <property name="jfxDir" value="../../javafx/lib"/>
-- <property name="jlodaAntDir" value="../../jloda/antbuild"/>
- <property name="buildSrcDir" value="../antbuild/src"/>
- <property name="buildModulesDir" value="../antbuild/modules"/>
-
- <path id="build.classpath">
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
-- <fileset dir="${jlodaAntDir}" includes="jloda.jar"/>
-+ <fileset dir="/usr/share/java/" includes="jloda.jar"/>
- </path>
-
- <path id="build.modulepath">
-- <fileset dir="../../jloda/jars" includes="*.jar"/>
-+ <fileset dir="/usr/share/java/" includes="jloda.jar"/>
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="${jfxDir}" includes="*.jar"/>
-- <fileset dir="../antbuild" includes="jloda.jar"/>
- </path>
-
- <path id="run.modulepath">
-- <fileset dir="../../jloda/jars" includes="*.jar"/>
-+ <fileset dir="/usr/share/java/" includes="jloda.jar"/>
- <fileset dir="../../megan-ce/jars" includes="*.jar"/>
- <fileset dir="${jfxDir}" includes="*.jar"/>
-- <fileset dir="../antbuild" includes="jloda.jar"/>
- <fileset dir="../antbuild" includes="megan.jar"/>
- </path>
-
-@@ -51,11 +48,7 @@
- <mkdir dir="${buildModulesDir}/megan"/>
- </target>
-
-- <target name="jloda" depends="init">
-- <ant antfile="${jlodaAntDir}/build.xml" target="jar"/>
-- </target>
--
-- <target name="copy_sources" depends="jloda">
-+ <target name="copy_sources">
- <copy todir="${buildSrcDir}/megan">
- <fileset dir="../../megan-ce/src"/>
- </copy>
-@@ -100,7 +93,6 @@
- <delete dir="${buildModulesDir}" includeEmptyDirs="true"/>
- <delete dir="${buildSrcDir}" includeEmptyDirs="true"/>
- <delete file="megan.jar"/>
-- <delete file="jloda.jar"/>
- </target>
-
- </project>
View it on GitLab: https://salsa.debian.org/med-team/megan-ce/-/compare/5a41ad78e4220d9d7ceca399fce1ac95823c8868...04602583e555ec51cd59259c58ad2fc13b942c22
--
View it on GitLab: https://salsa.debian.org/med-team/megan-ce/-/compare/5a41ad78e4220d9d7ceca399fce1ac95823c8868...04602583e555ec51cd59259c58ad2fc13b942c22
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/debian-med-commit/attachments/20220108/79cf18fa/attachment-0001.htm>
More information about the debian-med-commit
mailing list