commit 7f0cf43bf0daf09bf4b5caddd1a0ab6a4b72f613 Author: Erinn Clark erinn@torproject.org Date: Thu Aug 2 07:57:15 2012 +0100

give obfsproxy bundles their own name --- build-scripts/linux-alpha.mk | 3 +++ build-scripts/windows-alpha.mk | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 28cfa40..ceb2014 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -377,6 +377,9 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) +ifeq ($(USE_OBFSPROXY),1) + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).tar.gz +endif tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz rm *.zip *.xpi

diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 97ababf..7bdb8cb 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -373,6 +373,9 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp

compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe +ifeq ($(USE_OBFSPROXY),1) + cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)-obfsproxy_$(LANGCODE).exe $(NAME) +endif cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)

copy-files_%: generic-bundle.stamp