15 files changed, 200 insertions, 492 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 081eaea1..5ae261de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,7 +309,6 @@ add_subdirectory(common)
 
 if(WIN32)
   add_subdirectory(win)
-  include(win/installer/BuildInstaller.cmake)
 else()
   # No interest in building x related parts on Apple
   if(NOT APPLE)
@@ -323,3 +322,5 @@ if(BUILD_NEW_VNCVIEWER)
   endif()
   add_subdirectory(vncviewer)
 endif()
+
+include(cmake/BuildPackages.cmake)
diff --git a/cmake/BuildPackages.cmake b/cmake/BuildPackages.cmake
new file mode 100644
index 00000000..1493b5e3
--- /dev/null
+++ b/cmake/BuildPackages.cmake
@@ -0,0 +1,76 @@
+# This file is included from the top-level CMakeLists.txt.  We just store it
+# here to avoid cluttering up that file.
+
+
+#
+# Windows installer (Inno Setup)
+#
+
+if(WIN32)
+
+if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+  set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
+  set(INST_DEFS -DWIN64)
+else()
+  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
+endif()
+
+if(MSVC_IDE)
+  set(INSTALLERDIR "$(OutDir)")
+  set(BUILDDIRDEF "-DBUILD_DIR=${INSTALLERDIR}\\")
+else()
+  set(INSTALLERDIR .)
+  set(BUILDDIRDEF "-DBUILD_DIR=")
+endif()
+
+set(INST_DEPS vncviewer)
+
+if(BUILD_WINVNC)
+  set(INST_DEFS ${INST_DEFS} -DBUILD_WINVNC)
+  set(INST_DEPS ${INST_DEPS} winvnc4 wm_hooks vncconfig)
+endif()
+
+if(GNUTLS_FOUND)
+  set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
+endif()
+
+configure_file(release/tigervnc.iss.in release/tigervnc.iss)
+
+add_custom_target(installer
+  iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME}
+    release/tigervnc.iss
+  DEPENDS ${INST_DEPS}
+  SOURCES release/tigervnc.iss)
+
+endif() # WIN32
+
+
+#
+# Mac DMG
+#
+
+if(APPLE)
+
+set(DEFAULT_OSX_X86_BUILD ${CMAKE_SOURCE_DIR}/osxx86)
+set(OSX_X86_BUILD ${DEFAULT_OSX_X86_BUILD} CACHE PATH
+  "Directory containing 32-bit OS X build to include in universal binaries (default: ${DEFAULT_OSX_X86_BUILD})")
+
+configure_file(release/makemacapp.in release/makemacapp)
+configure_file(release/Info.plist.in release/Info.plist)
+
+add_custom_target(dmg sh release/makemacapp
+  DEPENDS vncviewer
+  SOURCES release/makemacapp)
+
+add_custom_target(udmg sh release/makemacapp universal
+  DEPENDS vncviewer
+  SOURCES release/makemacapp)
+
+endif() # APPLE
+
+
+#
+# Common
+#
+
+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.txt DESTINATION .)
diff --git a/release/Info.plist.in b/release/Info.plist.in
new file mode 100644
index 00000000..ae4fe009
--- /dev/null
+++ b/release/Info.plist.in
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>TigerVNC Viewer</string>
+	<key>CFBundleGetInfoString</key>
+	<string>@VERSION@, Copyright © 1998-2011 [many holders]</string>
+	<key>CFBundleIconFile</key>
+	<string>tigervnc.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.tigervnc.tigervnc</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>TigerVNC Viewer @VERSION@</string>
+	<key>CFBundleName</key>
+	<string>TigerVNC Viewer</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@VERSION@</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION@f@BUILD@</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 1998-2011 [many holders]</string>
+</dict>
+</plist>
diff --git a/release/Info.plist.tmpl b/release/Info.plist.tmpl
deleted file mode 100644
index c3e9de47..00000000
--- a/release/Info.plist.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleGetInfoString</key>
-	<string>{__VERSION}, The TigerVNC Project</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.tigervnc.tigervnc</string>
-	<key>CFBundleShortVersionString</key>
-	<string>{__VERSION}</string>
-	<key>IFMajorVersion</key>
-	<integer>1</integer>
-	<key>IFMinorVersion</key>
-	<integer>{__BUILD}</integer>
-	<key>IFPkgFlagAllowBackRev</key>
-	<false/>
-	<key>IFPkgFlagAuthorizationAction</key>
-	<string>AdminAuthorization</string>
-	<key>IFPkgFlagBackgroundAlignment</key>
-	<string>topleft</string>
-	<key>IFPkgFlagBackgroundScaling</key>
-	<string>none</string>
-	<key>IFPkgFlagDefaultLocation</key>
-	<string>/</string>
-	<key>IFPkgFlagFollowLinks</key>
-	<true/>
-	<key>IFPkgFlagInstallFat</key>
-	<false/>
-	<key>IFPkgFlagIsRequired</key>
-	<false/>
-	<key>IFPkgFlagOverwritePermissions</key>
-	<false/>
-	<key>IFPkgFlagRelocatable</key>
-	<false/>
-	<key>IFPkgFlagRestartAction</key>
-	<string>NoRestart</string>
-	<key>IFPkgFlagRootVolumeOnly</key>
-	<true/>
-	<key>IFPkgFlagUpdateInstalledLanguages</key>
-	<false/>
-	<key>IFPkgFormatVersion</key>
-	<real>0.10000000149011612</real>
-</dict>
-</plist>
diff --git a/release/License.rtf b/release/License.rtf
deleted file mode 100644
index 3f84854f..00000000
--- a/release/License.rtf
+++ /dev/null
@@ -1,164 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww16060\viewh9900\viewkind0
-\deftab720
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-
-\f0\fs24 \cf0 GNU GENERAL PUBLIC LICENSE\
-Version 2, June 1991\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 Preamble\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 \
-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.\
-\
-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.\
-\
-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.\
-\
-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.\
-\
-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.\
-\
-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.\
-\
-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.\
-\
-The precise terms and conditions for copying, distribution and modification follow.\
-\page \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 GNU GENERAL PUBLIC LICENSE\
-TERMS AND CONDITIONS FOR COPYING,\
-DISTRIBUTION AND MODIFICATION\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 \
-0. 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".\
-\
-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.\
-\
-1. 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.\
-\
-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.\
-\
-2. 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:\
-\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ql\qnatural
-\cf0 a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\
-\
-b) 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.\
-\
-c) 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.)\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ri0\ql\qnatural
-\cf0 \page \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 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.\
-\
-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.\
-\
-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.\
-\
-3. 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:\
-\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ql\qnatural
-\cf0 a) 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,\
-\
-b) 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,\
-\
-c) 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.)\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ri0\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 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.\
-\
-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.\
-\page \
-4. 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.\
-\
-5. 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.\
-\
-6. 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.\
-\
-7. 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.\
-\
-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.\
-\
-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.\
-\
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\
-\page \
-8. 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.\
-\
-9. 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.\
-\
-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.\
-\
-10. 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.\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 NO WARRANTY\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 11. 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.\
-\
-12. 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.\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\qc
-\cf0 END OF TERMS AND CONDITIONS\
-\page \
-Appendix: How to Apply These Terms to Your New Programs\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 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.\
-\
-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.\
-\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ql\qnatural
-\cf0 <one line to give the program's name and a brief idea of what it does.>\
-Copyright (C) 19yy  <name of author>\
-\
-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.\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ri0\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 Also add information on how to contact you by electronic and paper mail.\
-\
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\
-\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ql\qnatural
-\cf0 Gnomovision version 69, Copyright (C) 19yy name of author\
-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.\
-\pard\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\tx10080\pardeftab720\li1440\ri0\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License.  Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.\
-\
-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:\
-\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ql\qnatural
-\cf0 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.\
-\
-<signature of Ty Coon>, 1 April 1989\
-Ty Coon, President of Vice\
-\pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9360\pardeftab720\li720\ri0\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\cf0 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.\
-\
-}
-\ No newline at end of file
diff --git a/release/README.txt b/release/README.txt
new file mode 100644
index 00000000..3db4db4e
--- /dev/null
+++ b/release/README.txt
@@ -0,0 +1,15 @@
+Virtual Network Computing (VNC) is a remote display system which allows you to
+view and interact with a virtual desktop environment that is running on another
+computer on the network.  Using VNC, you can run graphical applications on a
+remote machine and send only the display from these applications to your local
+machine.  VNC is platform-independent and supports a wide variety of operating
+systems and architectures as both servers and clients.  This package contains a
+client which will allow you to connect to a VNC server.
+
+TigerVNC is a high-speed version of VNC based on the RealVNC 4 and X.org code
+bases.  TigerVNC started as a next-generation development effort for TightVNC
+on Unix and Linux platforms, but it split from its parent project in early 2009
+so that TightVNC could focus on Windows platforms.  TigerVNC supports a variant
+of Tight encoding that is greatly accelerated by the use of the libjpeg-turbo
+JPEG codec.  TigerVNC has replaced RealVNC in the Fedora Project, and there are
+long-term plans for it to replace TurboVNC in the VirtualGL Project as well.
diff --git a/release/ReadMe.rtf b/release/ReadMe.rtf
deleted file mode 100644
index 9fadf3e2..00000000
--- a/release/ReadMe.rtf
+++ /dev/null
@@ -1,21 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww15200\viewh9600\viewkind0
-\deftab720
-\pard\pardeftab720\ql\qnatural
-
-\f0\fs24 \cf0 Virtual Network Computing (VNC) is a remote display system which allows you to view and interact with a virtual desktop environment that is running on another computer on the network.  Using VNC, you can run graphical applications on a remote machine and send only the display from these applications to your local machine.  VNC is platform-independent and supports a wide variety of operating systems and architectures as both servers and clients.  This package contains a client which will allow you to connect to a VNC server.\
-\
-TigerVNC is a high-speed version of VNC based on the RealVNC 4 and X.org code bases.  TigerVNC started as a next-generation development effort for TightVNC on Unix and Linux platforms, but it split from its parent project in early 2009 so that TightVNC could focus on Windows platforms.  TigerVNC supports a variant of Tight encoding that is greatly accelerated by the use of the libjpeg-turbo JPEG codec.  TigerVNC has replaced RealVNC in the Fedora Project, and there are long-term plans for it to replace TurboVNC in the VirtualGL Project as well.\
-\
-The Macintosh X11 application must be installed and started prior to using the TigerVNC Viewer.\
-\
-\pard\pardeftab720\ql\qnatural
-
-\f1 \cf0   man -M /opt/TigerVNC/man vncviewer\
-\
-\pard\pardeftab720\ql\qnatural
-
-\f0 \cf0 displays detailed usage information.\
-}
-\ No newline at end of file
diff --git a/release/Welcome.rtf b/release/Welcome.rtf
deleted file mode 100755
index 109211c3..00000000
--- a/release/Welcome.rtf
+++ /dev/null
@@ -1,15 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww9000\viewh8400\viewkind0
-\deftab720
-\pard\pardeftab720\ql\qnatural
-
-\f0\fs24 \cf0 This installer will install the TigerVNC Viewer for Intel-based Macintosh computers. To remove TigerVNC, you can either use the "Uninstall" application, which can be found in the same archive as this package, or you can run\
-\
-
-\f1   /opt/TigerVNC/bin/uninstall\
-
-\f0 \
-from the command line.\
-}
-\ No newline at end of file
diff --git a/release/makemacapp.in b/release/makemacapp.in
new file mode 100644
index 00000000..d8470860
--- /dev/null
+++ b/release/makemacapp.in
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+TMPDIR=
+
+onexit()
+{
+	if [ ! "$TMPDIR" = "" ]; then
+		rm -rf $TMPDIR
+	fi
+}
+
+usage()
+{
+	echo "$0 [universal]"
+	exit 1
+}
+
+UNIVERSAL=0
+
+PACKAGE_NAME=TigerVNC
+VERSION=@VERSION@
+BUILD=@BUILD@
+SRCDIR=@CMAKE_SOURCE_DIR@
+BUILDDIR32=@OSX_X86_BUILD@
+if [ $# -gt 0 ]; then
+	if [ "$1" = "universal" ]; then
+		UNIVERSAL=1
+	fi
+fi
+
+if [ -f $PACKAGE_NAME.dmg ]; then
+	rm -f $PACKAGE_NAME.dmg
+fi
+
+umask 022
+TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
+APPROOT="$TMPDIR/dmg/TigerVNC Viewer $VERSION.app"
+mkdir -p "$APPROOT/Contents/MacOS"
+mkdir -p "$APPROOT/Contents/Resources"
+
+install -m 755 vncviewer/vncviewer "$APPROOT/Contents/MacOS/TigerVNC Viewer"
+if [ $UNIVERSAL = 1 ]; then
+	if [ ! -d $BUILDDIR32 ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
+		exit 1
+	fi
+	if [ ! -f $BUILDDIR32/Makefile ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 is not configured
+		exit 1
+	fi
+	pushd $BUILDDIR32
+	make
+	popd
+	lipo -create -arch i386 $BUILDDIR32/vncviewer/vncviewer -arch x86_64 \
+		"$APPROOT/Contents/MacOS/TigerVNC Viewer" \
+		-output "$APPROOT/Contents/MacOS/TigerVNC Viewer"
+fi
+install -m 644 $SRCDIR/release/tigervnc.icns "$APPROOT/Contents/Resources/"
+install -m 644 release/Info.plist "$APPROOT/Contents/"
+
+install -m 644 $SRCDIR/LICENCE.txt $TMPDIR/dmg/
+install -m 644 $SRCDIR/release/README.txt $TMPDIR/dmg/
+
+hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \
+	-srcfolder "$TMPDIR/dmg" \
+	$TMPDIR/$PACKAGE_NAME-$VERSION.dmg 
+cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . 
+
+exit
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
deleted file mode 100644
index 4465be0d..00000000
--- a/release/makemacpkg.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-TMPDIR=
-
-onexit()
-{
-	if [ ! "$TMPDIR" = "" ]; then
-		sudo rm -rf $TMPDIR
-	fi
-}
-
-usage()
-{
-	echo "$0 [universal [32-bit build dir]]"
-	exit 1
-}
-
-UNIVERSAL=0
-
-PACKAGE_NAME=TigerVNC
-VERSION=@VERSION@
-BUILD=@BUILD@
-SRCDIR=@srcdir@
-BUILDDIR32=@srcdir@/osxx86
-if [ $# -gt 0 ]; then
-	if [ "$1" = "universal" ]; then
-		UNIVERSAL=1
-		if [ $# -gt 1 ]; then BUILDDIR32=$2; fi
-	fi
-fi
-PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
-
-if [ -f $PACKAGE_NAME.dmg ]; then
-	rm -f $PACKAGE_NAME.dmg
-fi
-
-umask 022
-TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
-PKGROOT=$TMPDIR/pkg/Package_Root
-mkdir -p $PKGROOT/opt/$PACKAGE_NAME/bin
-mkdir -p $PKGROOT/opt/$PACKAGE_NAME/man/man1
-
-install -m 755 unix/vncviewer/vncviewer $PKGROOT/opt/$PACKAGE_NAME/bin/
-
-if [ $UNIVERSAL = 1 ]; then
-	if [ ! -d $BUILDDIR32 ]; then
-		echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
-		exit 1
-	fi
-	if [ ! -f $BUILDDIR32/Makefile ]; then
-		echo ERROR: 32-bit build directory $BUILDDIR32 is not configured
-		exit 1
-	fi
-	pushd $BUILDDIR32
-	make
-	popd
-	lipo -create -arch i386 $BUILDDIR32/unix/vncviewer/vncviewer -arch x86_64 \
-		$PKGROOT/opt/$PACKAGE_NAME/bin/vncviewer \
-		-output $PKGROOT/opt/$PACKAGE_NAME/bin/vncviewer
-fi
-
-mkdir -p $PKGROOT/Library/Documentation/$PACKAGE_NAME
-chmod 1775 $PKGROOT/Library
-chmod 775 $PKGROOT/Library/Documentation 
-mkdir -p $TMPDIR/pkg/Resources 
-
-(cat $SRCDIR/release/Description.plist.tmpl | sed s/{__VERSION}/$VERSION/g \
-	| sed s/{__APPNAME}/$PACKAGE_NAME/g \
-	> $TMPDIR/pkg/Description.plist) 
-(cat $SRCDIR/release/Info.plist.tmpl | sed s/{__VERSION}/$VERSION/g	\
-	| sed s/{__BUILD}/$BUILD/g > $TMPDIR/pkg/Info.plist) 
-(cat $SRCDIR/release/uninstall.sh.tmpl \
-	| sed s/{__APPNAME}/$PACKAGE_NAME/g \
-	> $PKGROOT/opt/$PACKAGE_NAME/bin/uninstall) 
-chmod 755 $PKGROOT/opt/$PACKAGE_NAME/bin/uninstall
-
-install -m 644 $SRCDIR/unix/vncviewer/vncviewer.man $PKGROOT/opt/$PACKAGE_NAME/man/man1/vncviewer.1
-install -m 644 $SRCDIR/LICENCE.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/
-
-sudo chown -R root:admin $PKGROOT 
-cp $SRCDIR/release/License.rtf $SRCDIR/release/Welcome.rtf $SRCDIR/release/ReadMe.rtf $TMPDIR/pkg/Resources/ 
-
-mkdir $TMPDIR/dmg
-$PACKAGEMAKER -build -v -p $TMPDIR/dmg/$PACKAGE_NAME.pkg \
-	-f $PKGROOT -r $TMPDIR/pkg/Resources \
-	-i $TMPDIR/pkg/Info.plist -d $TMPDIR/pkg/Description.plist 
-install -m 644 $SRCDIR/release/uninstall.applescript $TMPDIR 
-sudo osacompile -t APPL -o "$TMPDIR/dmg/Uninstall.app" $TMPDIR/uninstall.applescript 
-sudo chown -R $USER "$TMPDIR/dmg/Uninstall.app" 
-hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \
-	-srcfolder "$TMPDIR/dmg" \
-	$TMPDIR/$PACKAGE_NAME-$VERSION.dmg 
-cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . 
-
-exit
diff --git a/release/tigervnc.icns b/release/tigervnc.icns
new file mode 100644
index 00000000..5d98f139
--- /dev/null
+++ b/release/tigervnc.icns
diff --git a/win/installer/tigervnc.iss.in b/release/tigervnc.iss.in
index a428e5e6..a428e5e6 100644
--- a/win/installer/tigervnc.iss.in
+++ b/release/tigervnc.iss.in
diff --git a/release/uninstall.applescript b/release/uninstall.applescript
deleted file mode 100644
index e54c72c0..00000000
--- a/release/uninstall.applescript
+++ /dev/null
@@ -1,45 +0,0 @@
--- Copyright (C)2010 D. R. Commander
--- Copyright (C)2009 Sun Microsystems, Inc.
---
--- This library is free software and may be redistributed and/or modified under
--- the terms of the wxWindows Library License, Version 3.1 or (at your option)
--- any later version.  The full license is in the LICENSE.txt file included
--- with this distribution.
---
--- This library 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
--- wxWindows Library License for more details.
-
-set disk to (path to startup disk) as string
-set tmpfile to path to temporary items from user domain
-set tmpfile to POSIX path of tmpfile & "tigervnc_uninstall.log"
-set uninstaller to disk & "opt:tigervnc:bin:uninstall"
-set uninstaller to "sh " & POSIX path of uninstaller & " 2>&1 >" & tmpfile
-set success to 0
-
-display dialog "You are about to uninstall TigerVNC.  Proceed?" buttons {"Yes", "No"} default button "No"
-
-if button returned of result is "Yes" then
-	try
-		do shell script (uninstaller) with administrator privileges
-		set success to 1
-	on error errstr number errnum
-		if errnum is -128 then
-			display dialog "Uninstall aborted." buttons {"OK"}
-		else if errnum is 255 then
-			set errmsg to "The uninstall script could not remove some of the files or directories installed by the TigerVNC package.  Consult:" & return & return & tmpfile & return & return & "for more details."
-			display dialog errmsg buttons {"OK"} default button "OK" with icon caution
-		else if errnum is 127 then
-			display dialog "Could not find the TigerVNC uninstall script.  The TigerVNC package may have already been uninstalled." buttons {"OK"} default button "OK" with icon stop
-		else
-			set errmsg to "ERROR " & errnum & ": " & errstr
-			display dialog errmsg buttons {"OK"} default button "OK" with icon stop
-		end if
-	end try
-	if success is 1 then
-		display dialog "TigerVNC has been successfully uninstalled." buttons {"OK"}
-	end if
-else
-	display dialog "Uninstall aborted." buttons {"OK"}
-end if
diff --git a/release/uninstall.sh.tmpl b/release/uninstall.sh.tmpl
deleted file mode 100644
index 490a71e4..00000000
--- a/release/uninstall.sh.tmpl
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (C)2009-2011 D. R. Commander
-# Copyright (C)2009 Sun Microsystems, Inc.
-#
-# This library is free software and may be redistributed and/or modified under
-# the terms of the wxWindows Library License, Version 3.1 or (at your option)
-# any later version.  The full license is in the LICENSE.txt file included
-# with this distribution.
-#
-# This library 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
-# wxWindows Library License for more details.
-
-#!/bin/sh
-
-error()
-{
-	echo $1
-	exit -1
-}
-
-if [ ! "`id -u`" = "0" ]; then
-	error "This command must be run as root"
-fi
-
-PKGNAME={__APPNAME}
-MACPKGNAME=com.tigervnc.tigervnc
-RCPT=/Library/Receipts/$PKGNAME.pkg
-
-LSBOM=
-if [ -d $RCPT ]; then
-	LSBOM='lsbom -s -f -l '$RCPT'/Contents/Archive.bom'
-else
-	LSBOM='pkgutil --files '$MACPKGNAME
-fi
-
-echo Removing files ...
-$LSBOM >/dev/null || error "Could not list package contents"
-RETCODE=0
-PWD=`pwd`
-cd /
-$LSBOM | while read line; do
-	if [ ! -d "$line" ]; then rm "$line" 2>&1 || RETCODE=-1; fi
-done
-cd $PWD
-
-echo Removing directories ...
-rmdir /opt/$PKGNAME/bin 2>&1 || RETCODE=-1
-rmdir /opt/$PKGNAME/man/man1 2>&1 || RETCODE=-1
-rmdir /opt/$PKGNAME/man 2>&1 || RETCODE=-1
-rmdir /opt/$PKGNAME 2>&1 || RETCODE=-1
-rmdir /Library/Documentation/$PKGNAME 2>&1 || RETCODE=-1
-
-if [ -d $RCPT ]; then
-	echo Removing package receipt $RCPT ...
-	rm -r $RCPT 2>&1 || RETCODE=-1
-else
-	echo Forgetting package $MACPKGNAME
-	pkgutil --forget $MACPKGNAME
-fi
-
-exit $RETCODE
diff --git a/win/installer/BuildInstaller.cmake b/win/installer/BuildInstaller.cmake
deleted file mode 100644
index dfb44e8c..00000000
--- a/win/installer/BuildInstaller.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is included from the top-level CMakeLists.txt.  We just store it
-# here to avoid cluttering up that file.
-
-# Detect a 64-bit build and give that installer a different name
-if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-  set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
-  set(INST_DEFS -DWIN64)
-else()
-  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
-endif()
-
-if(MSVC_IDE)
-  set(INSTALLERDIR "$(OutDir)")
-  set(BUILDDIRDEF "-DBUILD_DIR=${INSTALLERDIR}\\")
-else()
-  set(INSTALLERDIR .)
-  set(BUILDDIRDEF "-DBUILD_DIR=")
-endif()
-
-set(INST_DEPS vncviewer)
-
-if(BUILD_WINVNC)
-  set(INST_DEFS ${INST_DEFS} -DBUILD_WINVNC)
-  set(INST_DEPS ${INST_DEPS} winvnc4 wm_hooks vncconfig)
-endif()
-
-if(GNUTLS_FOUND)
-  set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
-endif()
-
-configure_file(win/installer/tigervnc.iss.in tigervnc.iss)
-
-add_custom_target(installer
-  iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME} tigervnc.iss
-  DEPENDS ${INST_DEPS}
-  SOURCES tigervnc.iss)
-
-install(FILES ${CMAKE_SOURCE_DIR}/win/README_BINARY.txt
-  ${CMAKE_SOURCE_DIR}/LICENCE.txt DESTINATION .)