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

Build intermediate images to intermediate area and stage everything first. #119

Merged
merged 5 commits into from
May 22, 2020

Conversation

rhaleblian
Copy link
Contributor

No description provided.

…irst.

`make` now builds to

build/bin
build/obj
build/share

`install` and `package` use this, omitting obj/.
`distclean` removes build/ entirely.

On-the-fly XPMs are never written to res/.

Master.dsk can be found without installation:

  cd build
  bin/linapple

Need to double-check the semantic convention re DESTDIR.
@rhaleblian rhaleblian changed the title Ignore editor backups. Build intermediate images to intermediate area and stage everything first. May 18, 2020
@rhaleblian
Copy link
Contributor Author

make now builds to

build/bin
build/obj
build/share

install and package use this, omitting obj/.
distclean removes build/ entirely.

On-the-fly XPMs are never written to res/.

Master.dsk can be found without installation:

cd build
bin/linapple

Need to double-check the semantic convention re DESTDIR.

Copy link
Contributor

@0cjs 0cjs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding adding *~ to .gitignore: I'm not particularly fussed one way or the other about this, but generally I suggest that ignore entries for files created by personal tools (such as editors), as opposed to those created by the repo's build system, go in the user's personal gitignore file. The latter is specified with the core.excludesFile configuration setting and defaults to $XDG_CONFIG_HOME/git/ignore or $HOME/.config/git/ignore.

Someone may want to look at *.swp as that may be an editor backup?
@rhaleblian
Copy link
Contributor Author

Quoting commit message:
Someone may want to look at *.swp as that may be an editor backup?

@rhaleblian
Copy link
Contributor Author

Yeah, IIRC *.swp are Vim swap files.

@rhaleblian
Copy link
Contributor Author

rhaleblian commented May 22, 2020

This change (which should go in soon or conflicts will emerge) and the RESOURCE_INIT_DIR PR may collide a little, but they both intend the same result.

@rhaleblian rhaleblian mentioned this pull request May 22, 2020
@rhaleblian
Copy link
Contributor Author

Later, see to #132 .

@maxolasersquad maxolasersquad merged commit 2e787e9 into linappleii:master May 22, 2020
@rhaleblian rhaleblian deleted the buildsystem branch May 25, 2020 15:26
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.

3 participants