Re: Merging leim

[Pavel Janík]

   From: Jason Rumney <address@hidden>
   Date: 20 Dec 2001 20:05:37 +0000

   > Why? The w32 makefiles (at least) already support leim. As long as
   > the location of the leim directory does not change, there should be
   > no need for makefile changes. We are only talking about a change to
   > "make dist", aren't we, or is the intention to move leim under the
   > lisp directory?

I have already changed make-dist to produce only one tar.gz file
(emacs-${version}.tar.gz with leim inside), but we should also change
INSTALL, NEWS and remove noleim-Makefile.in etc. So this is not yet
finished.

cd ~/
diff -u /home/pavel/.Emacs/Work/emacs/make-dist 
/home/pavel/.Emacs/Work/emacs.unifiedleim/make-dist
--- /home/pavel/.Emacs/Work/emacs/make-dist     Sun Dec  9 12:08:11 2001
+++ /home/pavel/.Emacs/Work/emacs.unifiedleim/make-dist Fri Dec 21 00:03:19 2001
@@ -309,8 +309,8 @@
 
 echo "Creating subdirectories"
 for subdir in lisp site-lisp lispref lispintro \
-             leim real-leim real-leim/CXTERM-DIC real-leim/MISC-DIC \
-             real-leim/SKK-DIC real-leim/ja-dic real-leim/quail \
+             leim leim/CXTERM-DIC leim/MISC-DIC \
+             leim/SKK-DIC leim/ja-dic leim/quail \
              src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
              nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
              etc etc/e lock info man msdos vms mac mac/inc mac/inc/sys \
@@ -320,9 +320,6 @@
   mkdir ${tempdir}/${subdir}
 done
 
-echo "Initializing \`leim' subdirectory"
-cp noleim-Makefile.in ${tempdir}/leim/Makefile.in
-
 echo "Making links to \`lisp' and its subdirectories"
 ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or 
default.el.
 (cd lisp
@@ -388,29 +385,23 @@
 echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
 ### Don't distribute TAGS, or =*.el files.
 (cd leim
- ln makefile.nt makefile.w32-in ../${tempdir}/real-leim
- ln ChangeLog README ../${tempdir}/real-leim
+ ln makefile.nt makefile.w32-in ../${tempdir}/leim
+ ln ChangeLog README ../${tempdir}/leim
 
- ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC
- ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC
- ln MISC-DIC/*.* ../${tempdir}/real-leim/MISC-DIC
- ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/real-leim/ja-dic
- ln Makefile.in ../${tempdir}/real-leim/Makefile.in
- ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/real-leim/quail
- rm -f ../${tempdir}/real-leim/quail/quick-b5.*
- rm -f ../${tempdir}/real-leim/quail/quick-cns.*
- rm -f ../${tempdir}/real-leim/quail/tsang-b5.*
- rm -f ../${tempdir}/real-leim/quail/tsang-cns.*
+ ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
+ ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
+ ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
+ ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic
+ ln Makefile.in ../${tempdir}/leim/Makefile.in
+ ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail
+ rm -f ../${tempdir}/leim/quail/quick-b5.*
+ rm -f ../${tempdir}/leim/quail/quick-cns.*
+ rm -f ../${tempdir}/leim/quail/tsang-b5.*
+ rm -f ../${tempdir}/leim/quail/tsang-cns.*
 
- cd ../${tempdir}/real-leim
+ cd ../${tempdir}/leim
  rm -f TAGS =* */=*)
 
-### Move the real-leim directory outside of Emacs proper.
-(cd ${tempparent}
- mkdir ${emacsname}-leim
- mkdir ${emacsname}-leim/${emacsname}
- mv ${emacsname}/real-leim ${emacsname}-leim/${emacsname}/leim)
-
 echo "Making links to \`src'"
 ### Don't distribute =*.[ch] files, or the configured versions of
 ### config.in, paths.in, or Makefile.in, or TAGS.
@@ -683,9 +674,6 @@
   (cd ${tempparent} ; tar cvf - ${emacsname} ) \
     | ${default_gzip} \
     > ${emacsname}.tar${gzip_extension}
-  (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \
-    | ${default_gzip} \
-    > leim-${version}${new_extension}.tar${gzip_extension}
 fi
 
 if [ "${clean_up}" = yes ]; then

Diff finished at Fri Dec 21 07:17:50


-- 
Pavel Janík

<sarcasm>Be careful, you might even end up telling us enough that we might
actually fix it.</sarcasm>
                  -- Stefan Monnier in emacs-pretesters to vague report