Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New unified directory structure #70

Merged
merged 2 commits into from Jun 3, 2022
Merged

Conversation

vrza
Copy link
Contributor

@vrza vrza commented Jun 3, 2022

This is to simplify supporting both developer/portable installation and system-wide installation with default config. New structure is:

# binary
${PREFIX}/bin/123
# runtime files
${PREFIX}/share/lotus/123.v10
# keymaps
${PREFIX}/share/lotus/keymaps
# default config
${PREFIX}/share/lotus/etc/l123set.cf

Where ${PREFIX} can be developer's project directory 123elf, or /usr, or /usr/local, or /opt/lotus etc.

Replaces the following PRs:

Will simplify implementation of:

Also should fix the issue with slow file seek onWSL2.

vrza added 2 commits June 3, 2022 18:44
This is to simplify supporting both developer/portable installation
and system-wide installation with default config
@taviso
Copy link
Owner

taviso commented Jun 3, 2022

Thanks for the rebase, merged with these changes:

  • I don't want to drop the .sh extension, I find it a useful clue what's in there!
  • I added a convenience symlink to the main binary.
  • I moved the keymaps, so extract doesn't have to touch them anymore.
  • Added the new directories to gitignore.

It seems to work okay, looks much neater for eventual packaging!

@vrza
Copy link
Contributor Author

vrza commented Jun 3, 2022

@taviso Thanks! A couple of remarks:

  • no need to remove root/, was replaced by share/
  • just like with binutils.sh and gzip.sh we can call ./extract.sh clean from the distclean target, it will remove stuff created by that script

Now that the foundation is in place I'll look into creating an install target and then we're ready for packaging!

taviso added a commit that referenced this pull request Jun 3, 2022
@taviso
Copy link
Owner

taviso commented Jun 3, 2022

Good points, fixed!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants