Deploy Mac TigerVNC Viewer as an application bundle instead of a package, and consolidate all of the installer scripts under release/ and cmake/

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4538 3789f03b-4d11-0410-bbf8-ca57d06f2519

2 files changed, 0 insertions, 102 deletions

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 .)
diff --git a/win/installer/tigervnc.iss.in b/win/installer/tigervnc.iss.in
deleted file mode 100644
index a428e5e6..00000000
--- a/win/installer/tigervnc.iss.in
+++ /dev/null
@@ -1,63 +0,0 @@
-[Setup]
-#ifdef WIN64
-ArchitecturesInstallIn64BitMode=x64
-AppName=TigerVNC 64-bit
-AppVerName=TigerVNC 64-bit @VERSION@ (@BUILD@)
-#else
-AppName=TigerVNC
-AppVerName=TigerVNC v@VERSION@ (@BUILD@)
-#endif
-AppVersion=@VERSION@
-AppPublisher=TigerVNC project
-AppPublisherURL=http://tigervnc.org
-DefaultDirName={pf}\TigerVNC
-#ifdef WIN64
-DefaultGroupName=TigerVNC 64-bit
-#else
-DefaultGroupName=TigerVNC
-#endif
-LicenseFile=@CMAKE_SOURCE_DIR@\LICENCE.txt
-
-[Files]
-#ifdef BUILD_WINVNC
-Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\{#BUILD_DIR}winvnc4.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; 
-Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\{#BUILD_DIR}wm_hooks.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; 
-Source: "@CMAKE_CURRENT_BINARY_DIR@\win\vncconfig\{#BUILD_DIR}vncconfig.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; 
-#endif
-Source: "@CMAKE_CURRENT_BINARY_DIR@\vncviewer\{#BUILD_DIR}vncviewer.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; 
-Source: "@CMAKE_SOURCE_DIR@\win\README_BINARY.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "@CMAKE_SOURCE_DIR@\LICENCE.txt"; DestDir: "{app}"; Flags: ignoreversion
-#ifdef HAVE_GNUTLS
-Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgnutls-*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgcrypt-*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libtasn1-*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgpg-error-*.dll"; DestDir: "{app}"; Flags: ignoreversion
-#endif
-
-
-[Icons]
-Name: "{group}\TigerVNC Viewer"; FileName: "{app}\vncviewer.exe";
-Name: "{group}\Listening TigerVNC Viewer"; FileName: "{app}\vncviewer.exe"; Parameters: "-listen";
-
-#ifdef BUILD_WINVNC
-Name: "{group}\VNC Server (User-Mode)\Run VNC Server"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole";
-Name: "{group}\VNC Server (User-Mode)\Configure VNC Server"; FileName: "{app}\vncconfig.exe"; Parameters: "-user";
-
-Name: "{group}\VNC Server (Service-Mode)\Configure VNC Service"; FileName: "{app}\vncconfig.exe"; Parameters: "-noconsole -service";
-Name: "{group}\VNC Server (Service-Mode)\Register VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-register";
-Name: "{group}\VNC Server (Service-Mode)\Unregister VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-unregister";
-Name: "{group}\VNC Server (Service-Mode)\Start VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -start";
-Name: "{group}\VNC Server (Service-Mode)\Stop VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -stop";
-#endif
-Name: "{group}\License"; FileName: "{app}\LICENCE.txt";
-Name: "{group}\Uninstall TigerVNC"; FileName: "{uninstallexe}"; WorkingDir: "{app}";
-
-#ifdef BUILD_WINVNC
-[Tasks]
-Name: installservice; Description: "&Register new TigerVNC Server as a system service"; GroupDescription: "Server configuration:"; 
-Name: startservice; Description: "&Start or restart TigerVNC service"; GroupDescription: "Server configuration:";
-
-[Run]
-Filename: "{app}\winvnc4.exe"; Parameters: "-register"; Tasks: installservice
-Filename: "net"; Parameters: "start winvnc4"; Tasks: startservice
-#endif