Consolidate all the Windows installer stuff to its own directory.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 112aa8d26d86fa8994f645fb5a1478945bf2831f..e855c407fe1de6760481a26bcfa60008cf2d1e1b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,40 +125,3 @@ add_definitions(-D_WIN32_IE=0x0500 -D_WIN32_WINNT=0x0500)
 
 add_subdirectory(common)
 add_subdirectory(win)
-
-
-#
-# Installer
-#
-
-if(64BIT)
-  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()
-
-configure_file(win/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/CMakeLists.txt b/win/CMakeLists.txt
index 103520aa85e2b010713ec0c1aab9c9e766dd4a08..ab311aeede2f0770d5b07ef762ec52d1ccf7e87e 100644 (file)
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -4,7 +4,10 @@ configure_file(resdefs.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h)
 
 add_subdirectory(rfb_win32)
 add_subdirectory(vncviewer)
+
 if(BUILD_WINVNC)
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
 endif()
+
+add_subdirectory(installer)

diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0324fe4
--- /dev/null
+++ b/win/installer/CMakeLists.txt
@@ -0,0 +1,31 @@
+if(64BIT)
+  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()
+
+configure_file(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
new file mode 100644 (file)
index 0000000..2d967a4
--- /dev/null
+++ b/win/installer/tigervnc.iss.in
@@ -0,0 +1,57 @@
+[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@\win\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
+
+
+[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

diff --git a/win/tigervnc.iss.in b/win/tigervnc.iss.in
deleted file mode 100644 (file)
index 2d967a4..0000000
--- a/win/tigervnc.iss.in
+++ /dev/null
@@ -1,57 +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@\win\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
-
-
-[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