Commit Graph

108 Commits

Author SHA1 Message Date
Nicolas F 97ef871e36 setup: use None for library_dirs when not set
Setting it to a list containing an empty string breaks the Debian
builders.
2022-06-08 15:18:39 +02:00
Nicolas F 735e13e80d setup: find system python path for CI hack
The problem appears to be that virtualenv overrides the base_prefix
so distutils can no longer find the system python path when adding
linker args.

This adds an ugly hack to find the system python path, and adds it
to the linker flags on Windows. Yay, no more hardcoded paths.

This should also make win32 builds work, and avoid adding linker
args manually.
2022-06-08 15:09:33 +02:00
Nicolas F 04ea4eb3ff setup: ugly hack to include our AWOL CI python lib path
This is wrong bad bad bad, but it makes the Win64 build work again
for now, which is what matters.
2022-06-08 13:40:10 +02:00
Nicolas F 999e613b28 setup.py: enable c99 mode with gnu extensions
Apparently this is needed on certain old gcc versions, but does
fine on newer ones. No clue why.
2021-06-06 08:10:32 +02:00
Nicolas F 649a20e902 Revert "Merge PR #1708 from AstraLuma"
This reverts commit b2a7bc99ba, reversing
changes made to a5fbe03133.

Breaks buildbot in various ways
2021-05-16 19:48:39 +02:00
Nicolas F ff94206a05 setup.py: don't error out when PIL can't be found
It may still be in the include directories provided by the
operating system, such as it is on the vast majority of Linux
distributions.
2021-05-16 18:26:36 +02:00
Nicolas F b2a7bc99ba Merge PR #1708 from AstraLuma 2021-05-16 18:13:55 +02:00
Nicolas F a5fbe03133 setup.py: make sure to enable -O3 on unix
Apparently my -O3 came from somewhere other than this script.
It's possible that there is some generic "use optimisations"
mechanism in setuptools/distutils/whateverthisis, but I don't feel
like opening up that can of worms so let's just add an -O3 extra
argument to the compiler invocation to make sure it always gets it.
2021-05-16 18:00:51 +02:00
Jamie Bliss 18592d5da1 setup.py: Add metadata 2020-01-11 14:23:13 -05:00
Jamie Bliss 4a003609d6 Update setup.py to setuptools
https://github.com/overviewer/Minecraft-Overviewer/pull/1208
2020-01-11 13:46:17 -05:00
Nicolas F 76bbabb7de fix various logging.warn calls
Those are deprecated in favour of logging.warning now.
2019-12-11 18:42:35 +01:00
Aaron Griffith 248ea42dd2 Merge branch 'master' into python3-fun-times 2019-06-21 22:08:58 -04:00
Wunkolo 2c3d54ea5d Implement block_class header 2019-03-17 15:09:33 -07:00
Nicolas F e348a548b6 Initial Python 3 port
Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
2019-03-17 17:57:07 +01:00
Nicolas F a183553ba5 setup.py: remove workaround for CentOS 5
More like ScentOS because it stinks LOLOLOLOLO
2017-04-10 12:22:05 +02:00
Andrew Chin 884f8548e7 Work on windows build with gitlab CI 2017-02-12 12:47:47 -05:00
Andrew Chin de67ed1bd3 Be sure to exit with a non-zero code on build error
Previously, the return code was zero
2016-12-24 13:57:27 -05:00
Nicolas F c7d86eca76 Change shebang to python2 instead of python 2016-12-06 15:01:20 +01:00
Andrew Chin 253f78c8d1 Revert "Add c_overveiwer_includes to the list of source files"
This reverts commit d6d488c3ea.

Because achin is a doofus
2015-06-24 11:41:26 -04:00
Andrew Chin d6d488c3ea Add c_overveiwer_includes to the list of source files
This seems to be needed to make "sdist" include these headerfiles. i
have no idea how/if this worked in the past
2015-06-24 11:30:31 -04:00
Andrew Chin 3f222796c5 Print a limit=1 traceback if failed to build 2014-03-30 18:50:46 -04:00
Andrew Chin a2780197cb Fix up python3 detection 2014-01-06 08:47:03 -05:00
Andrew Chin 94b8a81a90 Added small link to the build docs when encountering a build problem
Related to #1024
2013-12-26 22:30:10 -05:00
Andrew Chin 0245c91e6d Fix genpoi on windows 2012-05-09 21:26:05 -04:00
Andrew Chin da30592a45 Include the genpoi script in the .deb packages
You should now be able to run overviewer.py --genpoi without error
2012-05-02 21:09:45 -04:00
Andrew Chin fbf1323ad7 Added --genpoi to overviewer.py 2012-03-19 20:03:54 -04:00
Aaron Griffith 8aaf67450d setup.py now works regardless of current working directory 2012-03-04 20:11:15 -05:00
aheadley 08c0ee6100 add check for el5 before using extra gcc arg 2012-03-04 16:38:44 -05:00
Aaron Griffith fb7f382675 setup.py install (and the debian packages) should now work 2012-03-03 17:14:39 -05:00
Andrew Chin 20f9f92abd Clean up some build warnings
Removed some unused code, and quelled some warnings via GCC
2012-03-02 13:40:58 -05:00
Andrew Chin c019d7e8d8 use -Wdeclaration-after-statement
This makes gcc's behavior match MSVC's behavior, reducing the chances of
code not building on Windows
2012-03-02 13:40:57 -05:00
Andrew Chin 9d814bf653 Pack up js_src to fix issue with .exe builds 2012-02-19 18:06:43 -05:00
Richard Pastrick 298e0d4222 Change sample.settings.py to sample_config.py 2012-02-16 09:38:08 -08:00
Aaron Griffith 7cacc59428 setup.py now auto-discovers available render primitives 2012-01-08 00:52:30 -05:00
Aaron Griffith a682b8a689 broke out nether, heightfading, depth, and edgelines from base primitive 2012-01-08 00:08:16 -05:00
Aaron Griffith e3610f8ac5 moved to a layer-based rendermode system, moved normal mode to base primitive
options are now handled partially in the python side, in rendermodes.py
2012-01-08 00:08:16 -05:00
Aaron Griffith 1f2c1a281e the rest of the render modes are now working 2012-01-06 20:38:50 -05:00
Aaron Griffith 4eaf103213 fixes to get lighting mode working again 2012-01-06 20:23:15 -05:00
Aaron Griffith a69a78f412 c_overviewer.render_loop now works with normal render mode 2012-01-01 23:02:30 -05:00
Aaron Griffith 92b8cd33ed Merge branch 'master' into smooth-lighting 2011-10-28 13:07:01 -04:00
Andrew Brown f5ae4b3451 changed bare exceptions to except Exception 2011-10-26 22:36:23 -04:00
Aaron Griffith 85da19b1a0 turned night into a lighting mode option, added 'night' builtin custom mode 2011-10-26 22:19:27 -04:00
Aaron Griffith 3a090f77f5 stub smooth-lighting mode (does nothing special, for now) 2011-10-11 19:59:33 -04:00
Andrew Chin 12a81a2b47 Fixed the contribManager in windows binaries 2011-10-04 23:27:30 -04:00
Aaron Griffith 43629e928b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-09-06 10:29:15 -04:00
Andrew Chin f880f01b46 Moved --check-terrain command from setup.py and overviewer.py
Also, let textures_path work for minecraft.jar files
2011-09-05 22:35:13 -04:00
Aaron Griffith e800138079 Merge remote branch 'brownan/master' into rendermode-options 2011-08-26 21:06:14 -04:00
Andrew Chin 48bc9da527 Merge remote-tracking branch 'upstream/master' into contribs
Conflicts:
	setup.py
2011-08-24 21:00:27 -04:00
Aaron Griffith fe0d28630b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-08-18 11:40:26 -04:00
Andrew Chin 8ab2dea906 Py2exe executables now have a valid version number and description 2011-08-16 21:27:19 -04:00