diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | CPackOptions.cmake.in | 5 | ||||
| -rw-r--r-- | OWNCLOUD.cmake | 6 | ||||
| -rw-r--r-- | OwnCloudCPack.cmake | 8 | ||||
| -rw-r--r-- | admin/win/nsi/page_header_owncloud-client.bmp (renamed from admin/win/nsi/page_header_oc.bmp) | bin | 34254 -> 34254 bytes | |||
| -rw-r--r-- | admin/win/nsi/page_header_owncloud-client.xcf (renamed from admin/win/nsi/page_header_oc.xcf) | bin | 5343 -> 5343 bytes | |||
| -rw-r--r-- | admin/win/nsi/welcome_owncloud-client.bmp (renamed from admin/win/nsi/welcome_oc.bmp) | bin | 206038 -> 206038 bytes | |||
| -rw-r--r-- | cmake/modules/NSIS.template.in | 13 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 20 |
9 files changed, 41 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a75e66df..f6632906d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,12 @@ project(mirall) set(PACKAGE "mirall") set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) +if ( EXISTS "OEM.cmake" ) + include ( OEM.cmake ) +else () + include ( OWNCLOUD.cmake ) +endif() + include(${CMAKE_SOURCE_DIR}/VERSION.cmake) configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" ) include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/") @@ -19,7 +25,7 @@ endif() # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE)) set(BUILD_OWNCLOUD_OSX_BUNDLE ON) - set(OWNCLOUD_OSX_BUNDLE "owncloud.app") + set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app") # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) @@ -37,7 +43,6 @@ find_package(INotify) set(WITH_CSYNC CSYNC_FOUND) set(USE_INOTIFY ${INOTIFY_FOUND}) -set(THEME_CLASS "ownCloudTheme") configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index 0b3fa25b4..9218a1bec 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -10,6 +10,11 @@ endif(CPACK_GENERATOR MATCHES "NSIS") set( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ ) set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ ) +if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" ) + include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" ) +else () + include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" ) +endif() set( CSYNC_BINARY_DIR @CSYNC_BINARY_DIR@ ) set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ ) diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake new file mode 100644 index 000000000..47b32c6d2 --- /dev/null +++ b/OWNCLOUD.cmake @@ -0,0 +1,6 @@ +set( APPLICATION_SHORTNAME "owncloud-client" ) +set( APPLICATION_NAME "ownCloud Client" ) +set( APPLICATION_EXECUTABLE "owncloud" ) +set( APPLICATION_DOMAIN "owncloud.org" ) +set( THEME_CLASS "ownCloudTheme" ) + diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake index ca7ae18e6..309445c54 100644 --- a/OwnCloudCPack.cmake +++ b/OwnCloudCPack.cmake @@ -2,7 +2,11 @@ include( InstallRequiredSystemLibraries ) set( CPACK_PACKAGE_CONTACT "Dominik Schmidt <domme@tomahawk-player.org>" ) -set( APPLICATION_NAME "ownCloud Client") +if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" ) + include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" ) +else () + include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" ) +endif() include( VERSION.cmake ) set( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} ) @@ -35,7 +39,7 @@ endif() if(WIN32) - set( CPACK_PACKAGE_FILE_NAME owncloud-client-${CPACK_PACKAGE_VERSION}-setup ) + set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION}-setup ) # Package file name without extension. Also a directory of installer cmake-2.5.0-Linux-i686 # CPACK_GENERATOR CPack generator to be used STGZ;TGZ;TZ # CPACK_INCLUDE_TOPLEVEL_DIRECTORY Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree. 0 to disable, 1 to enable diff --git a/admin/win/nsi/page_header_oc.bmp b/admin/win/nsi/page_header_owncloud-client.bmp Binary files differindex 8a04251a7..8a04251a7 100644 --- a/admin/win/nsi/page_header_oc.bmp +++ b/admin/win/nsi/page_header_owncloud-client.bmp diff --git a/admin/win/nsi/page_header_oc.xcf b/admin/win/nsi/page_header_owncloud-client.xcf Binary files differindex f74dcaed9..f74dcaed9 100644 --- a/admin/win/nsi/page_header_oc.xcf +++ b/admin/win/nsi/page_header_owncloud-client.xcf diff --git a/admin/win/nsi/welcome_oc.bmp b/admin/win/nsi/welcome_owncloud-client.bmp Binary files differindex 228b82e23..228b82e23 100644 --- a/admin/win/nsi/welcome_oc.bmp +++ b/admin/win/nsi/welcome_owncloud-client.bmp diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 228d3d9c1..1aea1ea05 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -1,8 +1,9 @@ ;ownCloud installer script. -!define APPLICATION_NAME ownCloud -!define APPLICATION_EXECUTABLE owncloud.exe -!define APPLICATION_DOMAIN owncloud.com +!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@" +!define APPLICATION_NAME "@APPLICATION_NAME@" +!define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe" +!define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@" !define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}" @@ -89,7 +90,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" ; Memento selections stored in registry. ;----------------------------------------------------------------------------- !define MEMENTO_REGISTRY_ROOT HKLM -!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME} +!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" ;----------------------------------------------------------------------------- ; Modern User Interface (MUI) defintions and setup. @@ -97,11 +98,11 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !define MUI_ABORTWARNING !define MUI_ICON ${NSI_PATH}\installer.ico !define MUI_UNICON ${NSI_PATH}\installer.ico -!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome_oc.bmp +!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome_${APPLICATION_SHORTNAME}.bmp !define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header_oc.bmp +!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header_${APPLICATION_SHORTNAME}.bmp !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Install Completed" !define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website." diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3977e0afd..a1d2ff98d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,9 +173,9 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) # we may not add MACOSX_BUNDLE here, if not building one - # add_executable(owncloud main.cpp ${final_src}) - add_executable(owncloud WIN32 main.cpp ${final_src}) - set_target_properties( owncloud PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) + # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) + add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) + set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) # mirall is not built for the bundle add_executable( mirall WIN32 main.cpp ${final_src}) @@ -199,8 +199,8 @@ else() set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") # we must add MACOSX_BUNDLE only if building a bundle - add_executable(owncloud WIN32 MACOSX_BUNDLE main.cpp ${final_src}) - set_target_properties( owncloud PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) + add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) + set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) #FIXME: hardcoded path install(FILES /usr/local/lib/csync-0/csync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins) @@ -210,14 +210,14 @@ else() endif() -set_target_properties( owncloud PROPERTIES +set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) -target_link_libraries(owncloud ${QT_LIBRARIES} ) -target_link_libraries(owncloud owncloudsync) -target_link_libraries(owncloud ${CSYNC_LIBRARY}) +target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) +target_link_libraries( ${APPLICATION_EXECUTABLE} owncloudsync ) +target_link_libraries( ${APPLICATION_EXECUTABLE} ${CSYNC_LIBRARY} ) -install(TARGETS owncloud +install(TARGETS ${APPLICATION_EXECUTABLE} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib |
