branch: master
commit cabdac08458a426de6e6d8f2981d7378f73729ab
Author: Kai Sterker <kai@Kais-MacBook-Pro.local>
Commit: Kai Sterker <kai@Kais-MacBook-Pro.local>

    ADDED script and resources for OSX disk image creation and codesigning
---
 .gitignore         |    1 +
 Makefile.am        |    5 +-
 osx/Copying.html   |  459 ----------------------------------------------------
 osx/Install.html   |   31 ----
 osx/Playing.html   |   92 -----------
 osx/ReadMe.html    |  183 ---------------------
 osx/background.png |  Bin 0 -> 26756 bytes
 osx/make_dmg.sh    |   52 ++++++
 osx/settings.py    |  129 +++++++++++++++
 9 files changed, 184 insertions(+), 768 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9dc53fe..0a50aae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ __pycache__
 *.pyc
 *.AppImage
 win32/wastesedge-*.msi
+osx/wastesedge-*.dmg
diff --git a/Makefile.am b/Makefile.am
index dc8c24f..6b18990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,8 @@ dist_man_MANS = adonthell-wastesedge.6
 
 EXTRA_DIST = config.rpath mkinstalldirs PLAYING autogen.sh ABOUT-NLS \
        wastesedge.spec.in wastesedge.spec wastesedge.desktop.in \
-       win32/COPYING win32/make_msi.sh \
-       win32/wastesedge.ico win32/icon32.bmp win32/wastesedge.wxs \
-       osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
+       win32/COPYING win32/make_msi.sh win32/wastesedge.ico win32/icon32.bmp \
+       win32/wastesedge.wxs osx/background.png osx/make_dmg.sh osx/settings.py 
\
        osx/adonthell.icns make_linux_appimg.sh make_osx_bundle.sh \
        make_windows_pkg.sh
 
diff --git a/osx/Copying.html b/osx/Copying.html
deleted file mode 100644
index 5e769c5..0000000
--- a/osx/Copying.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
-<TITLE>GNU General Public License</TITLE>
-</HEAD>
-<BODY>
-
-<h2>GNU GENERAL PUBLIC LICENSE</h2>
-<P>Version 2, June 1991</P>
-
-<pre>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</pre>
-
-
-
-<h3>Preamble</h3>
-
-<P>
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-</P>
-<P>
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-</P>
-<P>
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-</P>
-<P>
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-</P>
-<P>
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-</P>
-<P>
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-</P>
-<P>
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-</P>
-<P>
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-</P>
-
-
-<h3>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h3>
-
-
-<P>
-
-<STRONG>0.</STRONG>
- This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-<P>
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-<P>
-
-<STRONG>1.</STRONG>
- You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-<P>
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-<P>
-
-<STRONG>2.</STRONG>
- You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-<UL>
-
-<LI><STRONG>a)</STRONG>
-     You must cause the modified files to carry prominent notices
-     stating that you changed the files and the date of any change.
-     <br>&nbsp;</li>
-
-<LI><STRONG>b)</STRONG>
-     You must cause any work that you distribute or publish, that in
-     whole or in part contains or is derived from the Program or any
-     part thereof, to be licensed as a whole at no charge to all third
-     parties under the terms of this License.<br>&nbsp;</li>
-
-<LI><STRONG>c)</STRONG>
-     If the modified program normally reads commands interactively
-     when run, you must cause it, when started running for such
-     interactive use in the most ordinary way, to print or display an
-     announcement including an appropriate copyright notice and a
-     notice that there is no warranty (or else, saying that you provide
-     a warranty) and that users may redistribute the program under
-     these conditions, and telling the user how to view a copy of this
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)</li>
-</UL>
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-<P>
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-<P>
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-<P>
-
-<STRONG>3.</STRONG>
- You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-
-<UL>
-
-<LI><STRONG>a)</STRONG>
-     Accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software interchange;
-     or,<br>&nbsp;</li>
-
-<LI><STRONG>b)</STRONG>
-     Accompany it with a written offer, valid for at least three
-     years, to give any third party, for a charge no more than your
-     cost of physically performing source distribution, a complete
-     machine-readable copy of the corresponding source code, to be
-     distributed under the terms of Sections 1 and 2 above on a medium
-     customarily used for software interchange; or,<br>&nbsp;</li>
-
-<LI><STRONG>c)</STRONG>
-     Accompany it with the information you received as to the offer
-     to distribute corresponding source code.  (This alternative is
-     allowed only for noncommercial distribution and only if you
-     received the program in object code or executable form with such
-     an offer, in accord with Subsection b above.)</li>
-</UL>
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-<P>
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-<P>
-
-<STRONG>4.</STRONG>
- You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-<P>
-
-<STRONG>5.</STRONG>
- You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-<P>
-
-<STRONG>6.</STRONG>
- Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-<P>
-
-<STRONG>7.</STRONG>
- If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-<P>
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-<P>
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-<P>
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-<P>
-
-<STRONG>8.</STRONG>
- If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-<P>
-
-<STRONG>9.</STRONG>
- The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-<P>
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-<P>
-
-
-<STRONG>10.</STRONG>
- If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-
-
-<P><STRONG>NO WARRANTY</STRONG></P>
-
-<P>
-
-<STRONG>11.</STRONG>
- BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-<P>
-
-<STRONG>12.</STRONG>
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
-
-<h3>END OF TERMS AND CONDITIONS</h3>
-
-<br>
-
-<h3>How to Apply These Terms to Your New Programs</h3>
-
-<P>
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-</P>
-<P>
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-</P>
-
-<pre><VAR>one line to give the program's name and an idea of what it 
does.</VAR>
-Copyright (C) <VAR>yyyy</VAR>  <VAR>name of author</VAR>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 
USA.</pre>
-
-<P>
-Also add information on how to contact you by electronic and paper mail.
-</P>
-
-<P>
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-</P>
-
-<pre>Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of 
author</VAR>
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c' 
-for details.</pre>
-
-<P>
-The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> 
should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than <SAMP>`show w'</SAMP> and
-<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever
-suits your program.
-
-</P>
-<P>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-</P>
-<pre>Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written 
-by James Hacker.
-
-<VAR>signature of Ty Coon</VAR>, 1 April 1989
-Ty Coon, President of Vice</pre>
-
-<P>
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.</p>
-</BODY>
-</HTML>
diff --git a/osx/Install.html b/osx/Install.html
deleted file mode 100644
index a8fc356..0000000
--- a/osx/Install.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-       <title>Install</title>
-</head>
-<body>
-<center><h2>Welcome to Adonthell - Waste's Edge</h2></center> 
-
-<h3>Install Adonthell</h3>
-<p>Simply drag the <i>Adonthell</i> package to a location of your choice.</p>
-
-<p><b style="color:#dd2323;">Important note for MacOS X 10.2 (Jaguar) 
users:</b><br>
-You will have to install the Python 2.3 Framework in order to get Adonthell - 
Waste's Edge working. This can be downloaded from the <a 
href="http://www.python.org/";>Python website</a>.<br>&nbsp;</p>
-
-
-<h3>Uninstall Adonthell</h3>
-<p>Likewise, dragging <i>Adonthell</i> onto the trash bin will completely 
remove it 
-from your system.<br>&nbsp;</p>
-
-<h3>Note</h3>
-<p>If you launch <i>Adonthell</i> directly from this disk 
-image, you won't be able to save your game (as the disk image is write 
protected).</p>
-
-<p>For more information regarding this software, please check the <a 
href="ReadMe.html">ReadMe</a>
-and <a href="Playing.html">Playing</a> files.</p>
-<hr>
-<small>
-Thank you for trying this software.<br>
-- The Adonthell team.</small>
-</body>
-</html>
diff --git a/osx/Playing.html b/osx/Playing.html
deleted file mode 100644
index b81d39a..0000000
--- a/osx/Playing.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-       <title>Playing</title>
-</head>
-<body>
-<center><h2>Adonthell - Waste's Edge</h2></center>
-<br>
-<h3>How to play this game</h3>
-
-<p>Dunno what you're supposed to do in <b>Adonthell - Waste's Edge</b>?
-Well, you've come to the right place to find out!<br>&nbsp;</p>
-
-
-<h3>Aim of the game</h3>
-
-<p>As a loyal servant of the elven Lady Silverhair, you arrive at the remote
-trading post of Waste's Edge, where she is engaged in negotiations with the
-dwarish merchant Bjarn Fingolson. But not all is well at Waste's Edge, and
-soon you are confronted with circumstances that are about to destroy your
-mistress' high reputation. And you are the only one to avert this ...</p>
-
-<p>Remember this game is a demo of what we can do so far. There is no fighting
-or collecting items yet (this will appear in future releases) so you must
-solve this quest by exploring the Redwyne Inn where everyone is staying and 
-talking to the people you meet there.</p>
-
-<p>The story is explained in more detail in the intro sequence so DON'T skip 
-it the first time you play :P<br>&nbsp;</p>
-
-
-<h3>Controls</h3>
-<ul>
-<li><b>Arrow keys</b><br>
-  Choosing options in the game menus<br>
-  Moving you chracter around the map<br>
-  Choosing responses during dialoges<br>
-  &nbsp;</li>
-
-<li><b>Space/Enter</b><br>
-  Selecting an option in the game menus<br>
-  Talking to a character (when you are facing them)<br>
-  Selecting a response during dialogues<br>
-  Examining items in and round the inn (only works in some places!)<br>
-  &nbsp;</li>
-
-<li><b>Page Up/Down</b><br>
-  Scrolling up/down in dialogues/windows<br>
-  &nbsp;</li>
-  
-<li><b>Escape</b><br>
-  Skipping cutscenes (like the intro)<br>
-  Bringing up the game menu<br>
-  Closing (some) windows<br>
-  </li>
-</ul>
-
-<p>(there are also one or two other 'cheat' controls - but we
-never told you that! :P)<br>&nbsp;</p>
-
-
-<h3>How to tell us what a great job we did</h3>
-
-<p>Seriously though, we'd like to hear what you think of Adonthell. Ideas and
-(constructive) criticism are more than welcome. To make life easier for us
-and to ensure that we read what you have to say we'd appreciate it if you'd
-post your comments to one of the following places depending on what it is:</p>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-<tr>
-<td>General Comments / Reviews</td>
-<td><a 
href="http://www.happypenguin.org/show?Adonthell";>http://www.happypenguin.org/show?Adonthell</a></td>
-</tr>
-<tr>
-<td>Ideas / Improvements</td>
-<td><a 
href="mailto:adonthell-gene...@nongnu.org";>adonthell-gene...@nongnu.org</a></td>
-</tr>
-<tr>
-<td>Technical Issues / Bugs</td>
-<td><a 
href="http://savannah.nongnu.org/projects/adonthell";>http://savannah.nongnu.org/projects/adonthell</a></td>
-</tr>
-</table>
-
-<p>And for any player related chat ("how do I get into Bjarn's room?") or any
-other stuff us developers don't necessarily have to see go to our message 
-board at:</p>
-
-<p style="margin-left:1cm"><a 
href="http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158";>http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158</a></p>
-
-<p><br>
-Cheers!<br>
-Enjoy Adonthell!</p>
diff --git a/osx/ReadMe.html b/osx/ReadMe.html
deleted file mode 100644
index 990c891..0000000
--- a/osx/ReadMe.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-       <title>Read Me</title>
-</head>
-<body>
-<center><h2>Adonthell - Waste's Edge</h2></center>
-
-<center><table border="0" cellspacing="0" cellpadding="0"><tr><td>
-<p>This program is free software; you can redistribute it and/or<br>
-modify it under the terms of the GNU General Public License<br>
-as published by the Free Software Foundation; either version 2<br>
-of the License, or (at your option) any later version.</p>
-
-<p>This program is distributed in the hope that it will be useful,<br>
-but WITHOUT ANY WARRANTY; without even the implied warranty<br>
-of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.<br>
-See the <a href="Copying.html">Copying.html</a> file for more 
details.<br>&nbsp;</p>
-</td></tr></table></center>
-
-<h3>Synopsis</h3>
-
-<p>Below you will find a description of Adonthell's configuration options,
-release notes and contact informations. If you need help with playing
-Adonthell - Waste's Edge, please refer to the <a 
href="Playing.html">Playing.html</a> file.<br>&nbsp;<p>
-
-<h3>Philosophy</h3>
-
-<p>Adonthell was (and still is) primarily developed for GNU/Linux, but runs on
-many UNiX flavours and various hardware platforms.</p>
-
-<p>Adonthell is free software, which means its source code is available for
-everybody to modify and distribute, as long as those modifications
-are open to everybody as well. See the <a href="Copying.html">Copying.html</a> 
file for the exact terms and conditions.</p>
-
-<p>In turn, Adonthell itself depends on various projects that are sharing
-the same philosophy, like SDL, Ogg Vorbis, Python and SWIG to name
-just a few. Without these fundamental works of dozens of developers,
-we wouldn't be where we are today.</p>
-</P>
-
-<p>The same is true for the many individuals that contributed bugfixes or
-larger portions of the code. Something that would be unthinkable with
-closed source software.</p>
-
-<p>In brief: &quot;Use the Source, Luke!&quot;<br>&nbsp;</p>
-
-
-<h3>Configuring Adonthell</h3>
-
-<p>The Adonthell configuration file is called 'adonthellrc' and located
-inside the Adonthell.app package. You can modify it with your favorite
-text editor. The available options and what they do are:</p>
-
-<ul>
-<li><b>Screen-mode</b><br>
-Whether Adonthell should run fullscreen or in windowed mode<br>
-0 = Windowed mode, 1 = Fullscreen mode<br>&nbsp;</li>
-
-<li><b>Double-size</b><br>
-Whether resolution should be scaled to 640x480 or not<br>
-0 = disable, 1 = enable<br>
-<br>
-Enabling double-size mode significantly increases CPU usage. On 
-old hardware you should consider turning this option off and run
-Adonthell in fullscreen mode instead.<br>&nbsp;</li>
-
-<li><b>Language [locale]</b><br>
-Specifies which language to use. As long as this option is unset,
-the language is determined by the system language.
- 
-<p>Of course, the game you run has to provide the translation you 
-chose here, otherwise you'll get the default (i.e. English) text.
-Languages available in this package:</p>
- 
-<table border="0" cellspacing="0" cellpadding="0">
-<tr><td width="100px"><i>Language</i></td><td><i>Locale</i></td></tr>
-<tr><td>Dutch</td><td>nl_NL</td></tr>
-<tr><td>English</td><td></td></tr>
-<tr><td>Italian</td><td>it_IT</td></tr>
-</table><br>
-
-If new languages become available, this will be announced on
-<a href="http://adonthell.linuxgames.com/";>our website</a>.
-<br>&nbsp;</li>
-
-<li><b>Font [font.ttf]</b><br>
-Specify a true type font to use in the game. If this is empty,
-the default font will be used. Chose a different one if you
-don't like it or if does not fit the language you've selected.
-<br>&nbsp;</li>
-
-<li><b>Quick-load</b><br>
-Whether the last saved game should be automatically continued at
-startup. Only works if at least one saved game exists.<br>
-0 = disable, 1 = enable<br>&nbsp;</li>
- 
-<li><b>Audio-channels</b><br>
-Whether sound should be mono or stereo<br>
-0 = Mono, 1 = Stereo<br>&nbsp;</li>
-
-<li><b>Audio-resolution</b><br>
-Whether audio output should be 8 or 16 bit<br>
-0 = 8 bit, 1 = 16 bit<br>&nbsp;</li>
-
-<li><b>Audio-sample-rate</b><br>
-0 = 11025 Hz, 1 = 22050 Hz, 2 = 44100 Hz<br>&nbsp;</li>
-
-<li><b>Audio-volume</b><br>
-The mixer setting, 0 - 100 %<br><br>
-Note that a value of 0 will turn audio completely off.<br>&nbsp;</li>
-</ul>
-
-<h3>Release Notes</h3>
-<p>The main purpose of this release is to attract new programmers, artists
-and writers in order to shorten the time until the next version.  So
-if you have experience in C++ (and optionally Python), or if you are
-good at computer graphics or writing we would like to hear from you. 
-Please have a look at our developer's corner</p>
-  
-<p style="margin-left:1cm"><a 
href="http://adonthell.linuxgames.com/development/";>http://adonthell.linuxgames.com/development/</a></p>
-
-<p>for further details.</p>
-
-<p>Adonthell - Waste's Edge, or v0.3 for short is no complete RPG. As the v0.3
-implies, the engine is far from being finished, although it should be
-free of severe bugs.  Missing features include combat, items and
-magic.  But you can interact with NPCs and the game world, and the
-internals enable us to create a basic plot, so v0.3 is actually
-playable!</p>
-
-<p>You're greatly invited to report us bugs, problems, or anything you 
-think we should know. Any feedback is appreciated, so don't hesitate!
-<br>&nbsp;</p>
-
-<h3>Contact</h3>
-
-<p>You can reach us in various ways:</p>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-<tr>
-<td>Email:</td>
-<td><a 
href="mailto:adonthell-proj...@linuxgames.com";>adonthell-proj...@linuxgames.com</a></td>
-</tr>
-<tr>
-<td>Mailing List:</td>
-<td><a 
href="mailto:adonthell-gene...@nongnu.org";>adonthell-gene...@nongnu.org</a></td>
-</tr>
-<tr>
-<td>Website:</td>
-<td><a 
href="http://adonthell.linuxgames.com";>http://adonthell.linuxgames.com</a></td>
-</tr>
-<tr>
-<td>Tech Support:</td>
-<td><a 
href="http://savannah.nongnu.org/support/?group_id=702";>http://savannah.nongnu.org/support/?group_id=702</a></td>
-</tr>
-</table>
-
-<p>There is a Message Board for user to user discussion at</p>
-
-<p style="margin-left:1cm"><a 
href="http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158";>http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158</a></p>
-
-<p>If you want to rate or comment on Adonthell, feel free to do so at</p>
-
-<p style="margin-left:1cm"><a 
href="http://www.happypenguin.org/show?Adonthell";>http://www.happypenguin.org/show?Adonthell</a><br>
-<a 
href="http://www.happypenguin.org/show?Adonthell";>http://www.freshmeat.net/projects/adonthell</a><br>&nbsp;</p>
-
-
-<h3>Reporting Bugs</h3>
-
-<p>We hope you'll never have to, but if you discover a problem, we would
-like to hear about it. Error messages that may help us to locate the bug can 
-be found in <a href="/var/tmp/console.log">/var/tmp/console.log</a>. You can 
-access this file from a terminal or via the Apple System Profiler. 
-Please use the <a href="mailto:adonthell-de...@nongnu.org";>Development mailing 
list</a> to contact us. Information on this and other mailing lists 
-is available at</p>
-
-<p style="margin-left:1cm"><a 
href="http://adonthell.linuxgames.com/contact/mailinglist.shtml";>http://adonthell.linuxgames.com/contact/mailinglist.shtml</a></p>
-
-<hr>
-Thank you for trying this software.<br>
-- The Adonthell team.
-</body>
-</html>
diff --git a/osx/background.png b/osx/background.png
new file mode 100644
index 0000000..3631a82
Binary files /dev/null and b/osx/background.png differ
diff --git a/osx/make_dmg.sh b/osx/make_dmg.sh
new file mode 100755
index 0000000..4a9fe3b
--- /dev/null
+++ b/osx/make_dmg.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+adonthell_exe="adonthell-0.3"
+
+# -- check arg
+if test "x$1" = "x" ; then
+  echo "Usage: $0 <path/to/Adonthell.App>"
+  exit 1
+fi
+
+if test ! -f $1"/Contents/MacOS/$adonthell_exe" ; then
+  echo "Error: $1 is not the expected App bundle"
+  exit 1
+fi
+
+# -- check working directory
+if [ ! -f "background.png" ]; then
+  echo "This script must be run in the wastesedge-0.3.x/osx directory"
+  exit 1
+fi
+
+# -- check dmgbuild
+if [ ! -x "$(command -v dmgbuild)" ]; then
+  echo "This script requires dmgbuild installed and in your PATH"
+  echo "See https://pypi.python.org/pypi/dmgbuild";
+  exit 1
+fi
+
+# -- get adonthell version
+adonthell_ver=`$1/Contents/MacOS/$adonthell_exe -v`
+
+# -- codesign Adonthell.App
+if [ ! -z "$CODESIGN_IDENTITY" ]; then
+  echo "Signing $1 as $CODESIGN_IDENTITY"
+  codesign -s "$CODESIGN_IDENTITY" --force --deep $1
+else
+  echo "CODESIGN_IDENTITY not defined. Will not sign Adonthell.app"
+fi
+
+echo "Creating wastesedge-osx-x86_64-$adonthell_ver.dmg (as root)"
+
+# -- clean up any __pycache__ directories before collecting package contents
+find $1 -name __pycache__ -execdir rm -rf __pycache__ \;
+
+sudo dmgbuild -s settings.py -Dapp=$1 "Adonthell - Waste's Edge" 
wastesedge-osx-x86_64-$adonthell_ver.dmg
+sudo chown $USER wastesedge-osx-x86_64-$adonthell_ver.dmg
+
+# -- codesign diskimage (requires OSX 10.11.4 or later)
+if [ ! -z "$CODESIGN_IDENTITY" ]; then
+  echo "Signing wastesedge-osx-x86_64-$adonthell_ver.dmg as $CODESIGN_IDENTITY"
+  codesign -s "$CODESIGN_IDENTITY" wastesedge-osx-x86_64-$adonthell_ver.dmg
+fi
diff --git a/osx/settings.py b/osx/settings.py
new file mode 100644
index 0000000..6f6055d
--- /dev/null
+++ b/osx/settings.py
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import biplist
+import os.path
+
+#
+# Example settings file for dmgbuild
+#
+
+# Use like this: dmgbuild -s settings.py "Test Volume" test.dmg
+
+# You can actually use this file for your own application (not just TextEdit)
+# by doing e.g.
+#
+#   dmgbuild -s settings.py -D app=/path/to/My.app "My Application" MyApp.dmg
+
+# .. Useful stuff 
..............................................................
+
+application = defines.get('app', '/Applications/TextEdit.app')
+appname = os.path.basename(application)
+
+def icon_from_app(app_path):
+    plist_path = os.path.join(app_path, 'Contents', 'Info.plist')
+    plist = biplist.readPlist(plist_path)
+    icon_name = plist['CFBundleIconFile']
+    icon_root,icon_ext = os.path.splitext(icon_name)
+    if not icon_ext:
+        icon_ext = '.icns'
+    icon_name = icon_root + icon_ext
+    return os.path.join(app_path, 'Contents', 'Resources', icon_name)
+
+# .. Basics 
....................................................................
+
+# Uncomment to override the output filename
+# filename = 'test.dmg'
+
+# Uncomment to override the output volume name
+# volume_name = 'Test'
+
+# Volume format (see hdiutil create -help)
+format = defines.get('format', 'UDBZ') 
+
+# Volume size (must be large enough for your files)
+size = defines.get('size', '25M')
+
+# Files to include
+files = [ application, '../User Manual.pdf' ]
+
+# Symlinks to create
+symlinks = { 'Applications': '/Applications' }
+
+# Volume icon
+#
+# You can either define icon, in which case that icon file will be copied to 
the
+# image, *or* you can define badge_icon, in which case the icon file you 
specify
+# will be used to badge the system's Removable Disk icon
+#
+#icon = '/path/to/icon.icns'
+badge_icon = icon_from_app(application)
+
+# Where to put the icons
+icon_locations = {
+    appname:        (60, 75),
+    'User Manual.pdf': (60, 210),
+    'Applications': (230, 75)
+    }
+
+# .. Window configuration 
......................................................
+
+# Background
+#
+# This is a STRING containing any of the following:
+#
+#    #3344ff          - web-style RGB color
+#    #34f             - web-style RGB color, short form (#34f == #3344ff)
+#    rgb(1,0,0)       - RGB color, each value is between 0 and 1
+#    hsl(120,1,.5)    - HSL (hue saturation lightness) color
+#    hwb(300,0,0)     - HWB (hue whiteness blackness) color
+#    cmyk(0,1,0,0)    - CMYK color
+#    goldenrod        - X11/SVG named color
+#    builtin-arrow    - A simple built-in background with a blue arrow
+#    /foo/bar/baz.png - The path to an image file
+#
+# The hue component in hsl() and hwb() may include a unit; it defaults to
+# degrees ('deg'), but also supports radians ('rad') and gradians ('grad'
+# or 'gon').
+#
+# Other color components may be expressed either in the range 0 to 1, or
+# as percentages (e.g. 60% is equivalent to 0.6).
+background = './background.png'
+
+show_status_bar = False
+show_tab_view = False
+show_toolbar = False
+show_pathbar = False
+show_sidebar = False
+sidebar_width = 180
+
+# Window position in ((x, y), (w, h)) format
+window_rect = ((100, 100), (320, 360))
+
+# Select the default view; must be one of
+#
+#    'icon-view'
+#    'list-view'
+#    'column-view'
+#    'coverflow'
+#
+default_view = 'icon-view'
+
+# General view configuration
+show_icon_preview = True
+
+# Set these to True to force inclusion of icon/list view settings (otherwise
+# we only include settings for the default view)
+include_icon_view_settings = True
+include_list_view_settings = False
+
+# .. Icon view configuration 
...................................................
+
+arrange_by = None
+grid_offset = (0, 0)
+grid_spacing = 80
+scroll_position = (0, 0)
+label_pos = 'bottom' # or 'right'
+text_size = 12
+icon_size = 60
+

_______________________________________________
Adonthell-commits mailing list
Adonthell-commits@nongnu.org
https://lists.nongnu.org/mailman/listinfo/adonthell-commits

Reply via email to