Merge pull request #11 from ctuning/cmake-installer

Automatic installer generation

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+project(ck-crowdnode)
+
 set(SRC
         src/net_uuid.h
         src/net_uuid.c
@@ -19,12 +21,24 @@ IF(WIN32)
 
     target_link_libraries(ck-crowdnode-server ws2_32)
 
-    set(CPACK_GENERATOR WIX)
+    install( TARGETS ck-crowdnode-server RUNTIME DESTINATION bin COMPONENT Applications)
+
+    include(InstallRequiredSystemLibraries)
+
+    set(CPACK_GENERATOR NSIS)
     set(CPACK_PACKAGE_NAME "ck-crowdnode-server")
+    set(CPACK_PACKAGE_VENDOR "cTuning.org")
     set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CK crowd-node server")
     set(CPACK_PACKAGE_VERSION "0.0.1")
-
-    INCLUDE(CPack)
+    set(CPACK_PACKAGE_VERSION_MAJOR "0")
+    set(CPACK_PACKAGE_VERSION_MINOR "0")
+    set(CPACK_PACKAGE_VERSION_PATCH "1")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "CK crowd-node server")
+    set(CPACK_NSIS_MODIFY_PATH ON)
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}\\\\LICENSE.txt")
+    set(CPACK_PACKAGE_EXECUTABLES ck-crowdnode-server "CK crowd-node server")
+
+    include(CPack)
 
 ELSE(WIN32)
     target_link_libraries(ck-crowdnode-server m)

README.md

@@ -27,10 +27,24 @@ Relatively stable - testing phase
 
 Usage: server side
 ==================
-Install and start latest version of ck-crowdnode-server 
-using "release\setup.exe". Write down "[INFO for CK client]" - 
-you will require this info to configure this target machine 
-on a client.
+On Windows:
+
+1. Download the installer from [Appveyor](https://ci.appveyor.com/project/gfursin/ck-crowdnode/build/artifacts)
+
+2. Install and start "CK crowd-node server".
+
+3. Write down "[INFO for CK client]" - you will require this info to configure this target machine on a client.
+
+Alternatively, you can build it manually (you'll need CMake and Visual Studio):
+
+```
+mkdir build
+cd build
+cmake ..
+cmake --build . --config Release --target PACKAGE
+```
+
+Now, you should be able to run `build/Release/ck-crowdnode-server.exe`.
 
 Usage: client side
 ==================

appveyor.yml

@@ -8,15 +8,10 @@ build_script:
     - mkdir build
     - cd build
     - cmake ..
-    # - msbuild /p:Configuration=Release /p:Platform=Win32 C:/projects/ck-crowdnode/build/Project.sln
     - cmake --build . --config Release --target PACKAGE
-    - cp Release/ck-crowdnode-server.exe .
     - cd ..
-    - "%PYTHON%/python.exe -m run_tests.py"
+    - "%PYTHON%/python.exe -m run_tests.py --server_executable build/Release/ck-crowdnode-server.exe"
 
 artifacts:
-    - path: build/Release/ck-crowdnode-server.exe
-      name: CK Crowdnode Server Executable
-
-    - path: build/*.msi
+    - path: build/*.exe
       name: CK Crowdnode Server installer