diff --git a/.gitignore b/.gitignore index fdcfa59..0e066e1 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,9 @@ .cvsignore .svnignore +/dadams/*.el +/dadams/*/ + /org-mode/ /apel/ /flim/ diff --git a/Makefile b/Makefile index fe3ece8..d794b9a 100755 --- a/Makefile +++ b/Makefile @@ -17,14 +17,12 @@ $(call include-once,$(MK_DIR)/emacsd-defs.mk) GIT_DIRS += emacswiki URL-emacswiki := https://github.com/emacsmirror/emacswiki.org.git -GITCLONE_FLAGS-emacswiki := --no-checkout --config core.sparseCheckout=true --depth 10 + https://github.com/emacsmirror/emacswiki.org/tree/master +GITCLONE_FLAGS-emacswiki := --no-checkout --config core.sparseCheckout=true --depth 10 -b master post_clone_cmd-emacswiki :=\ cd emacswiki &&\ echo '!*' > .git/info/sparse-checkout &&\ - echo '*.el' >> .git/info/sparse-checkout &&\ - echo '!Pastie.el' >> .git/info/sparse-checkout &&\ - echo '!Execute.el' >> .git/info/sparse-checkout &&\ - echo '!Online-Search.el' >> .git/info/sparse-checkout + echo '[a-z]*.el' >> .git/info/sparse-checkout GIT_DIRS += use-package URL-use-package := https://github.com/jwiegley/use-package.git @@ -45,7 +43,7 @@ URL-yaml-mode := https://github.com/yoshiki/yaml-mode.git #URL-wanderlust := http://github.com/wanderlust/wanderlust.git GIT_DIRS += org-mode -URL-org-mode := http://orgmode.org/org-mode.git +URL-org-mode := https://code.orgmode.org/bzg/org-mode.git ifeq (${HOSTENV},w32) post_clone_cmd-emacswiki :=\ cd org-mode &&\ diff --git a/dadams/dadams-sync.py b/dadams/dadams-sync.py new file mode 100755 index 0000000..29158d6 --- /dev/null +++ b/dadams/dadams-sync.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python3 + +import sys +import os.path as path +from shutil import copyfile +from glob import glob + +SCRIPTNAME = path.basename(sys.argv[0]) +SCRIPTDIR = sys.path[0] + +EL_OBSOLETE = [ + 'appt.el', + 'buff-menu+.el', + 'cal-opts.el', + 'calendar+.el', + 'cc-mode+.el', + 'character-fold+.el', + 'def-face-const.el', + 'dired-details+.el', + 'highlight-fns.el', + 'line-num.el', + 'sort+.el', + 'vc+.el', + 'vc-.el', + 'vc-hooks+.el', +] + +EL_INVESTIGATE = [ + 'cmds-menu.el', + 'delsel.el', + 'descr-text+.el', + 'doremi-cmd.el', + 'doremi-frm.el', + 'doremi-mac.el', + 'doremi.el', + 'face-remap+.el', + 'facemenu+.el', + 'filesets+.el', + 'find-func+.el', + 'font-lock-menus.el', + 'fuzzy-match.el', + 'help-macro+.el', + 'highlight-chars.el', + 'hl-defined.el', + 'hl-spotlight.el', + 'imenu+.el', + 'isearch-prop.el', + 'lib-requires.el', + 'mkhtml.el', + 'modeline-win.el', + 'mouse3.el', + 'narrow-indirect.el', + 'oneonone.el', + 'palette.el', + 'pretty-lambdada.el', + 'setup-keys.el', + 'showkey.el', + 'start-opt.el', + 'subr+.el', + 'ucs-cmds.el', + 'unaccent.el', + 'zoom-frm.el', +] + +EL_EXCLUDE = [ + 'autofit-frame.el', + 'delsel.el', + 'echo-bell.el', + 'emacs-init.el', + 'emacsbug+.el', + 'eyedropper.el', + 'modeline-char.el', + 'naked.el', + 'reveal-next.el', + 'setup-cygwin.el', + 'setup.el', + 'start.el', + 'thumb-frm.el', + 'w32browser-dlgopen.el', + 'wimpy-del.el', + 'yes-no.el', +] + +EL_IGNORED = EL_OBSOLETE + EL_INVESTIGATE + EL_EXCLUDE + +EL_FILES = sorted([x for x in glob('*.el') + glob('*/*.el') + if path.basename(x) not in EL_IGNORED], + key=lambda x: path.basename(x)) + +DST_DIRS = [ + path.realpath(path.join(SCRIPTDIR, '../../lisp/icicles')), + path.realpath(path.join(SCRIPTDIR, '../../lisp/bmkp')), + path.realpath(path.join(SCRIPTDIR, '../../lisp/adams')), + #path.realpath(path.join(SCRIPTDIR, '../../lisp')), +] + +def find_destinations(p, dirs): + ret = [] + for dst in dirs: + if path.exists(path.join(dst, path.basename(p))): + ret.append(path.join(dst, path.basename(p))) + if len(ret) == 0: + return None + elif len(ret) == 1: + return ret[0] + return ret + + +def main(): + for el in EL_FILES: + dst = find_destinations(el, DST_DIRS) + if dst: + if isinstance(dst, str): + copyfile(el, dst) + else: + print('[WRN] duplicate destination:', dst) + else: + print('[WRN] could not find', path.basename(el)) + + + +if __name__ == '__main__': + ret = 200 + try: + ret = main() + except Exception as e: + print(e) + finally: + pass + sys.exit(ret) diff --git a/dadams/dadams.lst b/dadams/dadams.lst new file mode 100644 index 0000000..43dccf1 --- /dev/null +++ b/dadams/dadams.lst @@ -0,0 +1,138 @@ +appt +apropos-fn-var +apropos-plus +apu +autofit-frame +autoload-plus +bindings-plus +bookmark-plus +browse-kill-ring-plus +buff-menu-plus +cal-opts +calendar-plus +cc-mode-plus +character-fold-plus +character-fold-plus +cmds-menu +col-highlight +compile- +compile-20 +compile-plus +crosshairs +cursor-chg +cus-edit-plus +def-face-const +delsel +descr-text-plus +diff-plus +diff-plus20 +dired-details-plus +dired-plus +dired-sort-menu-plus +doremi +doremi-cmd +doremi-frm +doremi-mac +echo-bell +ediff-plus +emacs-init +emacsbug-plus +eyedropper +face-remap-plus +facemenu-plus +faces-plus +ffap- +files-plus +filesets-plus +find-dired- +find-dired-plus +find-func-plus +finder-plus +fit-frame +font-lock-menus +font-lock-plus +frame-cmds +frame-fns +fuzzy-match +grep-plus +help-fns-plus +help-macro-plus +help-mode-plus +help-plus +help-plus20 +hexrgb +hide-comnt +highlight +highlight-chars +highlight-fns +hl-defined +hl-line-plus +hl-spotlight +icicles +icomplete-plus +imenu-plus +info-20 +info-plus +isearch-plus +isearch-prop +lacarte +lib-requires +line-num +ls-lisp-20 +ls-lisp-plus +macros-plus +mb-depth-plus +menu-bar-plus +misc-cmds +misc-fns +mkhtml +modeline-char +modeline-posn +modeline-win +mouse-plus +mouse3 +naked +narrow-indirect +novice-plus +oneonone +options-plus +outline-plus +palette +pp-c-l +pp-plus +pretty-lambdada +replace-plus +reveal-next +ring-plus +savehist-20-plus +second-sel +setnu-plus +setup +setup-cygwin +setup-keys +showkey +simple-plus +sort-plus +start +start-opt +strings +subr-21 +subr-plus +synonyms +thing-cmds +thingatpt-plus +thump-frm +timer-plus +tool-bar-plus +ucs-cmds +unaccent +vc- +vc-hooks-plus +vc-plus +w32-browser +w32browser-dlgopen +wid-edit-plus +wimpy-del +window-plus +yes-no +zoom-frm \ No newline at end of file