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

Refactor build script #76

Merged
merged 12 commits into from
Oct 22, 2016
Merged

Refactor build script #76

merged 12 commits into from
Oct 22, 2016

Conversation

tomasko126
Copy link
Member

@kpeckett I've made some changes to our readme.md file, refactored releases script and also made a new building.md file, intended for devs.

Please take a look and review the wording :)

Thanks!

The main readme.md has also been changed :)

Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
@tomasko126 tomasko126 added the enhancement This is an enhancement to the extension label Sep 8, 2016
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
@itskdog
Copy link
Member

itskdog commented Sep 15, 2016

Why is this in the codebase and not a wiki article? Is BUILDING.md a GH-recognised file like README.md?

@itskdog itskdog assigned tomasko126 and unassigned itskdog Sep 15, 2016
@tomasko126
Copy link
Member Author

tomasko126 commented Sep 15, 2016

@kpeckett Good point, it would be better to make a wiki article instead of bundling this with the extension code. BUILDING.md is not a recognized file by GH.

@tomasko126
Copy link
Member Author

@kpeckett I have created a wiki page -> https://github.com/CatBlock/catblock/wiki/Building-the-extension. I will remove Building.md from this PR.

Signed-off-by: Tomáš Taro <tomas@getadblock.com>
@tomasko126 tomasko126 changed the title Introduce Building.md Refactor build script Sep 16, 2016
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>

If you want to keep an eye on (or even contribute to) the behind-the-scenes stuff, check out our [Trello Board](https://trello.com/catblock).
## Goals
This project aims at maintaining and improving the original [CatBlock](http://blog.getadblock.com/2012/04/catblock-lives-on.html) project by Michael Gundlach (the creator of [AdBlock](https://getadblock.com) and CatBlock), which is built on top of the AdBlock code.
Copy link
Member

Choose a reason for hiding this comment

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

Link "CatBlock" could also point to catblock.getadblock.com - I'm not sure which is better, but I'll let you decide.

Available in [Chrome Web Store](https://chrome.google.com/webstore/detail/catblock/mdcgnhlfpnbeieiiccmebgkfdebafodo),
[Opera Extensions Store](https://addons.opera.com/sk/extensions/details/adblock-with-catblock/?display=en) and [Firefox Addons Store](https://addons.mozilla.org/en/firefox/addon/adblock-with-catblock/).
Right now, CatBlock is not available in the [Safari Extensions Store](https://safari-extensions.apple.com), or in the Windows Store (for Edge insiders).
AdBlock has recently switched to the Adblock Plus codebase in version 3.0, but instead of importing those changes to CatBlock, we think it would be better to improve the original codebase.
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this already in catblock.wiki/History?

Copy link
Member Author

Choose a reason for hiding this comment

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

@kpeckett Yep, it is but I think it would be great to highlight, that we do want to improve the original code as much as we can and update it instead of switching to the ABP's code.

- Opera: 35+
- Safari: 6+
- Firefox: 48+
- Edge: 38.14342+
Copy link
Member

Choose a reason for hiding this comment

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

Now it's stable, should we just say "Anniversary update or later?" and a link to instructions to install it?

Copy link
Member Author

Choose a reason for hiding this comment

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

@kpeckett Windows 10 Anniversary - version 1607 should be enough.

@@ -1,8 +1,10 @@
#!/usr/bin/python
Copy link
Member

Choose a reason for hiding this comment

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

If this is a python 3 script, python usually defaults to /usr/bin/python2 on most systems, when run using ./make_release.py.

Copy link
Member Author

Choose a reason for hiding this comment

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

@kpeckett I will delete it.


shutil.rmtree("catblock_opera")
print("We are sorry, but building CatBlock for Safari hasn't been implemented yet.")
Copy link
Member

Choose a reason for hiding this comment

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

If Safari is an unsupported browser, why not leave it for the else code block?

Copy link
Member Author

Choose a reason for hiding this comment

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

@kpeckett Good point, I will change that in the next commit.

Signed-off-by: Tomáš Taro <tomas@getadblock.com>
Signed-off-by: Tomáš Taro <tomas@getadblock.com>
@tomasko126 tomasko126 assigned itskdog and unassigned tomasko126 Sep 17, 2016
@tomasko126 tomasko126 merged commit f99d5a9 into master Oct 22, 2016
@tomasko126 tomasko126 deleted the script-improvements branch October 22, 2016 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement This is an enhancement to the extension
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants