[tor-bugs] #6810 [Flashproxy]: Reduce code duplication across client programs
Tor Bug Tracker & Wiki
blackhole at torproject.org
Wed Nov 6 08:02:48 UTC 2013
#6810: Reduce code duplication across client programs
-----------------------------+--------------------------
Reporter: dcf | Owner: dcf
Type: enhancement | Status: needs_review
Priority: minor | Milestone:
Component: Flashproxy | Version:
Resolution: | Keywords:
Actual Points: | Parent ID:
Points: |
-----------------------------+--------------------------
Comment (by dcf):
Replying to [comment:23 infinity0]:
> Merged to git.tpo, thanks!
>
> I realised that now the version is defined in 4 separate places
including the ChangeLog, so wrote a commit to get this
[https://github.com/infinity0/flashproxy/compare/master...auto-version
automatically from the ChangeLog] - it's a bit hacky but it's very short
and works even for your in-between-versions changelogs where the "Changes
in version x" aren't on the first line. If you like it, I'll push that to
git.tpo too.
I don't think we should grep the version from ChangeLog. Getting it from a
git tag like versioneer does sounds better. Or, manually updating in three
places also sounds acceptable. (I don't think of ChangeLog as being
something that has to be kept in sync, because nothing breaks if it's
not.)
Maybe you could create a `VERSION` file with the contents
{{{
VERSION = "1.4"
}}}
which happens to parse as both Make and Python, and then include/import it
from Makefile and the setup.py scripts. If the quotes cause a problem in
Makefile, maybe follow the include with a
{{{
VERSION := $(subst ",,$(VERSION))
}}}
> I had to change update pt-bundle too, and have pushed those updates to
[https://gitweb.torproject.org/pluggable-
transports/bundle.git/shortlog/refs/heads/bug6810_compat a separate
branch] - if you like that, I'll merge/fast-forward that into master as
well.
That looks good, go ahead and apply it to master.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/6810#comment:24>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list