Skip to content

Commit 009293b

Browse files
4B796C65@gmail.com4B796C65@gmail.com
authored andcommitted
I have given up on linking the Mac Framworks at runtime. Mac users will just have to install them.
1 parent ac9a780 commit 009293b

22 files changed

+69
-97
lines changed

CHANGELOG.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

MANIFEST

Lines changed: 0 additions & 34 deletions
This file was deleted.

MANIFEST.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ include *.bat
33
include tdl/*.bmp
44
include tdl/*.png
55
include tdl/*.txt
6-
include tdl/*.so
7-
include tdl/*.dll
6+
include tdl/lib/*.txt
7+
include tdl/linux*/*.so
8+
include tdl/win32/*.dll
89
include tdl/*.dylib
9-
include tdl/*.framework.tar
10+
include tdl/lib/darwin/*
11+
include Frameworks/*.framework.tar
1012
include examples/*.py
1113
include documentation/*.html
1214
include ez_setup.py

README.txt

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
=== Installation ===
2-
TDL requires setuptools and will automatically install it if you have an active Internet connection
3-
Generally you should run "setup.py install" in whichever way your OS allows
2+
Run the command "setup.py install"
3+
4+
Mac users will need to install the files found in the Frameworks directory
45

56
=== Requirements ===
67
* Python 2.6+ or 3.x
7-
* 32 bit Windows or 32/64 bit Linux
8-
* setuptools (Will install itself when you run setup.py but requires an active Internet connection)
8+
* 32 bit Windows, 32/64 bit Linux, or Mac OS/X (32 bit architecture)
99

1010
=== About ===
1111
TDL is a port of the C library libtcod in an attempt to make it more "Pythonic"
12-
You can find more about libtcod at http://doryen.eptalys.net/libtcod/
12+
You can find more about libtcod at: http://doryen.eptalys.net/libtcod/
13+
And you can find the tdl project here: http://code.google.com/p/python-tdl/
1314

1415
== License ==
15-
Copyright (c) 2010 Kyle Stewart
16-
17-
This software is provided 'as-is', without any express or implied
18-
warranty. In no event will the authors be held liable for any damages
19-
arising from the use of this software.
20-
21-
Permission is granted to anyone to use this software for any purpose,
22-
including commercial applications, and to alter it and redistribute it
23-
freely, subject to the following restrictions:
24-
25-
1. The origin of this software must not be misrepresented; you must not
26-
claim that you wrote the original software. If you use this software
27-
in a product, an acknowledgment in the product documentation would be
28-
appreciated but is not required.
29-
30-
2. Altered source versions must be plainly marked as such, and must not be
31-
misrepresented as being the original software.
32-
33-
3. This notice may not be removed or altered from any source
34-
distribution.
35-
16+
Copyright (c) 2012, Kyle Stewart
17+
All rights reserved.
18+
19+
Redistribution and use in source and binary forms, with or without
20+
modification, are permitted provided that the following conditions are met:
21+
22+
1. Redistributions of source code must retain the above copyright notice, this
23+
list of conditions and the following disclaimer.
24+
2. Redistributions in binary form must reproduce the above copyright notice,
25+
this list of conditions and the following disclaimer in the documentation
26+
and/or other materials provided with the distribution.
27+
28+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
29+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
30+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
31+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
32+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
33+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
34+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
35+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
36+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
37+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38+
39+
The views and conclusions contained in the software and documentation are those
40+
of the authors and should not be interpreted as representing official policies,
41+
either expressed or implied, of the FreeBSD Project.

desktop.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[.ShellClassInfo]
2+
IconFile=C:\Users\Kyle\AppData\Roaming\Dropbox\bin\Dropbox.exe
3+
IconIndex=-2301
4+
InfoTip=A securely backed up place to put your important files.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22

3-
REVISION = int(open('./.bzr/branch/last-revision', 'r').read().split(' ')[0])
3+
REVISION = int(''.join(c for c in "$Revision$" if c.isdigit()))
44
VERSION = '1.0r%i' % REVISION
55

66
try:
@@ -23,7 +23,7 @@
2323
download_url='https://launchpad.net/rlu/+download',
2424
packages=['tdl'],
2525
#package_dir={'tdl': 'tdl'},
26-
package_data={'tdl': ['*.txt', '*.bmp', '*.png', '*.so', '*.dll', '*.framework.tar']},
26+
package_data={'tdl': ['lib/*.txt', '*.bmp', '*.png', 'lib/linux*/*.so', 'lib/win32/*.dll', 'lib/darwin/*']},
2727
include_package_data=True,
2828
install_requires=['setuptools'],
2929
classifiers=['Development Status :: 4 - Beta',

0 commit comments

Comments
 (0)