LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge pull request #1356 from overviewer/python2

Browse Source 
Replace `python` with `python2`
This commit is contained in:
Nicolas F
2017-03-17 16:54:25 +01:00
committed by GitHub
parent cd0eb2d5c4 faa8d8f75c
commit 99b223fb5a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contribManager.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
# The contrib manager is used to help control the contribs script # The contrib manager is used to help control the contribs script
# that are shipped with overviewer in Windows packages # that are shipped with overviewer in Windows packages

12
docs/building.rst
View File

@@ -132,7 +132,7 @@ You will need the following packages (at least):
Then to build:: Then to build::
python setup.py build python2 setup.py build
At this point, you can run ``./overviewer.py`` from the current directory, so to run it you'll have to be in this directory and run ``./overviewer.py`` or provide the the full path to ``overviewer.py``. Another option would be to add this directory to your ``$PATH``. Note that there is a ``python2 setup.py install`` step that you can run which will install things into ``/usr/local/bin``, but this is strongly not recommended as it might conflict with other installs of Overviewer. At this point, you can run ``./overviewer.py`` from the current directory, so to run it you'll have to be in this directory and run ``./overviewer.py`` or provide the the full path to ``overviewer.py``. Another option would be to add this directory to your ``$PATH``. Note that there is a ``python2 setup.py install`` step that you can run which will install things into ``/usr/local/bin``, but this is strongly not recommended as it might conflict with other installs of Overviewer.
@@ -146,12 +146,12 @@ OSX
Xcode Preferences dialog). Xcode Preferences dialog).
1. Download the source code for PIL from http://www.pythonware.com/products/pil/ 1. Download the source code for PIL from http://www.pythonware.com/products/pil/
2. Compile the PIL code (``python ./setup.py build``) 2. Compile the PIL code (``python2 ./setup.py build``)
3. Install PIL (``sudo python ./setup.py install``) 3. Install PIL (``sudo python2 ./setup.py install``)
4. Find the path to the ``libImaging`` directory in the PIL source tree. 4. Find the path to the ``libImaging`` directory in the PIL source tree.
5. Build Minecraft Overviewer with the path from step 4 as the value for PIL_INCLUDE_DIR:: 5. Build Minecraft Overviewer with the path from step 4 as the value for PIL_INCLUDE_DIR::
PIL_INCLUDE_DIR="path from step 4" python ./setup.py build PIL_INCLUDE_DIR="path from step 4" python2 ./setup.py build
The following script (copied into your MCO source directory) should handle everything for you: The following script (copied into your MCO source directory) should handle everything for you:
@@ -160,7 +160,7 @@ The following script (copied into your MCO source directory) should handle every
#!/bin/bash #!/bin/bash
# start with a clean place to work # start with a clean place to work
python ./setup.py clean python2 ./setup.py clean
# get PIL # get PIL
if [ ! -d "`pwd`/Imaging-1.1.7/libImaging" ]; then if [ ! -d "`pwd`/Imaging-1.1.7/libImaging" ]; then
@@ -170,7 +170,7 @@ The following script (copied into your MCO source directory) should handle every
fi fi
# build MCO # build MCO
PIL_INCLUDE_DIR="`pwd`/Imaging-1.1.7/libImaging" python ./setup.py build PIL_INCLUDE_DIR="`pwd`/Imaging-1.1.7/libImaging" python2 ./setup.py build
FreeBSD FreeBSD
------- -------

2
overviewer_core/progressbar.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python2
# -*- coding: iso-8859-1 -*- # -*- coding: iso-8859-1 -*-
# #
# progressbar - Text progressbar library for python. # progressbar - Text progressbar library for python.