Revision: 4316
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4316&view=rev
Author: ossman_
Date: 2011-03-03 12:32:15 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Consolidate all the Windows installer stuff to its own directory.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/win/CMakeLists.txt
Added Paths:
-----------
trunk/win/installer/
trunk/win/installer/CMakeLists.txt
trunk/win/installer/tigervnc.iss.in
Removed Paths:
-------------
trunk/win/tigervnc.iss.in
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-03-03 10:42:14 UTC (rev 4315)
+++ trunk/CMakeLists.txt 2011-03-03 12:32:15 UTC (rev 4316)
@@ -125,40 +125,3 @@
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 .)
Modified: trunk/win/CMakeLists.txt
===================================================================
--- trunk/win/CMakeLists.txt 2011-03-03 10:42:14 UTC (rev 4315)
+++ trunk/win/CMakeLists.txt 2011-03-03 12:32:15 UTC (rev 4316)
@@ -4,7 +4,10 @@
add_subdirectory(rfb_win32)
add_subdirectory(vncviewer)
+
if(BUILD_WINVNC)
add_subdirectory(vncconfig)
add_subdirectory(winvnc)
endif()
+
+add_subdirectory(installer)
Property changes on: trunk/win/installer
___________________________________________________________________
Added: svn:ignore
+ CMakeFiles
Makefile
tigervnc.iss
cmake_install.cmake
Added: trunk/win/installer/CMakeLists.txt
===================================================================
--- trunk/win/installer/CMakeLists.txt (rev 0)
+++ trunk/win/installer/CMakeLists.txt 2011-03-03 12:32:15 UTC (rev 4316)
@@ -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 .)
Copied: trunk/win/installer/tigervnc.iss.in (from rev 4313,
trunk/win/tigervnc.iss.in)
===================================================================
--- trunk/win/installer/tigervnc.iss.in (rev 0)
+++ trunk/win/installer/tigervnc.iss.in 2011-03-03 12:32:15 UTC (rev 4316)
@@ -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
Deleted: trunk/win/tigervnc.iss.in
===================================================================
--- trunk/win/tigervnc.iss.in 2011-03-03 10:42:14 UTC (rev 4315)
+++ trunk/win/tigervnc.iss.in 2011-03-03 12:32:15 UTC (rev 4316)
@@ -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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
