Skip to content

Commit

Permalink
bump luvi and add WIX build
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Phillips committed Apr 7, 2015
1 parent 9238f0d commit 40a1b14
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ set(APP_VENDOR "Rackspace")
set(APP_SUMMARY "Rackspace Monitoring Agent")
set(APP_CONTACT "monitoring@rackspace.com")

if (WIN32)
set(APP_NAME "${APP_NAME}.exe")
endif()

set(ENV{LUVI_APP} ".")
set(ENV{LUVI_MAIN} "contrib/printversion.lua")
execute_process(
Expand Down
8 changes: 7 additions & 1 deletion Make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GOTO :end

:lit
ECHO "Building lit"
PowerShell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://github.com/luvit/lit/raw/1.0.0/get-lit.ps1'))"
PowerShell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://github.com/luvit/lit/raw/1.0.3/get-lit.ps1'))"
copy lit.exe luvi.exe
GOTO :end

Expand All @@ -30,6 +30,12 @@ CALL Make.bat rackspace-monitoring-agent
virgo.exe
GOTO :end

:package
IF NOT EXIST rackspace-monitoring-agent.exe CALL Make.bat rackspace-monitoring-agent
cmake -H. -Bbuild
cmake --build build --target package
GOTO :end

:clean
IF EXIST rackspace-monitoring-agent.exe DEL /F /Q rackspace-monitoring-agent.exe
IF EXIST lit.exe DEL /F /Q lit.exe
Expand Down
4 changes: 4 additions & 0 deletions cmake/EnumerateSystem.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,7 @@ if(UNIX)
set(SPECIFIC_SYSTEM_VERSION_NAME "${SPECIFIC_SYSTEM_VERSION_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
set(SPECIFIC_COMPILER_NAME "")
endif(UNIX)

if(WIN32)
set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "WIX")
endif()

0 comments on commit 40a1b14

Please sign in to comment.