use HTTPS urls
This commit is contained in:
parent
6dcbe7ab9f
commit
56d047875c
10 changed files with 18 additions and 18 deletions
|
@ -15,7 +15,7 @@ your application requirements and settings such as title, icon, included modules
|
||||||
etc. Buildozer will use that spec to create a package for Android, iOS, Windows,
|
etc. Buildozer will use that spec to create a package for Android, iOS, Windows,
|
||||||
OSX and/or Linux.
|
OSX and/or Linux.
|
||||||
|
|
||||||
Buildozer currently supports packaging for Android via the [python-for-android](http://github.com/kivy/python-for-android/)
|
Buildozer currently supports packaging for Android via the [python-for-android](https://github.com/kivy/python-for-android/)
|
||||||
project, and for iOS via the kivy-ios project. iOS and OSX are still under work.
|
project, and for iOS via the kivy-ios project. iOS and OSX are still under work.
|
||||||
|
|
||||||
For Android, buildozer will automatically download and prepare the
|
For Android, buildozer will automatically download and prepare the
|
||||||
|
@ -24,7 +24,7 @@ build dependencies. For more information, see
|
||||||
Note that only Python 3 is supported.
|
Note that only Python 3 is supported.
|
||||||
|
|
||||||
Note that this tool has nothing to do with the eponymous online build service
|
Note that this tool has nothing to do with the eponymous online build service
|
||||||
[buildozer.io](http://buildozer.io).
|
[buildozer.io](https://buildozer.io).
|
||||||
|
|
||||||
## Installing Buildozer with target Python 3 (default):
|
## Installing Buildozer with target Python 3 (default):
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ For [debugging on Android](https://python-for-android.readthedocs.io/en/stable/t
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
We love pull requests and discussing novel ideas. Check out our
|
We love pull requests and discussing novel ideas. Check out our
|
||||||
[contribution guide](http://kivy.org/docs/contribute.html) and
|
[contribution guide](https://kivy.org/docs/contribute.html) and
|
||||||
feel free to improve buildozer.
|
feel free to improve buildozer.
|
||||||
|
|
||||||
The following mailing list and IRC channel are used exclusively for
|
The following mailing list and IRC channel are used exclusively for
|
||||||
|
|
|
@ -368,7 +368,7 @@ class TargetAndroid(Target):
|
||||||
|
|
||||||
self.buildozer.info('Android ANT is missing, downloading')
|
self.buildozer.info('Android ANT is missing, downloading')
|
||||||
archive = 'apache-ant-{0}-bin.tar.gz'.format(APACHE_ANT_VERSION)
|
archive = 'apache-ant-{0}-bin.tar.gz'.format(APACHE_ANT_VERSION)
|
||||||
url = 'http://archive.apache.org/dist/ant/binaries/'
|
url = 'https://archive.apache.org/dist/ant/binaries/'
|
||||||
self.buildozer.download(url,
|
self.buildozer.download(url,
|
||||||
archive,
|
archive,
|
||||||
cwd=ant_dir)
|
cwd=ant_dir)
|
||||||
|
@ -427,7 +427,7 @@ class TargetAndroid(Target):
|
||||||
# https://developer.android.com/ndk/downloads/older_releases
|
# https://developer.android.com/ndk/downloads/older_releases
|
||||||
|
|
||||||
if platform in ('win32', 'cygwin'):
|
if platform in ('win32', 'cygwin'):
|
||||||
# Checking of 32/64 bits at Windows from: http://stackoverflow.com/a/1405971/798575
|
# Checking of 32/64 bits at Windows from: https://stackoverflow.com/a/1405971/798575
|
||||||
import struct
|
import struct
|
||||||
archive = 'android-ndk-r{0}-windows-{1}.zip'
|
archive = 'android-ndk-r{0}-windows-{1}.zip'
|
||||||
is_64 = (8 * struct.calcsize("P") == 64)
|
is_64 = (8 * struct.calcsize("P") == 64)
|
||||||
|
@ -460,7 +460,7 @@ class TargetAndroid(Target):
|
||||||
if _version >= '10e':
|
if _version >= '10e':
|
||||||
url = 'https://dl.google.com/android/repository/'
|
url = 'https://dl.google.com/android/repository/'
|
||||||
else:
|
else:
|
||||||
url = 'http://dl.google.com/android/ndk/'
|
url = 'https://dl.google.com/android/ndk/'
|
||||||
|
|
||||||
self.buildozer.download(url,
|
self.buildozer.download(url,
|
||||||
archive,
|
archive,
|
||||||
|
@ -659,7 +659,7 @@ class TargetAndroid(Target):
|
||||||
self.buildozer.error(
|
self.buildozer.error(
|
||||||
'You might have missed to install 32bits libs')
|
'You might have missed to install 32bits libs')
|
||||||
self.buildozer.error(
|
self.buildozer.error(
|
||||||
'Check http://buildozer.readthedocs.org/en/latest/installation.html')
|
'Check https://buildozer.readthedocs.org/en/latest/installation.html')
|
||||||
self.buildozer.error('')
|
self.buildozer.error('')
|
||||||
else:
|
else:
|
||||||
self.buildozer.error('')
|
self.buildozer.error('')
|
||||||
|
|
|
@ -46,14 +46,14 @@ class TargetOSX(Target):
|
||||||
self.buildozer.info('Downloading kivy...')
|
self.buildozer.info('Downloading kivy...')
|
||||||
status_code = check_output(
|
status_code = check_output(
|
||||||
('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch),
|
('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch),
|
||||||
'http://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'
|
'https://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'
|
||||||
.format(current_kivy_vers, current_kivy_vers, py_branch)),
|
.format(current_kivy_vers, current_kivy_vers, py_branch)),
|
||||||
cwd=cwd)
|
cwd=cwd)
|
||||||
|
|
||||||
if status_code == "404":
|
if status_code == "404":
|
||||||
self.buildozer.error(
|
self.buildozer.error(
|
||||||
"Unable to download the Kivy App. Check osx.kivy_version in your buildozer.spec, and verify "
|
"Unable to download the Kivy App. Check osx.kivy_version in your buildozer.spec, and verify "
|
||||||
"Kivy servers are accessible. http://kivy.org/downloads/")
|
"Kivy servers are accessible. https://kivy.org/downloads/")
|
||||||
check_call(("rm", "Kivy{}.dmg".format(py_branch)), cwd=cwd)
|
check_call(("rm", "Kivy{}.dmg".format(py_branch)), cwd=cwd)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ torrent:
|
||||||
mktorrent \
|
mktorrent \
|
||||||
-a ${TORRENT_ANNOUNCE} \
|
-a ${TORRENT_ANNOUNCE} \
|
||||||
-o output-kivy-buildozer-vm/kivy-buildozer-vm.torrent \
|
-o output-kivy-buildozer-vm/kivy-buildozer-vm.torrent \
|
||||||
-w http://txzone.net/files/torrents/${PACKAGE_FILENAME} \
|
-w https://txzone.net/files/torrents/${PACKAGE_FILENAME} \
|
||||||
-v output-kivy-buildozer-vm/${PACKAGE_FILENAME}
|
-v output-kivy-buildozer-vm/${PACKAGE_FILENAME}
|
||||||
|
|
||||||
upload:
|
upload:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# an error when using the android sdk:
|
# an error when using the android sdk:
|
||||||
# "Can't read cryptographic policy directory: unlimited"
|
# "Can't read cryptographic policy directory: unlimited"
|
||||||
|
|
||||||
wget http://bootstrap.pypa.io/get-pip.py
|
wget https://bootstrap.pypa.io/get-pip.py
|
||||||
python get-pip.py
|
python get-pip.py
|
||||||
rm get-pip.py
|
rm get-pip.py
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ BUILDDIR = build
|
||||||
|
|
||||||
# User-friendly check for sphinx-build
|
# User-friendly check for sphinx-build
|
||||||
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
|
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
|
||||||
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
|
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://www.sphinx-doc.org/)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Internal variables.
|
# Internal variables.
|
||||||
|
|
|
@ -56,7 +56,7 @@ if errorlevel 9009 (
|
||||||
echo.may add the Sphinx directory to PATH.
|
echo.may add the Sphinx directory to PATH.
|
||||||
echo.
|
echo.
|
||||||
echo.If you don't have Sphinx installed, grab it from
|
echo.If you don't have Sphinx installed, grab it from
|
||||||
echo.http://sphinx-doc.org/
|
echo.https://www.sphinx-doc.org/
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -15,10 +15,10 @@ limitation.
|
||||||
|
|
||||||
To test your own recipe via Buildozer, you need to:
|
To test your own recipe via Buildozer, you need to:
|
||||||
|
|
||||||
#. Fork `Python for Android <http://github.com/kivy/python-for-android>`_, and
|
#. Fork `Python for Android <https://github.com/kivy/python-for-android>`_, and
|
||||||
clone your own version (this will allow easy contribution later)::
|
clone your own version (this will allow easy contribution later)::
|
||||||
|
|
||||||
git clone http://github.com/YOURNAME/python-for-android
|
git clone https://github.com/YOURNAME/python-for-android
|
||||||
|
|
||||||
#. Change your `buildozer.spec` to reference your version::
|
#. Change your `buildozer.spec` to reference your version::
|
||||||
|
|
||||||
|
@ -44,6 +44,6 @@ include it in the python-for-android project, by issuing a Pull Request:
|
||||||
|
|
||||||
git push origin master
|
git push origin master
|
||||||
|
|
||||||
#. Go to `http://github.com/YOURNAME/python-for-android`, and you should see
|
#. Go to `https://github.com/YOURNAME/python-for-android`, and you should see
|
||||||
your new branch and a button "Pull Request" on it. Use it, write a
|
your new branch and a button "Pull Request" on it. Use it, write a
|
||||||
description about what you did, and Send!
|
description about what you did, and Send!
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -57,7 +57,7 @@ setup(
|
||||||
long_description_content_type='text/markdown',
|
long_description_content_type='text/markdown',
|
||||||
author='Mathieu Virbel',
|
author='Mathieu Virbel',
|
||||||
author_email='mat@kivy.org',
|
author_email='mat@kivy.org',
|
||||||
url='http://github.com/kivy/buildozer',
|
url='https://github.com/kivy/buildozer',
|
||||||
license='MIT',
|
license='MIT',
|
||||||
packages=[
|
packages=[
|
||||||
'buildozer', 'buildozer.targets', 'buildozer.libs', 'buildozer.scripts'
|
'buildozer', 'buildozer.targets', 'buildozer.libs', 'buildozer.scripts'
|
||||||
|
|
|
@ -158,7 +158,7 @@ class TestBuildozer(unittest.TestCase):
|
||||||
assert m_file_extract.call_args_list == [mock.call(mock.ANY, cwd='/my/ant/path')]
|
assert m_file_extract.call_args_list == [mock.call(mock.ANY, cwd='/my/ant/path')]
|
||||||
assert ant_path == my_ant_path
|
assert ant_path == my_ant_path
|
||||||
assert download.call_args_list == [
|
assert download.call_args_list == [
|
||||||
mock.call("http://archive.apache.org/dist/ant/binaries/", mock.ANY, cwd=my_ant_path)]
|
mock.call("https://archive.apache.org/dist/ant/binaries/", mock.ANY, cwd=my_ant_path)]
|
||||||
# Mock ant already installed
|
# Mock ant already installed
|
||||||
with mock.patch.object(Buildozer, 'file_exists', return_value=True):
|
with mock.patch.object(Buildozer, 'file_exists', return_value=True):
|
||||||
ant_path = target._install_apache_ant()
|
ant_path = target._install_apache_ant()
|
||||||
|
|
Loading…
Reference in a new issue