commit 1d65c8816a62234c2f2851d97586bad9c83e50ed Author: Erinn Clark erinn@torproject.org Date: Sat Aug 11 08:52:06 2012 +0100
add OBFS_COMPRESSED_NAME so obfsproxy bundles will have the right name --- build-scripts/linux-alpha.mk | 3 ++- build-scripts/osx-alpha.mk | 1 + build-scripts/windows-alpha.mk | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 871ca36..dca4b99 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -145,7 +145,8 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- -DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) +DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
ifeq ($(USE_PIDGIN),1) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index c6376fd..69b6708 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -177,6 +177,7 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- OBFS_COMPRESSED_BASENAME=TorBrowser-Obfsproxy-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 5847a34..0505ab2 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -156,6 +156,7 @@ VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) +OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)