[tor-commits] [torbirdy/master] Remove redundant files and update Makefile
sukhbir at torproject.org
sukhbir at torproject.org
Mon Aug 5 22:32:51 UTC 2013
commit 7000618010b5b54355fb198796a6c4e6a3004f0b
Author: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon Aug 5 18:32:50 2013 -0400
Remove redundant files and update Makefile
---
Makefile | 2 +-
README.RELEASE | 94 --------------------------------------------------------
TODO | 16 ----------
3 files changed, 1 insertion(+), 111 deletions(-)
diff --git a/Makefile b/Makefile
index dd2b113..96673df 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL := /bin/bash
VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1)
make-xpi:
- zip -r ../torbirdy-$(VERSION).xpi * -x "/screenshots/*" -x "*/screenshots/*" -x "debian/*" -x "patches/*" -x "TODO" -x "ChangeLog" -x "Makefile"
+ zip -r ../torbirdy-$(VERSION).xpi * -x "/screenshots/*" -x "*/screenshots/*" -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile"
clean:
rm -f ../torbirdy-$(VERSION).xpi
diff --git a/README.RELEASE b/README.RELEASE
deleted file mode 100644
index a61c704..0000000
--- a/README.RELEASE
+++ /dev/null
@@ -1,94 +0,0 @@
-# Magical TorBirdy Release Process Incantations
-#
-# "May this part of my job one day be replaced by a small shell script"
-#
-# This is adapted from Mike Perry's Torbutton release notes
-#
-
-#. Decide the version number.
-
- export VERSION="0.0.4"
- vim ./src/install.rdf # edit <em:version> tag to reflect version
-
-#. Test upgrades of candidate XPI in latest Thunderbird/Iceweasel/etc product matrix
-
- # TODO: Currently manual
-
-#. Generate changelog from git shortlog
-
- # TODO: Currently manual
-
-#. tx noise: https://svn.torproject.org/svn/translation/trunk/documentation/howto.txt
-
-# XXX TODO: i18n/l10n this project!
-
-#. Tag the release:
-# The easy way:
- make git-tag
-
-# The hard way:
- git tag -u 0xD81D840E -s ${VERSION}
- git push --tags
-
-#. Create the .xpi
-
- cd /tmp/
- git clone git://github.com/ioerror/torbirdy.git torbirdy-release
- cd torbirdy-release
- git tag -v ${VERSION}
- git checkout -b tag-${VERSION} ${VERSION}
- make
-
-#. SHA1 + Sign the .xpi
-
- gpg -abs ../torbirdy-${VERSION}.xpi
- sha1sum ../torbirdy-${VERSION}.xpi
-
-#. Upload .xpi to website
-
- chmod 664 ../torbirdy-${VERSION}.xpi*
- scp ../torbirdy-${VERSION}.xpi* vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/
- scp ../torbirdy-${VERSION}.xpi vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi
- scp ../torbirdy-${VERSION}.xpi.asc vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi.asc
-
-#. Update update.rdf
-
- cd website-svn
- vim ./include/versions.wmi # Add sha1 and version
- vim ./torbirdy/update.rdf # Add <li> and <description> w/ sha1 and version
-
-#. Sign the new update.rdf.
-
- # Key creation based on these instructions:
- # Command line: http://blog.techno-barje.fr/post/2009/10/08/How-to-setup-a-mozilla-extension-update-server/
- # Gui: https://www.binaryturf.com/steps-release-extension-firefox-3/
-
- # TODO: Process currently manual due to offline signing.
- # No need to fear the reaper, man. We can do online signing if we just put
- # our minds to it: https://trac.torproject.org/projects/tor/ticket/6011
-
- # Special note: I was unable to update an already signed
- # copy of the update.rdf for a new release. We probably need to
- # keep the unsigned version around as input? See the root directory
- # of the torbutton.git for a copy.
- ./mccoy-cli.x86/mccoy -profile ./.mozilla/mccoy/*.default/ -signRDF update-unsigned.rdf -key Torbutton
-
- # Copy the signed update.rdf into place in the website svn
-
-#. Update website
-
- torsocks svn up .
- torsocks svn commit .
-
- torsocks ssh vescum "/home/mirroradm/bin/trigger-mirrors"
-
-#. Test firefox autoupdate
-
- # Wait for mirrors to sync first.. Pester phobos/weasel/helix/Sebastian for
- # website push + dist chown + mirror update.
- # TODO: Currently manual
-
-#. Announce on tor-talk
-
- # FIXME: May need eventual minor improvements
- echo "Troll food." | mail tor-talk at lists.torproject.org -s "Feed the trolls"
diff --git a/TODO b/TODO
deleted file mode 100644
index 7254d6c..0000000
--- a/TODO
+++ /dev/null
@@ -1,16 +0,0 @@
-Enhance the privacy of the emails
-Protect against all kinds of HTML issues
-Support Tor's prop 171
-Add new TODO items
-
-These bugs must be fixed in Thunderbird:
- https://bugzilla.mozilla.org/show_bug.cgi?id=684035
-
-Required reading:
- https://lists.torproject.org/pipermail/tor-talk/2011-September/021398.html
-
-Mixmaster/MixMinion integration - eg: "write anonymous email" button
-https://trac.torproject.org/projects/tor/ticket/6020
-
-Open Tickets for TorBirdy:
- https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=TorBirdy&order=priority&col=id&col=summary&col=component&col=status&col=type&col=priority&col=milestone&report=27
More information about the tor-commits
mailing list