commit ba5724c720ccbf06b5e3db19018dbc91ecb28e45
Author: Shondoit Walker <shond...@gmail.com>
Date: Thu Aug 2 09:25:07 2012 +0200
Use the predefined COMPRESSED_NAME
COMPRESSED_NAME is already defined according to the USE_OBFSPROXY flag
as introduced in commit a08b546605d13d82e6f664bf8e2d8b3caf61327c.
---
build-scripts/linux-alpha.mk | 5 +----
build-scripts/osx-alpha.mk | 7 ++-----
build-scripts/windows-alpha.mk | 3 ---
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index ceb2014..8427a10 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -377,10 +377,7 @@ 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
+ tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna
wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz
rm *.zip *.xpi
copy-files_%: generic-bundle.stamp
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 377fba9..ad75326 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -374,13 +374,10 @@ bundle-localized_%.stamp:
bundle-localized: bundle-localized_$(LANGCODE).stamp
compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
- -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).zip
+ -rm -f $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip
-mkdir $(DISTDIR)
#hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ
-imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/
$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg
- zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip
$(NAME)_$(LANGCODE).app
-ifeq ($(USE_OBFSPROXY),1)
- zip -r
$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).zip
$(NAME)_$(LANGCODE).app
-endif
+ zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip
$(NAME)_$(LANGCODE).app
-rm -f *.zip *.xpi
copy-files_%: generic-bundle.stamp
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index cb9e1ae..5847a34 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -373,9 +373,6 @@ 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
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
