Updated packaging and file locations to reflect Briefcase v0.3 requirements.

Author: freakboy3742

CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Contributing
 
-PyBee <3's contributions! 
+BeeWare <3's contributions!
 
-Please be aware, PyBee operates under a Code of Conduct. 
+Please be aware, BeeWare operates under a Code of Conduct.
 
-See [CONTRIBUTING to PyBee](pybee.org/contributing) for details.
+See [CONTRIBUTING to BeeWare](https://beeware.org/contributing) for details.
 

Makefile

@@ -299,7 +299,7 @@ endif
 # Build Python
 $$(PYTHON_DIR-$1)/dist/lib/libpython$(PYTHON_VER)m.a: build/$2/Support/OpenSSL build/$2/Support/BZip2 build/$2/Support/XZ $$(PYTHON_DIR-$1)/Makefile
 	# Build target Python
-	cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/dist/bin:$(PATH) make all install
+	cd $$(PYTHON_DIR-$1) && PATH="$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/dist/bin:$(PATH)" make all install
 
 build/$2/$$(pyconfig.h-$1): $$(PYTHON_DIR-$1)/dist/include/python$(PYTHON_VER)m/pyconfig.h
 	cp -f $$^ $$@
@@ -341,17 +341,18 @@ clean-$1:
 
 dist/Python-$(PYTHON_VER)-$1-support.b$(BUILD_NUMBER).tar.gz: $$(BZIP2_FRAMEWORK-$1) $$(XZ_FRAMEWORK-$1) $$(OPENSSL_FRAMEWORK-$1) $$(PYTHON_FRAMEWORK-$1)
 	mkdir -p dist
-	echo "Python version: $(PYTHON_VERSION) " > build/$1/VERSIONS
-	echo "Build: $(BUILD_NUMBER)" >> build/$1/VERSIONS
-	echo "---------------------" >> build/$1/VERSIONS
-	echo "BZip2: $(BZIP2_VERSION)" >> build/$1/VERSIONS
-	echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/VERSIONS
-	echo "XZ: $(XZ_VERSION)" >> build/$1/VERSIONS
+	echo "Python version: $(PYTHON_VERSION) " > build/$1/Support/VERSIONS
+	echo "Build: $(BUILD_NUMBER)" >> build/$1/Support/VERSIONS
+	echo "---------------------" >> build/$1/Support/VERSIONS
+	echo "BZip2: $(BZIP2_VERSION)" >> build/$1/Support/VERSIONS
+	echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/Support/VERSIONS
+	echo "XZ: $(XZ_VERSION)" >> build/$1/Support/VERSIONS
 ifeq ($1,macOS)
 	cp -r build/$1/Python-$(PYTHON_VERSION)-macosx.x86_64/dist build/$1/python
-	tar zcvf $$@ -C build/$1 VERSIONS python
+	mv build/$1/Support/VERSIONS build/$1/python/VERSIONS
+	tar zcvf $$@ -C build/$1/python `ls -A build/$1/python`
 else
-	tar zcvf $$@ -C build/$1 VERSIONS Support
+	tar zcvf $$@ -C build/$1/Support `ls -A build/$1/Support`
 endif
 
 # Build OpenSSL

README.rst

@@ -72,7 +72,7 @@ For details on how to add these binary packages to your project, see the
 package-specific documentation linked above.
 
 
-.. _for macOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.5/macOS/Python-3.5-macOS-support.b9.tar.gz
-.. _for iOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.5/iOS/Python-3.5-iOS-support.b9.tar.gz
-.. _for tvOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.5/tvOS/Python-3.5-tvOS-support.b9.tar.gz
-.. _for watchOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.5/watchOS/Python-3.5-watchOS-support.b9.tar.gz
+.. _for macOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.5/macOS/Python-3.5-macOS-support.b9.tar.gz
+.. _for iOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.5/iOS/Python-3.5-iOS-support.b9.tar.gz
+.. _for tvOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.5/tvOS/Python-3.5-tvOS-support.b9.tar.gz
+.. _for watchOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.5/watchOS/Python-3.5-watchOS-support.b9.tar.gz

tools/upload.py

@@ -2,12 +2,12 @@
 import sys
 import threading
 
-
 from botocore.exceptions import ClientError
 import boto3
 
 from argparse import ArgumentParser
 
+
 class Progress:
     def __init__(self, index, count, filename):
         self.index = index
@@ -45,8 +45,8 @@ def upload(build, directory, s3_client):
             with open(full_filename, 'rb') as data:
                 s3_client.upload_fileobj(
                     data,
-                    'pybee-briefcase-support',
-                    'Python-Apple-support/%s/%s/%s' % (
+                    'briefcase-support',
+                    'python/%s/%s/%s' % (
                         version,
                         platform,
                         filename