mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 06:55:59 +03:00
Merge pull request #3797 from phil-davis/minorstuff
Minor build etc typos
This commit is contained in:
Daniel Molkentin
commit
8e2b9c6f12
10 changed files with 24 additions and 24 deletions
|
|
@ -32,7 +32,7 @@ include(Warnings)
|
|||
include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
|
||||
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
|
||||
|
||||
# disable the crashrepoter if libcrashreporter-qt is not available or we're building for ARM
|
||||
# disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
|
||||
if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
|
||||
set( WITH_CRASHREPORTER OFF )
|
||||
endif()
|
||||
|
|
@ -114,16 +114,16 @@ endif()
|
|||
# this option creates only libocsync and libowncloudsync
|
||||
option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
|
||||
|
||||
# When this option is enabled, 5xx errors are not added to the clacklist
|
||||
# Normaly you don't want to enable this option because if a particular file
|
||||
# trigger a bug on the server, you want the file to be blacklisted.
|
||||
# When this option is enabled, 5xx errors are not added to the blacklist
|
||||
# Normally you don't want to enable this option because if a particular file
|
||||
# triggers a bug on the server, you want the file to be blacklisted.
|
||||
option(OWNCLOUD_5XX_NO_BLACKLIST "OWNCLOUD_5XX_NO_BLACKLIST" OFF)
|
||||
if(OWNCLOUD_5XX_NO_BLACKLIST)
|
||||
add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesigh key's TeamIdentifier/Organizational Unit" )
|
||||
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
|
||||
endif()
|
||||
|
||||
#### find libs
|
||||
|
|
@ -138,7 +138,7 @@ if(HAVE_QT5)
|
|||
message(STATUS "Using Qt ${Qt5Core_VERSION_MAJOR}.${Qt5Core_VERSION_MINOR}.x")
|
||||
if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
|
||||
if (${Qt5Core_VERSION_MINOR} EQUAL "4" OR ${Qt5Core_VERSION_MINOR} GREATER 4)
|
||||
message(STATUS "We would not require Neon in this setup, compile without!")
|
||||
message(STATUS "We do not require Neon in this setup, compile without!")
|
||||
set(USE_NEON FALSE)
|
||||
else()
|
||||
message(STATUS "If possible compile me with Qt 5.4 or higher.")
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ We are also available on [IRC][irc].
|
|||
|
||||
### Bug Reporting Guidelines
|
||||
* __Important__: Report the issue using our [template][template], it includes all the
|
||||
informations we need to track down the issue.
|
||||
information we need to track down the issue.
|
||||
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
|
||||
* This repository is *only* for issues within the ownCloud desktop client.
|
||||
Issues in other compontents should be reported in their own repositores:
|
||||
Issues in other components should be reported in their own repositores:
|
||||
- [ownCloud server](https://github.com/owncloud/core/issues)
|
||||
- [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
|
||||
Contacts...)
|
||||
|
|
@ -36,7 +36,7 @@ Before we're able to merge your code to ownCloud Desktop Client, you need to sig
|
|||
our [Contributor Agreement][agreement].
|
||||
|
||||
Please read the [Desktop Client Manual][desktopman] and the [Developer
|
||||
Manuals][devmanual] to get useful infos like how to create your first
|
||||
Manuals][devmanual] to get useful info like how to create your first
|
||||
application or how to test the ownCloud code with phpunit.
|
||||
|
||||
[agreement]: http://owncloud.org/about/contributor-agreement/
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back
|
|||
# set( APPLICATION_LICENSE "${OEM_THEME_DIR}/license.txt )
|
||||
|
||||
option( WITH_CRASHREPORTER "Build crashreporter" OFF )
|
||||
set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash repoter" )
|
||||
set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
|
||||
set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ else(UNIX AND NOT WIN32)
|
|||
endif (UNIX AND NOT WIN32)
|
||||
|
||||
if (MSVC)
|
||||
# Use secure functions by defaualt and suppress warnings about
|
||||
# Use secure functions by default and suppress warnings about
|
||||
#"deprecated" functions
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
|
|||
!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; Modern User Interface (MUI) defintions and setup.
|
||||
; Modern User Interface (MUI) definitions and setup.
|
||||
;-----------------------------------------------------------------------------
|
||||
!define MUI_ABORTWARNING
|
||||
!define MUI_ICON ${NSI_PATH}\installer.ico
|
||||
|
|
@ -556,7 +556,7 @@ Section -post
|
|||
DetailPrint $UNINSTALLER_REGISTRY_Detail
|
||||
SetDetailsPrint listonly
|
||||
|
||||
;Version numbers used to detect existing installation version for comparisson.
|
||||
;Version numbers used to detect existing installation version for comparison.
|
||||
WriteRegStr HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "" $INSTDIR
|
||||
WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
|
||||
WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ IF (DOXYGEN_FOUND)
|
|||
# we need latex for doxygen because of the formulas
|
||||
FIND_PACKAGE(LATEX)
|
||||
IF (NOT LATEX_COMPILER)
|
||||
MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user inetraction on doxy run.")
|
||||
MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user interaction on doxy run.")
|
||||
ENDIF (NOT LATEX_COMPILER)
|
||||
IF (NOT MAKEINDEX_COMPILER)
|
||||
MESSAGE(STATUS "makeindex command MAKEINDEX_COMPILER not found but usually required.")
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ project=gets.chomp
|
|||
|
||||
printf("\n")
|
||||
|
||||
print("Other projects to includes (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
|
||||
print("Other projects to include (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
|
||||
otherprojects=gets.chomp
|
||||
|
||||
printf("\n")
|
||||
|
||||
print("Defininitions (leave empty to skip): ")
|
||||
print("Definitions (leave empty to skip): ")
|
||||
definitions=gets.chomp
|
||||
|
||||
cmakePublicIncDirName = project.upcase+"_PUBLIC_INCLUDE_DIRS"
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ version 0.91.3 (released 2013-12-11, ownCloud Client 1.5.0rc1)
|
|||
version 0.91.2 (released 2013-12-10, ownCloud Client 1.5.0beta3)
|
||||
* have translatable error message for indiv. file errors.
|
||||
* Use uint64_t for inode on win32 to fix a type glitch.
|
||||
* Add test that directrories are properly moved.
|
||||
* Add test that directories are properly moved.
|
||||
* Handle symlinks correctly.
|
||||
* Do not longer recurse into ignored directories in update
|
||||
* No longer recurse into ignored directories in update
|
||||
phase.
|
||||
* Added proper symlink detection for win32 platform.
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ version 0.90.0 (released 2013-09-04, ownCloud Client 1.4.0)
|
|||
* Added c_rename function to csync std.
|
||||
* Fix: Do renames of files before any puts.
|
||||
* Improved database integrity checks.
|
||||
* Improvements of database writing efficiendy.
|
||||
* Improvements of database writing efficiency.
|
||||
* Fix: stat file on win32 even if its opened by application.
|
||||
* httpbf: configurable block size and threshold.
|
||||
* Many fixes found by a Coverity check.
|
||||
|
|
@ -159,7 +159,7 @@ version 0.70.0 and 0.70.1 were beta versions.
|
|||
|
||||
version 0.60.2 (released 2012-11-26)
|
||||
* Migration to cross platform testing system cmocka.
|
||||
* Fixed variuos minor things incl. potential mem leaks.
|
||||
* Fixed various minor things incl. potential mem leaks.
|
||||
* Clang fixes.
|
||||
* Moved journal database to sync directory.
|
||||
* Fixed more csync->ocsync renaming issues.
|
||||
|
|
@ -247,7 +247,7 @@ version 0.50.0 (released 2013-08-01)
|
|||
* Added new logging framework (removed log4c dependency).
|
||||
* Added new config parser (removed iniparser dependency).
|
||||
* Added cmocka tests.
|
||||
* Added a way to exported file_tree_walk functions.
|
||||
* Added a way to export file_tree_walk functions.
|
||||
* Added capabilities for modules.
|
||||
* Added possiblity to push information to the modules.
|
||||
* Added iconv support to support various char sets.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ sqlite3 is a runtime requirement. libsmbclient is needed for
|
|||
the smb plugin, libssh for the sftp plugin. libneon is required for the
|
||||
ownCloud plugin.
|
||||
|
||||
Note that these version numbers are version we know works correctly. If you
|
||||
Note that these version numbers are versions we know work correctly. If you
|
||||
build and run csync successfully with an older version, please let us know.
|
||||
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ CMake options using `cmakesetup` (Windows) or `ccmake` (GNU/Linux and MacOS X).
|
|||
|
||||
## Installing
|
||||
|
||||
Befor installing you can run the tests if everything is working:
|
||||
Before installing you can run the tests if everything is working:
|
||||
|
||||
make test
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ CONTRIBUTIONS
|
|||
=============
|
||||
|
||||
If you want to contribute to the development of the software then please join
|
||||
the mailing list. Patches are accepted preferebly created with git and we are
|
||||
the mailing list. Patches are accepted preferably created with git and we are
|
||||
always glad to receive feedback or suggestions to the address
|
||||
csync-devel@csync.org.
|
||||
More information on the various mailing lists can be found at
|
||||
|
|
|
|||
Loading…
Reference in a new issue