Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Fix make file #7

Merged
merged 5 commits into from
Mar 13, 2014
Merged

Fix make file #7

merged 5 commits into from
Mar 13, 2014

Conversation

rimian
Copy link

@rimian rimian commented Mar 4, 2014

Use gh-pages branch as master does not exist
Add VERSION to use src files that exist
Add a PORT var in case it needs to run on another port

This seems to run OK now.

rimian added 2 commits March 4, 2014 11:38
Use gh-pages branch as master does not exist
Add VERSION to use src files that exist
Add a PORT var in case it needs to run on another port
@rimian rimian mentioned this pull request Mar 4, 2014
@JamesMGreene
Copy link
Member

This doesn't look equivalent to me but I never really used the Makefile either. @jonrohan?

@jonrohan
Copy link
Contributor

I hadn't had a chance to update this in a while. So glad you took the time to fix for me ✨

@rm -f javascript/ZeroClipboard*
@mv ZeroClipboard.* javascripts/
@cp javascripts/zc/ZeroClipboard_$(VERSION).js javascripts/ZeroClipboard.js
@cp javascripts/zc/ZeroClipboard_$(VERSION).swf javascripts/ZeroClipboard.swf
Copy link
Contributor

Choose a reason for hiding this comment

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

oh, this might be some confusion. what the original intent was, when the gh-pages and the code were on the same repo, I would checkout master to get the newly compiled swf and js.

So this now, instead of checking out the branch on the current repo, would need to get the new files @ a tag version or master from the github.com/zeroclipboard/zeroclipboard repo.

@rimian
Copy link
Author

rimian commented Mar 13, 2014

@jonrohan thanks for letting me know what the functionality was. It now downloads a tag with curl. It won't download master as the URL won't match but this works for now. :)

@jonrohan
Copy link
Contributor

awesome 🤘

jonrohan added a commit that referenced this pull request Mar 13, 2014
@jonrohan jonrohan merged commit e546efc into zeroclipboard:gh-pages Mar 13, 2014
@JamesMGreene
Copy link
Member

This still isn't quite right.

Makefile:
It should move the files to javascripts/zc/ZeroClipboard_$(VERSION).{js|swf}.

.gitignore:
It should exclude ZeroClipboard.{js|swf} at the root (where cURL downloads them).

@jonrohan
Copy link
Contributor

ooops, I've got an itchy merging finger.

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

Successfully merging this pull request may close these issues.

3 participants