From cfc3609a4efc3528314e371073881128b2534d01 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 25 Jan 2014 21:35:44 +0100 Subject: [PATCH 1/2] Fix/Workaround a cmake path seperator escaping bug on Windows --- CMakeLists.txt | 43 ++++++++++++++++++++++++---------- cmake/Modules/ObsHelpers.cmake | 8 +++++++ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c30ae0cdb..592ba5f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,10 @@ obs_install_additional() # CPack Configuration -if(APPLE) +if(APPLE AND NOT CPACK_GENERATOR) set(CPACK_GENERATOR "Bundle") +elseif(WIN32 AND NOT CPACK_GENERATOR) + set(CPACK_GENERATOR "NSIS" "ZIP") endif() set(CPACK_PACKAGE_NAME "OBS Studio") @@ -86,15 +88,27 @@ set(CPACK_PACKAGE_VERSION_PATCH "1") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OBS Studio - Multi-platform broadcasting software") if(INSTALLER_RUN) + file(TO_NATIVE_PATH "${OBS_EXECUTABLE32_DESTINATION}/obs" _obs32) + file(TO_NATIVE_PATH "${OBS_EXECUTABLE64_DESTINATION}/obs" _obs64) + + #Workaround a cmake bug, remove when fixed + string(REPLACE "\\" "\\\\" _obs32 "${_obs32}") + string(REPLACE "\\" "\\\\" _obs64 "${_obs64}") + set(CPACK_PACKAGE_EXECUTABLES - "${OBS_EXECUTABLE32_DESTINATION}/obs" "OBS Studio (32bit)" - "${OBS_EXECUTABLE64_DESTINATION}/obs" "OBS Studio (64bit)") + "${_obs32}" "OBS Studio (32bit)" + "${_obs64}" "OBS Studio (64bit)") set(CPACK_CREATE_DESKTOP_LINKS - "${OBS_EXECUTABLE32_DESTINATION}/obs" - "${OBS_EXECUTABLE64_DESTINATION}/obs") + "${_obs32}" + "${_obs64}") else() - set(CPACK_PACKAGE_EXECUTABLES "${OBS_EXECUTABLE_DESTINATION}/obs;OBS Studio") - set(CPACK_CREATE_DESKTOP_LINKS "${OBS_EXECUTABLE_DESTINATION}/obs") + file(TO_NATIVE_PATH "${OBS_EXECUTABLE_DESTINATION}/obs" _obs) + + #Workaround a cmake bug, remove when fixed + string(REPLACE "\\" "\\\\" _obs "${_obs}") + + set(CPACK_PACKAGE_EXECUTABLES "${_obs}" "OBS Studio") + set(CPACK_CREATE_DESKTOP_LINKS "${_obs}") endif() set(CPACK_BUNDLE_NAME "OBS Studio") @@ -107,20 +121,23 @@ set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") set(CPACK_NSIS_MODIFY_PATH ON) if(INSTALLER_RUN) - SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio") - SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio") + set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") + set(CPACK_PACKAGE_FILE_NAME "obs-studio") elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) if(WIN32) set(CPACK_PACKAGE_NAME "OBS Studio (64bit)") endif() - SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio64") - SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio64") + set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + set(CPACK_PACKAGE_FILE_NAME "obs-studio-x64") else() if(WIN32) set(CPACK_PACKAGE_NAME "OBS Studio (32bit)") endif() - SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio32") - SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES32") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio32") + set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES32") + set(CPACK_PACKAGE_FILE_NAME "obs-studio-x86") endif() include(CPack) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 7ad5e4110..afe1c4149 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -19,6 +19,14 @@ if(INSTALLER_RUN AND NOT DEFINED ENV{obsInstallerTempDir}) message(FATAL_ERROR "Environment variable obsInstallerTempDir is needed for multiarch installer generation") endif() +if(DEFINED ENV{obsInstallerTempDir}) + file(TO_CMAKE_PATH "$ENV{obsInstallerTempDir}" ENV{obsInstallerTempDir}) +endif() + +if(DEFINED ENV{obsAdditionalInstallFiles}) + file(TO_CMAKE_PATH "$ENV{obsAdditionalInstallFiles}" ENV{obsAdditionalInstallFiles}) +endif() + if(NOT UNIX_STRUCTURE) set(OBS_DATA_DESTINATION "data") if(APPLE) From 668812ca3e4e4dcd200cb46650f93153b6ee3a87 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 25 Jan 2014 22:11:57 +0100 Subject: [PATCH 2/2] Adjust file finding functions to also search the install root dir on Windows This is because the installed versions of OBS is allways executed in the install root instead of inside the bin dir. --- libobs/obs-nix.c | 5 +++ libobs/obs-windows.c | 71 ++++++++++++++++++++++++++++++++++------ obs/platform-windows.cpp | 20 ++++++++--- 3 files changed, 82 insertions(+), 14 deletions(-) diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index c5b69ae5b..1e105c20e 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -63,6 +63,11 @@ char *find_plugin(const char *plugin) if (check_lib_path(plugin, "../../obs-plugins/32bit/", &output)) return output.array; } + else + { + if (check_lib_path(plugin, "../../obs-plugins/64bit/", &output)) + return output.array; + } if (OBS_INSTALL_PREFIX [0] != 0) { diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c index a428752cc..9b0b92dbd 100644 --- a/libobs/obs-windows.c +++ b/libobs/obs-windows.c @@ -20,33 +20,84 @@ #include "obs.h" #include "obs-data.h" +static inline bool check_path(const char* data, const char *path, + struct dstr * output) +{ + dstr_copy(output, path); + dstr_cat(output, data); + + blog(LOG_INFO, "Attempting path: %s\n", output->array); + + return os_file_exists(output->array); +} + +static inline bool check_lib_path(const char* data, const char *path, + struct dstr *output) +{ + bool result = false; + struct dstr tmp; + + dstr_init_copy(&tmp, data); + dstr_cat(&tmp, ".dll"); + result = check_path(tmp.array, path, output); + + dstr_free(&tmp); + + return result; +} + /* on windows, plugin files are located in [base directory]/plugins/[bit] */ char *find_plugin(const char *plugin) { struct dstr path; + dstr_init(&path); + #ifdef _WIN64 - dstr_init_copy(&path, "../../obs-plugins/64bit/"); + if (check_lib_path(plugin, "obs-plugins/64bit/", &path)) #else - dstr_init_copy(&path, "../../obs-plugins/32bit/"); + if (check_lib_path(plugin, "obs-plugins/32bit/", &path)) #endif - dstr_cat(&path, plugin); - return path.array; + return path.array; + +#ifdef _WIN64 + if (check_lib_path(plugin, "../../obs-plugins/64bit/", &path)) +#else + if (check_lib_path(plugin, "../../obs-plugins/32bit/", &path)) +#endif + return path.array; + + dstr_free(&path); + return NULL; } /* on windows, points to [base directory]/libobs */ char *find_libobs_data_file(const char *file) { struct dstr path; - dstr_init_copy(&path, "../../data/libobs/"); - dstr_cat(&path, file); - return path.array; + dstr_init(&path); + + if (check_path(file, "data/libobs/", &path)) + return path.array; + + if (check_path(file, "../../data/libobs/", &path)) + return path.array; + + dstr_free(&path); + return NULL; } /* on windows, data files should always be in [base directory]/data */ char *obs_find_plugin_file(const char *file) { struct dstr path; - dstr_init_copy(&path, "../../data/obs-plugins/"); - dstr_cat(&path, file); - return path.array; + dstr_init(&path); + + if (check_path(file, "data/obs-plugins/", &path)) + return path.array; + + if (check_path(file, "../../data/obs-plugins/", &path)) + return path.array; + + dstr_free(&path); + return NULL; } diff --git a/obs/platform-windows.cpp b/obs/platform-windows.cpp index 0ce0238d1..00a103675 100644 --- a/obs/platform-windows.cpp +++ b/obs/platform-windows.cpp @@ -24,12 +24,24 @@ using namespace std; #define WIN32_LEAN_AND_MEAN #include +static inline bool check_path(const char* data, const char *path, + string &output) +{ + ostringstream str; + str << path << data; + output = str.str(); + + printf("Attempted path: %s\n", output.c_str()); + + return os_file_exists(output.c_str()); +} + bool GetDataFilePath(const char *data, string &output) { - stringstream str; - str << OBS_DATA_PATH "/obs-studio/" << data; - output = str.str(); - return os_file_exists(output.c_str()); + if (check_path(data, "data/obs-studio/", output)) + return true; + + return check_path(data, OBS_DATA_PATH "/obs-studio/", output); } static BOOL CALLBACK OBSMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor,