Gilles Filippini pushed to branch master at Debian Java Maintainers / jython
Commits: f04561e2 by Gilles Filippini at 2020-03-19T20:53:47+01:00 Embed the modules into the jar - - - - - 6 changed files: - debian/changelog - debian/control - debian/jython.install - debian/jython_launcher - debian/pom.xml - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jython (2.7.2~rc1+repack1-2) unstable; urgency=medium + + * Embed the modules into the jar + + -- Gilles Filippini <[email protected]> Thu, 19 Mar 2020 20:53:33 +0100 + jython (2.7.2~rc1+repack1-1) unstable; urgency=medium * New upstream release ===================================== debian/control ===================================== @@ -9,6 +9,7 @@ Build-Depends-Indep: default-jdk, junit4, antlr3.2, bnd (>= 2.1.0), + zip, libasm-java, libguava-java, libjffi-java (>= 1.2.7~), ===================================== debian/jython.install ===================================== @@ -1,5 +1,4 @@ #!/usr/bin/dh-exec -dist/Lib /usr/share/jython registry => /etc/jython/jython.conf debian/jython_launcher => /usr/share/jython/bin/jython ===================================== debian/jython_launcher ===================================== @@ -12,11 +12,9 @@ if [ -n "$CALLED_FROM_JYTHONC" ]; then fi jython_home="$(dirname "$(dirname "$(readlink -f "$0")")")" -python_path="$jython_home"/Lib exec java -jar /usr/share/java/jython.jar \ -Dpython.home="$jython_home" \ - -Dpython.path="$python_path" \ -Dpython.executable="$0" \ -Dpython.console=org.python.util.JLineConsole \ $jython_compiler \ ===================================== debian/pom.xml ===================================== @@ -8,7 +8,7 @@ <artifactId>jython</artifactId> <packaging>jar</packaging> <name>Jython</name> - <version>2.7.1</version> + <version>2.7.2~rc1</version> <url>http://www.jython.org/</url> <description> Jython is an implementation of the high-level, dynamic, object-oriented ===================================== debian/rules ===================================== @@ -86,6 +86,9 @@ override_dh_auto_build: # Do not install the tests rm -rf dist/Lib/test + # Embed the modules into the jar + cd dist && zip -r jython.jar Lib/ + override_dh_auto_clean: dh_auto_clean rm -rf extlibs @@ -97,17 +100,5 @@ override_jh_installlibs: override_jh_depends: jh_depends -Xlibmariadb-java -Xlibpostgresql-jdbc-java -override_dh_python2: - # Make all modules with a shebang line executable - for library in `find debian/jython/usr/share/jython/Lib -name "*.py"` ; do \ - if head -1 $$library | grep --quiet "^#\!" ; then \ - chmod +x $$library; \ - fi; \ - done - - dh_python2 - rm debian/jython.postinst.debhelper - rm debian/jython.prerm.debhelper - override_dh_installchangelogs: dh_installchangelogs -- NEWS View it on GitLab: https://salsa.debian.org/java-team/jython/-/commit/f04561e254ab2bae732987b6139d6b22d01c231a -- View it on GitLab: https://salsa.debian.org/java-team/jython/-/commit/f04561e254ab2bae732987b6139d6b22d01c231a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
