Author: yamaken
Date: Wed Feb 2 11:36:28 2005
New Revision: 484
Modified:
trunk/scm/Makefile.am
trunk/scm/manage-modules.scm
trunk/scm/plugin.scm
Log:
* This commit renames the file 'stub-ims.scm' with 'loader.scm'. Sorry
for frequent renaming of the file...
* scm/plugin.scm
- (load-enabled-modules): Replace "stub-ims.scm" with "loader.scm"
* scm/manage-modules.scm
- (generate-stub-ims-scm): Rename to generate-loader-scm
- (generate-loader-scm): Renamed from generate-stub-ims-scm
* scm/Makefile.am
- Replace stub-ims.scm with loader.scm
Modified: trunk/scm/Makefile.am
==============================================================================
--- trunk/scm/Makefile.am (original)
+++ trunk/scm/Makefile.am Wed Feb 2 11:36:28 2005
@@ -1,6 +1,6 @@
EXTRA_DIST = $(SCM_FILES)
scmdir = $(datadir)/uim
-scm_DATA = $(SCM_FILES) installed-modules.scm stub-ims.scm
+scm_DATA = $(SCM_FILES) installed-modules.scm loader.scm
SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm init.scm \
default.scm \
util.scm key.scm ustr.scm action.scm load-action.scm i18n.scm \
@@ -69,10 +69,10 @@
$(top_builddir)/uim/uim-sh -B >>$@
# TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
-stub-ims.scm: installed-modules.scm
+loader.scm: installed-modules.scm
$(MAKE) -C $(top_builddir)/uim uim-sh && \
echo -n >$@ && \
echo "(require \"manage-modules.scm\") \
- (generate-stub-ims-scm)" \
+ (generate-loader-scm)" \
| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=${PWD} \
$(top_builddir)/uim/uim-sh -B >>$@
Modified: trunk/scm/manage-modules.scm
==============================================================================
--- trunk/scm/manage-modules.scm (original)
+++ trunk/scm/manage-modules.scm Wed Feb 2 11:36:28 2005
@@ -51,7 +51,7 @@
"\n"))))
;; TODO: write test
-(define generate-stub-ims-scm
+(define generate-loader-scm
(lambda ()
(puts
(string-append
Modified: trunk/scm/plugin.scm
==============================================================================
--- trunk/scm/plugin.scm (original)
+++ trunk/scm/plugin.scm Wed Feb 2 11:36:28 2005
@@ -136,7 +136,7 @@
(define load-enabled-modules
(lambda ()
(let* ((user-module-dir (string-append (getenv "HOME") "/.uim.d/plugin/"))
- (file "stub-ims.scm") ;; should be renamed
+ (file "loader.scm")
(user-file (string-append user-module-dir file)))
(and (try-load file)
(or (try-load user-file)
