diff --git a/CMakeLists.txt b/CMakeLists.txt index bb38fec2a0d72c68b1c54dc92badc7b7ccb26981..dd23218f08ecf6e70f0e60fb19dcd092fa3c7f20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ PROJECT(OpenViBE) # These versions are used by the subprojects by default. # If you wish to maintain specific version numbers for a subproject, please do so in the projects CMakeLists.txt -SET(OV_GLOBAL_VERSION_MAJOR 1) -SET(OV_GLOBAL_VERSION_MINOR 3) -SET(OV_GLOBAL_VERSION_PATCH 0+git) +SET(OV_GLOBAL_VERSION_MAJOR 2) +SET(OV_GLOBAL_VERSION_MINOR 0) +SET(OV_GLOBAL_VERSION_PATCH 0) SET(OV_GLOBAL_VERSION_STRING "${OV_GLOBAL_VERSION_MAJOR}.${OV_GLOBAL_VERSION_MINOR}.${OV_GLOBAL_VERSION_PATCH}") SET(DOCUMENTATION_TEMP_DIRECTORY "${CMAKE_INSTALL_PREFIX}/doc-tmp") diff --git a/cmake-modules/FindOVDesigner.cmake b/cmake-modules/FindOVDesigner.cmake index bee0275c704da0b6be877416ac517a53e0657bfe..c7f5f1ded69ab50e617dd0ae246dfbeab59ae666 100755 --- a/cmake-modules/FindOVDesigner.cmake +++ b/cmake-modules/FindOVDesigner.cmake @@ -82,6 +82,16 @@ if(INSTALL_DESIGNER) install(DIRECTORY ${DESIGNER_SDK_PATH_${OUTPUTCONFIGU}}/lib/ DESTINATION ${DIST_LIBDIR} CONFIGURATIONS ${OUTPUTCONFIG}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") install(DIRECTORY ${DESIGNER_SDK_PATH_${OUTPUTCONFIGU}}/etc/ DESTINATION ${DIST_SYSCONFDIR} CONFIGURATIONS ${OUTPUTCONFIG} OPTIONAL) install(DIRECTORY ${DESIGNER_SDK_PATH_${OUTPUTCONFIGU}}/share/ DESTINATION ${DIST_DATADIR} CONFIGURATIONS ${OUTPUTCONFIG}) + if(DESIGNER_SDK_PATH_${OUTPUTCONFIGU}) + file(COPY "${DESIGNER_SDK_PATH_${OUTPUTCONFIGU}}/share/openvibe/applications/designer/designer.conf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/designer.conf ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG}) + file(READ ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} FILE_CONTENT) + set(MATCH_EXPR "(ProjectVersion_Components *= *.\{[^\}]+)(.\}\n)") + string(REGEX REPLACE ${MATCH_EXPR} "\\1, \"openvibe-extras\":\"${OV_GLOBAL_VERSION_STRING}\"\\2" FILE_CONTENT ${FILE_CONTENT}) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} ${FILE_CONTENT}) + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} "Application_Name = Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG}" DESTINATION "${DIST_DATADIR}/openvibe/applications/designer" RENAME designer.conf CONFIGURATIONS ${OUTPUTCONFIG}) + endif() endforeach() else() file(GLOB EXE_SCRIPT_LIST "${DESIGNER_SDK_PATH}/*.cmd" "${DESIGNER_SDK_PATH}/*.sh") @@ -99,6 +109,13 @@ if(INSTALL_DESIGNER) install(DIRECTORY ${DESIGNER_SDK_PATH}/lib/ DESTINATION ${DIST_LIBDIR}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") install(DIRECTORY ${DESIGNER_SDK_PATH}/etc/ DESTINATION ${DIST_SYSCONFDIR} OPTIONAL) install(DIRECTORY ${DESIGNER_SDK_PATH}/share/ DESTINATION ${DIST_DATADIR}) + file(COPY "${DESIGNER_SDK_PATH}/share/openvibe/applications/designer/designer.conf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(READ ${CMAKE_CURRENT_BINARY_DIR}/designer.conf FILE_CONTENT) + set(MATCH_EXPR "(ProjectVersion_Components *= *.\{[^\}]+)(.\}\n)") + string(REGEX REPLACE ${MATCH_EXPR} "\\1, \"openvibe-extras\":\"${OV_GLOBAL_VERSION_STRING}\"\\2" FILE_CONTENT ${FILE_CONTENT}) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/designer.conf ${FILE_CONTENT}) + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf "Application_Name = Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/designer.conf DESTINATION "${DIST_DATADIR}/openvibe/applications/designer") endif() endif() diff --git a/cmake-modules/FindOVSDK.cmake b/cmake-modules/FindOVSDK.cmake index ebc5784ebb6ecf53cdaa771888aa2cbb11979310..45d34e85b916d42f771b609454555f3859f416e8 100755 --- a/cmake-modules/FindOVSDK.cmake +++ b/cmake-modules/FindOVSDK.cmake @@ -82,6 +82,12 @@ if(INSTALL_SDK) install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/lib/ DESTINATION ${DIST_LIBDIR} CONFIGURATIONS ${OUTPUTCONFIG}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/etc/ DESTINATION ${DIST_SYSCONFDIR} CONFIGURATIONS ${OUTPUTCONFIG} OPTIONAL) install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/share/ DESTINATION ${DIST_DATADIR} CONFIGURATIONS ${OUTPUTCONFIG}) + if(OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}) + file(COPY "${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/share/openvibe/kernel/openvibe.conf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf_${OUTPUTCONFIG}) + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf_${OUTPUTCONFIG} "Application_Name = Player\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf_${OUTPUTCONFIG} DESTINATION "${DIST_DATADIR}/openvibe/kernel" RENAME openvibe.conf CONFIGURATIONS ${OUTPUTCONFIG}) + endif() endforeach() else() file(GLOB EXE_SCRIPT_LIST "${OPENVIBE_SDK_PATH}/*.cmd" "${OPENVIBE_SDK_PATH}/*.sh") @@ -99,5 +105,8 @@ if(INSTALL_SDK) install(DIRECTORY ${OPENVIBE_SDK_PATH}/lib/ DESTINATION ${DIST_LIBDIR}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") install(DIRECTORY ${OPENVIBE_SDK_PATH}/etc/ DESTINATION ${DIST_SYSCONFDIR} OPTIONAL) install(DIRECTORY ${OPENVIBE_SDK_PATH}/share/ DESTINATION ${DIST_DATADIR}) + file(COPY "${OPENVIBE_SDK_PATH}/share/openvibe/kernel/openvibe.conf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf "Application_Name = Player\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf DESTINATION "${DIST_DATADIR}/share/openvibe/kernel") endif() endif() diff --git a/scripts/win32-openvibe-x.x.x-setup.nsi b/scripts/win32-openvibe-x.x.x-setup.nsi index 95286834c699130f56422461a665c0302656d383..9665e1f34e20f7175a4fe4e0ddc8c2d5956466b5 100644 --- a/scripts/win32-openvibe-x.x.x-setup.nsi +++ b/scripts/win32-openvibe-x.x.x-setup.nsi @@ -5,11 +5,11 @@ !include "zipdll.nsh" ;Name and file - Name "OpenViBE 2.0.0-beta2" - OutFile "openvibe-2.0.0-beta2-setup.exe" + Name "OpenViBE 2.0.0" + OutFile "openvibe-2.0.0-setup.exe" ;Default installation folder - InstallDir "$PROGRAMFILES\openvibe-beta" + InstallDir "$PROGRAMFILES\openvibe-2.0" Var OLDINSTDIR Var DIRECTX_MISSING @@ -49,10 +49,6 @@ Function .onInit - ; Blurp - - MessageBox MB_OK "WARNING: This is installer for OpenViBE 2.0.0 BETA. As a BETA version, it may have various issues. The last stable version of OpenViBE is 1.3.0. If you decide to install this BETA anyway, please read the release notes carefully on the OpenViBE forum and webpage." - ; Note that for logging to work, you will need a logging-enabled build of nsis. ; At the time of writing this, you could get one from http://nsis.sourceforge.net/Special_Builds LogSet on @@ -64,11 +60,11 @@ Function .onInit Quit has_admin_rights: - ReadRegStr $0 HKLM SOFTWARE\openvibe-beta InstallDir + ReadRegStr $0 HKLM SOFTWARE\openvibe20 InstallDir ${If} $0 != "" IfFileExists "$0\Uninstall.exe" +1 +5 - MessageBox MB_YESNO "A previous installation of OpenViBE is installed under $0.$\nContinuing the install procedure will remove previous installation of OpenViBE (including all files you eventually added in the installation directory).$\nWould you like to accept this removal and continue on installation process ?" /SD IDYES IDNO +1 IDYES +2 + MessageBox MB_YESNO "A previous installation of OpenViBE 2.0 is installed under $0.$\nContinuing the install procedure will remove previous installation of OpenViBE 2.0 (including all files you eventually added in the installation directory).$\nWould you like to accept this removal and continue on installation process ?" /SD IDYES IDNO +1 IDYES +2 Abort StrCpy $OLDINSTDIR $0 StrCpy $INSTDIR $0 @@ -114,11 +110,11 @@ Section "!OpenViBE" Section1 ${If} $OLDINSTDIR != "" RMDir /r $OLDINSTDIR - RMDir /r "$SMPROGRAMS\OpenViBE-beta" + RMDir /r "$SMPROGRAMS\OpenViBE 2.0" ${EndIf} SetOutPath $INSTDIR - WriteRegStr HKLM "SOFTWARE\openvibe-beta" "InstallDir" "$INSTDIR" + WriteRegStr HKLM "SOFTWARE\openvibe20" "InstallDir" "$INSTDIR" WriteUninstaller Uninstall.exe CreateDirectory "$INSTDIR\dependencies\arch" @@ -256,16 +252,16 @@ no_need_to_patch_3d_functionnality: FileWrite $0 "widget_class $\"*$\" style $\"user-font$\"$\r$\n" FileClose $0 - CreateDirectory "$SMPROGRAMS\OpenViBE-beta" - CreateDirectory "$SMPROGRAMS\OpenViBE-beta\Developer tools" - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\Developer tools\openvibe id generator.lnk" "$INSTDIR\openvibe-id-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\Developer tools\openvibe plugin inspector.lnk" "$INSTDIR\openvibe-plugin-inspector.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\Developer tools\openvibe skeleton generator.lnk" "$INSTDIR\openvibe-skeleton-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\openvibe designer.lnk" "$INSTDIR\openvibe-designer.cmd" "" "%SystemRoot%\system32\shell32.dll" 137 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\openvibe acquisition server.lnk" "$INSTDIR\openvibe-acquisition-server.cmd" "" "%SystemRoot%\system32\shell32.dll" 18 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\openvibe vr-demo spaceship.lnk" "$INSTDIR\openvibe-vr-demo-spaceship.cmd" "" "%SystemRoot%\system32\shell32.dll" 200 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\openvibe vr-demo handball.lnk" "$INSTDIR\openvibe-vr-demo-handball.cmd" "" "%SystemRoot%\system32\shell32.dll" 200 - CreateShortCut "$SMPROGRAMS\OpenViBE-beta\uninstall.lnk" "$INSTDIR\Uninstall.exe" + CreateDirectory "$SMPROGRAMS\OpenViBE 2.0" + CreateDirectory "$SMPROGRAMS\OpenViBE 2.0\Developer tools" + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe id generator.lnk" "$INSTDIR\openvibe-id-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe plugin inspector.lnk" "$INSTDIR\openvibe-plugin-inspector.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\Developer tools\openvibe skeleton generator.lnk" "$INSTDIR\openvibe-skeleton-generator.cmd" "" "%SystemRoot%\system32\shell32.dll" 57 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe designer.lnk" "$INSTDIR\openvibe-designer.cmd" "" "%SystemRoot%\system32\shell32.dll" 137 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe acquisition server.lnk" "$INSTDIR\openvibe-acquisition-server.cmd" "" "%SystemRoot%\system32\shell32.dll" 18 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe vr-demo spaceship.lnk" "$INSTDIR\openvibe-vr-demo-spaceship.cmd" "" "%SystemRoot%\system32\shell32.dll" 200 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\openvibe vr-demo handball.lnk" "$INSTDIR\openvibe-vr-demo-handball.cmd" "" "%SystemRoot%\system32\shell32.dll" 200 + CreateShortCut "$SMPROGRAMS\OpenViBE 2.0\uninstall.lnk" "$INSTDIR\Uninstall.exe" ; AccessControl::EnableFileInheritance "$INSTDIR" @@ -276,7 +272,7 @@ SectionEnd Section "Uninstall" RMDir /r $INSTDIR - RMDir /r "$SMPROGRAMS\OpenViBE" + RMDir /r "$SMPROGRAMS\OpenViBE 2.0" SectionEnd