Commit f07f8824 authored by Yuanle Song's avatar Yuanle Song
Browse files

v2.0.0 renamed package file to zero-input.el 

since this is a backward incompatible change, I set version to v2.0.0.
all symbols and functions is now prefixed with zero-input.

This change is suggested by melpa reviewer.
parent 0944ff0c

Makefile

+8 −5
Original line number Diff line number Diff line 
VERSION := $(shell grep 'setq zero-version' zero-framework.el | cut -d'"' -f2)

VERSION := $(shell grep 'setq zero-input-version' zero-input-framework.el | cut -d'"' -f2)



default: dist

#===============

# multiple file

#===============

check:

	emacs -Q --batch -l zero-reload-all.el -f zero-rebuild -l zero-table.el -l zero-table-test.el -f ert-run-tests-batch

	emacs -Q --batch -l zero-input-reload-all.el -f zero-input-rebuild -l zero-input-table.el -l zero-input-table-test.el -f ert-run-tests-batch

zip:

	git archive -o zero-el-$(VERSION).zip --prefix=zero/ HEAD

	git archive -o zero-input-el-$(VERSION).zip --prefix=zero-input/ HEAD

#==========================

# single file distribution

#==========================
@@ -16,9 +16,12 @@ build: 
	if [ ! -x ~/.local/bin/pytest ]; then python3 -m pip install --user pytest; fi

	~/.local/bin/pytest build.py

	./build.py

	sed -i "s/PKG_VERSION/$(VERSION)/g" zero.el

	sed -i "s/PKG_VERSION/$(VERSION)/g" zero-input.el

dist-check: build

	emacs -Q --batch -l ~/.emacs.d/elpa/s-1.11.0/s.el -l zero.el -l zero-panel-test.el -l zero-pinyin-service-test.el -l zero-framework-test.el -l zero-pinyin-test.el -l zero-table.el -l zero-table-test.el -f ert-run-tests-batch

	@echo "testing byte-compile is clean..."

	emacs -Q --batch -l ~/.emacs.d/elpa/s-1.11.0/s.el --eval='(byte-compile-file "zero-input.el")'

	@echo "running unit tests..."

	emacs -Q --batch -l ~/.emacs.d/elpa/s-1.11.0/s.el -l zero-input.el -l zero-input-panel-test.el -l zero-input-pinyin-service-test.el -l zero-input-framework-test.el -l zero-input-pinyin-test.el -l zero-input-table.el -l zero-input-table-test.el -f ert-run-tests-batch

#====================

# other make targets

#====================

NOTICE

+3 −2
Original line number Diff line number Diff line 
zero-el

Copyright (C) 2019 Yuanle Song <sylecn@gmail.com>



zero--ibus-compute-pixel-position function in zero.el is copied from ibus.el.

This function is under GPLv3 license.  Copyright (C) 2010-2012 S. Irie
 
zero-input--ibus-compute-pixel-position function in zero-input.el is copied

from ibus.el.  This function is under GPLv3 license.  Copyright (C) 2010-2012

S. Irie

README

+13 −13
Original line number Diff line number Diff line 
* COMMENT -*- mode: org -*-

#+Date: 2019-09-01

Time-stamp: <2019-10-16>

Time-stamp: <2019-10-28>



* zero-el



zero-el provides zero-pinyin, an Emacs pinyin input method for Chinese and

zero-framework, which is an emacs Chinese input method framework.

zero-el provides zero-input-pinyin, an Emacs pinyin input method for Chinese

and zero-input-framework, which is an emacs Chinese input method framework.



* File list

- zero.el

- zero-input.el



  It's a generated file for one-file package distribution. Not used for

  development.



- zero-framework.el

- zero-input-framework.el



  zero framework source code. This provides the framework and user interface

  for zero-el.



- zero-panel.el

- zero-input-panel.el



  dbus client to zero-panel service.



- zero-pinyin-service.el

- zero-input-pinyin-service.el



  dbus client to zero-pinyin-service.



- zero-pinyin.el

- zero-input-pinyin.el



  Pinyin input method implemented using zero.el



- zero-quickdial.el

- zero-input-quickdial.el



  proof of concept of how to create an input method in emacs using minor mode.



- zero-reload-all.el

- zero-input-reload-all.el



  zero-el development utility.



- zero-table.el

- zero-input-table.el



  serves as an example of how to use zero framework to create new input

  methods.
@@ -49,5 +49,5 @@ https://blog.emacsos.com/zero-el.html 
* License

zero-el is under Apache License 2.0



zero--ibus-compute-pixel-position function in zero-framework.el is under

GPLv3. see NOTICE file.
 
zero-input--ibus-compute-pixel-position function in zero-input-framework.el is

under GPLv3. see NOTICE file.

build.py

+12 −11
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# coding=utf-8



"""

build zero.el from zero.el.in and other el files

build zero-input.el from zero-input.el.in and other el files

"""



import logging
@@ -18,9 +18,10 @@ def placeholder_for_file(fn): 




def test_placeholder_for_file():

    assert placeholder_for_file("zero-panel.el") == "INCLUDE_ZERO_PANEL_EL"

    assert placeholder_for_file("zero-pinyin-service.el") == (

        "INCLUDE_ZERO_PINYIN_SERVICE_EL")

    assert placeholder_for_file("zero-input-panel.el") == (

        "INCLUDE_ZERO_INPUT_PANEL_EL")

    assert placeholder_for_file("zero-input-pinyin-service.el") == (

        "INCLUDE_ZERO_INPUT_PINYIN_SERVICE_EL")





def get_el_file_body(fn):
@@ -57,16 +58,16 @@ def main(): 
    logging.basicConfig(

        format='%(asctime)s [%(module)s] %(levelname)-8s %(message)s',

        level=logging.INFO)

    with open("zero.el.in") as tpl:

    with open("zero-input.el.in") as tpl:

        content = tpl.read()

    expanded_content = expand_placeholder_for_files(content, [

        "zero-panel.el",

        "zero-framework.el",

        "zero-table.el",

        "zero-pinyin-service.el",

        "zero-pinyin.el",

        "zero-input-panel.el",

        "zero-input-framework.el",

        "zero-input-table.el",

        "zero-input-pinyin-service.el",

        "zero-input-pinyin.el",

        ])

    with open('zero.el', 'w') as out:

    with open('zero-input.el', 'w') as out:

        out.write(expanded_content)

git-hooks/pre-commit

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
set -e

if git branch |grep '^\* master'; then

	make dist-check

	git add zero.el

	git add zero-input.el

fi