[Pkg-jed-commit] r34 - in trunk/packages/jed-extra: . debian
Rafael Laboissiere
rafael@costa.debian.org
Sun, 24 Apr 2005 19:49:01 +0000
Author: rafael
Date: 2005-04-24 19:49:01 +0000 (Sun, 24 Apr 2005)
New Revision: 34
Added:
trunk/packages/jed-extra/debian/compile
trunk/packages/jed-extra/debian/postinst
trunk/packages/jed-extra/debian/prerm
Modified:
trunk/packages/jed-extra/compile-files.sl.in
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/control
trunk/packages/jed-extra/debian/rules
Log:
Implemented intall-time byte-compilation of *.sl files, as discussed in
pkg-jed-devel
Modified: trunk/packages/jed-extra/compile-files.sl.in
===================================================================
--- trunk/packages/jed-extra/compile-files.sl.in 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/compile-files.sl.in 2005-04-24 19:49:01 UTC (rev 34)
@@ -5,11 +5,29 @@
variable files = [
<:
$in = <>;
- print join (",", map {"\"./$_\""} split (/\s+/, $in));
+ print join (",", map {
+ '"'
+ . (($_ =~ m{colors/}) ? "colors/" : "")
+ . (reverse split ("/", $_))[0]
+ . '"'
+ } split (/\s+/, $in));
:>
];
-foreach (files) {
- variable f = ();
- byte_compile_file (f, 0);
-}
+variable command = __argv [5];
+variable f;
+
+if (command == "install") {
+ message ("Byte compiling jed-extra files");
+ foreach (files) {
+ f = ();
+ byte_compile_file (expand_jedlib_file (f), 0);
+ }
+} else if (command == "remove") {
+ message ("Removing byte-compiled jed-extra files");
+ foreach (files) {
+ f = ();
+ run_shell_cmd ("rm -f " + expand_jedlib_file (f + "c"));
+ }
+} else
+ message ("Unknown command " + command);
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/changelog 2005-04-24 19:49:01 UTC (rev 34)
@@ -1,3 +1,24 @@
+jed-extra (1.0-2) experimental; urgency=low
+
+ NOT YET RELEASED!
+
+ +++ Changes by Rafael Laboisssiere
+
+ * The *.slc files are now generated at install-time
+ * debian/compile: Script that gets installed as
+ /usr/share/jed/compile/jed-extra
+ * debian/postinst, debian/prerm: Call /usr/share/jed/compile/jed-extra
+ with the appropriate argument
+ * compile-files.sl.in: Accepts either "install" or "remove" as arguments
+ and,respectively, byte-compile the *.sl files or remove the *.slc files.
+ * debian/control: Dropped the -Build-Depends-Indep on jed
+
+ +++ Changes by Jörg Sommer
+
+ * patches/mupad-fix.patch: Fixes mupad.sl to build.
+
+ --
+
jed-extra (1.0-1) experimental; urgency=low
+++ Changes by Rafael Laboisssiere
Added: trunk/packages/jed-extra/debian/compile
===================================================================
--- trunk/packages/jed-extra/debian/compile 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/compile 2005-04-24 19:49:01 UTC (rev 34)
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+JED=/usr/bin/jed
+COMPILE=jed-extra-compile-files.sl
+
+case "$1" in
+ install|remove)
+ $JED -batch -n -l $COMPILE $1
+ ;;
+ *)
+ echo "unknown argument --> \"$1"\" >&2
+ exit 0
+ ;;
+esac
Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/control 2005-04-24 19:49:01 UTC (rev 34)
@@ -2,8 +2,7 @@
Section: editors
Priority: optional
Maintainer: Debian JED Group <pkg-jed-devel@lists.alioth.debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), eperl, jed
-Build-Conflicts-Indep: jed-extra
+Build-Depends-Indep: debhelper (>> 4.0.0), eperl
Standards-Version: 3.6.1
Package: jed-extra
Added: trunk/packages/jed-extra/debian/postinst
===================================================================
--- trunk/packages/jed-extra/debian/postinst 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/postinst 2005-04-24 19:49:01 UTC (rev 34)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+case "$1" in
+ configure)
+ /usr/share/jed/compile/jed-extra install
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "unknown argument --> \"$1"\" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
Added: trunk/packages/jed-extra/debian/prerm
===================================================================
--- trunk/packages/jed-extra/debian/prerm 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/prerm 2005-04-24 19:49:01 UTC (rev 34)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+/usr/share/jed/compile/jed-extra remove
+
+#DEBHELPER#
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-04-24 19:39:12 UTC (rev 33)
+++ trunk/packages/jed-extra/debian/rules 2005-04-24 19:49:01 UTC (rev 34)
@@ -10,6 +10,7 @@
jed_root = /usr/share/jed
debroot = $(shell pwd)/debian/jed-extra
site_lib_dir = $(jed_root)/site-lib
+compile_dir = $(jed_root)/compile
jed_init_dir = /etc/jed-init.d
a2ps_ssh_dir = /usr/share/a2ps/sheets/
@@ -48,14 +49,10 @@
compile-files.sl: lib/jed-extra.sl compile-files.sl.in
find $(srcdirs) -name \*.sl | grep -v apsconf \
- | eperl compile-files.sl.in -o compile-files.sl
+ | eperl compile-files.sl.in -o $@
-byte-compile-stamp: compile-files.sl
- jed -batch -n -l ./compile-files.sl
- touch byte-compile-stamp
-
build: build-stamp
-build-stamp: byte-compile-stamp
+build-stamp: compile-files.sl
dh_testdir
for ext in html txt ; do \
mkdir $$ext ; \
@@ -67,7 +64,8 @@
dh_testdir
dh_testroot
- rm -rf $(srcdirs) compile-files.sl *-stamp html txt README.tar-mode
+ rm -rf $(srcdirs) compile compile-files.sl *-stamp html \
+ txt README.tar-mode
dh_clean
@@ -76,13 +74,17 @@
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs $(site_lib_dir) $(jed_init_dir) $(a2ps_ssh_dir)
+ dh_installdirs $(site_lib_dir) $(jed_init_dir) $(a2ps_ssh_dir) \
+ $(compile_dir)
install --mode=644 \
`find $(srcdirs) -name \*.sl -o -name \*.slc \
-o -name \*.hlp | grep -v colors/ \
| grep -v apsconf/ ` \
$(debroot)$(site_lib_dir)
+ install --mode=644 compile-files.sl \
+ $(debroot)$(site_lib_dir)/jed-extra-compile-files.sl
+
install --mode=644 mode/a2ps/*.ssh $(debroot)$(a2ps_ssh_dir)
cp -a mode/apsmode/apsconf $(debroot)$(site_lib_dir)
cp -a mode/colors $(debroot)$(site_lib_dir)/colors
@@ -93,6 +95,8 @@
install --mode=644 mode/home-lib/home-lib.sl \
$(debroot)$(jed_init_dir)/05home-lib.sl
+ install --mode=755 debian/compile $(compile_dir)/jed-extra
+
touch install-stamp
binary-indep: install