hiro/melpazoid
1
0
Fork 0
mirror of https://github.com/vale981/melpazoid synced 2025-03-05 09:21:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use pkg/ instead of _elisp/ to store cloned files

Browse source
This commit is contained in:
riscy 2020-05-03 11:43:20 -07:00
parent df028ca90a
commit 59adc1d4cb
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
_requirements.el _requirements.el
_elisp pkg
*.elc *.elc
.mypy_cache .mypy_cache

4
docker/Dockerfile
View file

@ -35,7 +35,7 @@ RUN apt-get update && apt-get install software-properties-common \
&& rm -rf /tmp/* /var/lib/apt/lists/* /root/.cache/* && rm -rf /tmp/* /var/lib/apt/lists/* /root/.cache/*
ENV WORKSPACE "/workspace" ENV WORKSPACE "/workspace"
ENV ELISP_PATH "${WORKSPACE}/_elisp" ENV ELISP_PATH "${WORKSPACE}/pkg"
RUN useradd emacser -d $WORKSPACE RUN useradd emacser -d $WORKSPACE
RUN mkdir -p $ELISP_PATH && chown -R emacser $WORKSPACE RUN mkdir -p $ELISP_PATH && chown -R emacser $WORKSPACE
@ -48,7 +48,7 @@ COPY _requirements.el $WORKSPACE
RUN emacs --script $WORKSPACE/_requirements.el RUN emacs --script $WORKSPACE/_requirements.el
COPY --chown=emacser:emacser docker/.emacs $WORKSPACE COPY --chown=emacser:emacser docker/.emacs $WORKSPACE
COPY --chown=emacser:emacser _elisp $ELISP_PATH COPY --chown=emacser:emacser pkg $ELISP_PATH
COPY --chown=emacser:emacser melpazoid/melpazoid.el $ELISP_PATH COPY --chown=emacser:emacser melpazoid/melpazoid.el $ELISP_PATH
ARG PACKAGE_MAIN ARG PACKAGE_MAIN

13
melpazoid/melpazoid.py
View file

@ -16,6 +16,7 @@ from typing import Iterator, List, TextIO, Tuple
DEBUG = False # eagerly load installed packages, etc. DEBUG = False # eagerly load installed packages, etc.
_RETURN_CODE = 0 # eventual return code when run as script _RETURN_CODE = 0 # eventual return code when run as script
_PKG_SUBDIR = 'pkg' # name of directory for package's files
# define the colors of the report (or none), per https://no-color.org # define the colors of the report (or none), per https://no-color.org
# https://misc.flogisoft.com/bash/tip_colors_and_formatting # https://misc.flogisoft.com/bash/tip_colors_and_formatting
@ -56,12 +57,12 @@ def run_checks(
_fail(f"Recipe '{recipe}' appears to be invalid") _fail(f"Recipe '{recipe}' appears to be invalid")
return return
files = _files_in_recipe(recipe, elisp_dir) files = _files_in_recipe(recipe, elisp_dir)
subprocess.check_output(['rm', '-rf', '_elisp']) subprocess.check_output(['rm', '-rf', _PKG_SUBDIR])
os.makedirs('_elisp') os.makedirs(_PKG_SUBDIR)
for ii, file in enumerate(files): for ii, file in enumerate(files):
target = os.path.basename(file) if file.endswith('.el') else file target = os.path.basename(file) if file.endswith('.el') else file
target = os.path.join('_elisp', target) target = os.path.join(_PKG_SUBDIR, target)
os.makedirs(os.path.join('_elisp', os.path.dirname(file)), exist_ok=True) os.makedirs(os.path.join(_PKG_SUBDIR, os.path.dirname(file)), exist_ok=True)
subprocess.check_output(['mv', os.path.join(elisp_dir, file), target]) subprocess.check_output(['mv', os.path.join(elisp_dir, file), target])
files[ii] = target files[ii] = target
_write_requirements(files, recipe) _write_requirements(files, recipe)
@ -182,8 +183,8 @@ def package_name(recipe: str) -> str:
def _main_file(files: List[str], recipe: str) -> str: def _main_file(files: List[str], recipe: str) -> str:
"""Figure out the 'main' file of the recipe, per MELPA convention. """Figure out the 'main' file of the recipe, per MELPA convention.
>>> _main_file(['_elisp/a.el', '_elisp/b.el'], '(a :files ...)') >>> _main_file(['pkg/a.el', 'pkg/b.el'], '(a :files ...)')
'_elisp/a.el' 'pkg/a.el'
>>> _main_file(['a.el', 'b.el'], '(b :files ...)') >>> _main_file(['a.el', 'b.el'], '(b :files ...)')
'b.el' 'b.el'
>>> _main_file(['a.el', 'a-pkg.el'], '(a :files ...)') >>> _main_file(['a.el', 'a-pkg.el'], '(a :files ...)')