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

Fix source packaging #1296

Merged
merged 2 commits into from
Jun 7, 2019
Merged

Conversation

tdesveauxPKFX
Copy link
Contributor

No description provided.

@starkos
Copy link
Member

starkos commented May 30, 2019

I don't think this will do it, you need to run premake embed after you check out the sources to generate scripts.c. Unless I'm missing something?

You also probably didn't intend to delete .gitattributes, I assume…

@starkos
Copy link
Member

starkos commented Jun 3, 2019

I stand corrected, source package is working fine now. But .gitattributes needs to be restored.

@tdesveauxPKFX
Copy link
Contributor Author

Sorry about the lack of context.

I don't think this will do it, you need to run premake embed after you check out the sources to generate scripts.c. Unless I'm missing something?

embed was already called before the package creation here:

--
-- Make absolutely sure the embedded scripts have been updated
--
print("Updating embedded scripts...")
local z = execQuiet("%s embed %s", premakeBin, iif(kind == "source", "", "--bytecode"))
if not z then
error("failed to update the embedded scripts", 0)
end

When I changed this script before, I removed the dependency on zip and used git archive instead but files needs to be tracked to be included in the package and I forgot to add scripts.c.

You also probably didn't intend to delete .gitattributes, I assume…

It was intended. I added gitattributes to ignore some file on git archive.
I changed the way to ignore files in this PR as github also use git archive when you choose to download the repo instead of cloning it.
Also, it makes more sense to centralize the information about which file is ignored/added to the package.

As .gitattributes would be empty after this, I simply deleted it.

Copy link
Member

@starkos starkos left a comment

Choose a reason for hiding this comment

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

Thanks for the clarification. I thought we had added a .gitattributes ages ago…I'm certainly losing track of things. Approving…

@samsinsane samsinsane merged commit b173d08 into premake:master Jun 7, 2019
@tdesveauxPKFX tdesveauxPKFX deleted the package-source-fix branch December 22, 2019 16:22
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.

4 participants