Commit Graph

294 Commits

Author SHA1 Message Date
Robert 21dd167d8b Avoid unnecessary redefinition of atoll() under MSVC 2013
atoll() was added to the MSVC standard library under MSVC 2013
so we don't need our own definition of it.

MD-20088
test: none: Build fix
2014-04-04 12:43:36 +01:00
Robert Knight 1b0d933ad7 Fix Linux build
The variable SYSTEM_NAME does not exist, it should be
CMAKE_SYSTEM_NAME as per
http://www.cmake.org/Wiki/CMake_Useful_Variables

MD-12499
test: none
2014-03-06 17:19:03 +00:00
Robert Knight 3223bcff7a Merge pull request #6 from tru/freebsd
Add support for FreeBSD
2014-02-10 16:13:04 +00:00
Tobias Hieta a8755f9464 Add support for FreeBSD 2014-02-10 08:03:11 -08:00
Robert Knight 373caf74a7 Fix permissions of Updater binary under Ruby 1.9.x
When create-packages.rb was run under ruby 1.9.x the Updater
binary in the output dir lost its executable permissions.

This is the same issue and fix as previously applied in
0472a4e991
2013-09-20 14:57:30 +01:00
Robert Knight 5d2ce7e8c3 Set OS X min version for both C and C++ source files
MD-19720 #time 30m
2013-09-10 15:38:45 +01:00
Robert Knight ddce2d6e73 Enable PDB generation for release builds
This does increase the size of the binary but enables debugging
of crash dumps from release builds of the updater on Windows.

MD-19678 #time 10m
2013-09-05 11:13:45 +01:00
Robert Knight 7335ee3eac Fix debug build on Windows
Specify static linking to VC runtime libs under both debug and release
builds

MD-19678 #time 10m
2013-09-04 18:58:40 +01:00
Robert Knight 465788b400 Remove the install target from updater
Since this is usually built in the context of a larger project,
the outer project will want to control where the updater is installed
to.

MD-19678 #time 5m
2013-09-04 18:31:38 +01:00
Robert Knight 4df97c84e1 On Windows, build the updater with UNICODE and _UNICODE not set
FileUtils and DirIterator currently assume that the Windows
file manipulation calls accept a char*

MD-19678 #time 10m
2013-09-04 16:37:05 +01:00
Robert Knight 6a56b5cddc Add embedded GTK UI lib as a dependency of the updater
When building the updater target from outside the updater-installer/
build dir in the context of a larger project, CMake failed
to determine how to build libupdatergtk.so in the context
of the dependency chain updater -> updatershared -> libupdatergtk.cpp ->
libupdatergtk.so

Resolve this for now by adding an explicit updatershared ->
resource_updatergtk dependency.

MD-19678 #time 2h
2013-09-04 12:49:03 +01:00
Robert Knight e74435e871 Specify the CMake module path using a path relative to the current source dir
This fixes a problem where the module path was not found
when the updater is incorporated into a larger CMake project

MD-19678 #time 10m
2013-09-03 16:39:23 +01:00
Robert Knight 83b2697b52 Add updater_ prefix to test target names
This avoids a conflict with CMake targets that happen to have
the same name in Mendeley's main CMake project.

MD-19678 #time 10m
2013-09-03 16:34:02 +01:00
Robert Knight d25cfb8583 Fix formatting of zip-tool.cpp
MD-19678 #time 2m
2013-09-02 10:29:13 +01:00
Robert Knight ec3d09000b Add usage info to zip-tool utility
MD-19678 #time 5m
2013-09-02 10:28:29 +01:00
Robert Knight 0472a4e991 Fix updater test behavior with Ruby 1.9.x
The behavior of FileUtils.cp w.r.t. preserving the source file
mode changed between Ruby 1.8 and Ruby 1.9, in particular the execute
permission was not preserved for copied binaries so the test script
failed to launch them.

Set the :preserve attribute so that the source file's mode is
used.

MD-19678 #time 1h
2013-09-02 09:56:16 +01:00
Robert Knight b168ed69d7 Fix zip-tool build on Mac
Add the Security and Cocoa frameworks as link dependencies
of the shared updater library.

MD-19678 #time 10m
2013-08-30 15:43:25 +01:00
Robert Knight 2658f1235d Fix update installer test on Windows
* Remove the dependency on Cygwin being installed along with zip.exe
   at a specific location.

   Add a small cross-platform tool in zip.cpp which creates a zip
   file using the contents of a given directory.

   This also removes the need for passing different arguments to 'zip'
   depending on the platform.

 * Fix StringUtils::endsWith()

 * Fix UpdateDialogWin32::quit(), when called on a background thread it
   had no effect. Post the WM_QUIT message to the main thread.
2013-08-30 15:33:46 +01:00
Robert Knight 484f8ae37b Fix Win32 build - add missing include 2013-08-30 14:09:09 +01:00
Robert Knight 1ebf62e1fa Fix Mac implementation of --auto-close option
Invoke [NSApp stop:] on the main thread. When invoked from
UpdateDialogCocoa::updateFinished() on the background thread
it had no effect as [NSApp stop:] only stops the current run loop.
2013-08-30 12:16:22 +01:00
Robert Knight 84288ddc6c Add missing UpdateDialog.cpp file
MD-19678 #time 5m
2013-08-30 12:04:22 +01:00
Robert Knight cbda873a70 Run the update installation test as part of the 'make test' target
* Add a test which runs the test-update.rb script
 * Add a --auto-close option to the updater which auto-dismisses the
   update dialog once installation is complete. This is used in
   test-update.rb to make the script run without user interaction
   being required.

MD-19678 #time 1h
2013-08-30 11:44:39 +01:00
Robert Knight c09e5d2290 Reduce duplication between the different platform implementations of the update dialog
Add an UpdateDialog base class which the different platform
implmentations implement and use this to:

 * Remove the duplicated runWithUi() functions in main.cpp
 * Reduce the amount of boilerplate for loading the GTK dialog at
   runtime and falling back to the non-GTK 'dialog' if this fails.

MD-19678 #time 1h
2013-08-30 10:52:05 +01:00
Robert Knight b1bf64a671 Fix updater test on Ubuntu 13.04
Set file permissions to match those specified in
the updater script or in the case of new-dir/new-dir2
the mode hard-coded into FileUtils::mkdir()
2013-08-29 18:21:18 +01:00
Robert Knight e55a58e4be Replace use of deprecated pkgconfig() macro with find_package()
MD-19678 #time 15m
2013-08-29 17:11:43 +01:00
Robert Knight b6a13d3faa Fix build issues on Ubuntu 13.04
* Add missing <unistd.h> include
 * Check for presence of bzip2 library

MD-19678 #time 10m
2013-08-29 16:38:19 +01:00
Robert Knight dab236d8de Enable customization of the tool used to sign the updater
Add a BINARY_SIGNING_TOOL CMake var which can be overridden to specify
a custom script/tool to use to sign the updater binary.
2013-08-29 15:59:19 +01:00
Robert Knight 401785786a Enable building the updater with newer SDKs on Mac
* Remove the CMAKE_OSX_DEPLOYMENT_TARGET setting and just
   rely on the -mmacosx-min-version argument.

 * Avoid requiring a specific OS X SDK version - just use the
   default one.
2013-08-29 15:25:04 +01:00
Robert Knight 5cd4484f8b Register unit tests with CMake
Use add_tests() to register the test binaries with CMake
so they can be executed with 'make test'/CTest.

MD-19678 #time 10m
2013-08-29 15:17:58 +01:00
Robert Knight 39b8ada727 Merge pull request #2 from liamstask/osx-build-fix
UpdateDialogCocoa: fix compile error "Update-Installer/src/UpdateDialogC...
2013-06-26 05:07:54 -07:00
Liam Staskawicz d44b0638bf UpdateDialogCocoa: fix compile error "Update-Installer/src/UpdateDialogCocoa.mm:54:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] informativeTextWithFormat: message];" 2013-06-25 11:28:07 -07:00
Carles Pina 7864ad1829 In Ruby 1.9.2p0 'value' is a frozen string and fails to be assigned. 2012-12-12 12:10:07 +00:00
Robert Knight 4e2e5e9c68 Bump updater version to 0.15
MD-19088 #time 5m
Reviewed-by: Nicolas Esteves
2012-11-26 15:25:26 +00:00
Robert Knight b60a7a7ba2 Respect the TMPDIR environment variable on Unix
On Mac, this is important as TMPDIR points to a user-specific temp dir
which avoids a potential problem where an app bundle created in the temp dir
running as User A cannot later be replaced by a copy of the updater running
as User B.

MD-19088 #time 30m
Reviewed-by: Nicolas Esteves
2012-11-26 15:25:13 +00:00
Robert Knight 16baf00ee6 Add a dummy file instead of a symlink on Windows
FileUtils.ln_s() is not supported on Windows and the updater
doesn't support symlinks on Windows either.

Create a dummy 'real' file to uninstall instead.

MD-19006
2012-11-06 12:46:04 +00:00
Robert Knight 80fdc5b048 Fix updater failing to uninstall broken symlinks
When checking whether a file exists before uninstalling it, FileUtils::fileExists()
checked whether the link target existed instead of the link itself.  Change fileExists()
to use lstat() instead of stat().

The updater uninstalls files in the order they are listed, if a file and a symlink to it
are both being uninstalled (eg. libMendeley.so.1.6.0 and the symlink libMendeley.so.1.6)
and the real file is removed first, uninstalling the symlink later failed due to the
above issue with uninstalling broken symlinks.

MD-19006
2012-11-06 12:31:41 +00:00
Robert Knight 92ef486dc6 Fix old/new helper binaries in unit tests failing to run on OS X 10.5 if built on OS X 10.7.
Apply the Leopard STL template symbol fix to the helper binaries.
Reviewed-by: Carles Pina
2012-10-29 14:03:51 +00:00
Robert Knight 2a59c6f888 Fix an issue where a build of the updater on OS X 10.7 failed to run under OS X 10.5
Copy the work-around for missing template symbols in the C++ runtime library
from Mendeley Desktop.

See the StackOverflow discussion referenced in the comment for more details.
Reviewed-by: Carles Pina
2012-10-29 12:55:47 +00:00
Robert Knight 0d1f285abb Update the v2_file_list.xml file to match the file_list.xml file
The UpdateScript test requires these files to list the same files
to install in the same order.
Reviewed-by: Carles Pina
2012-10-29 12:39:09 +00:00
Robert Knight 93365a2997 Do a more thorough check that install dir matches the package source dir after installing the update
Compare the package source dir and the post-update install dir recursively and check:

 * There are no unexpected files in the install dir

 * All files in the packaging dir were installed with the correct permissions and content

MD-18896
Reviewed-by: Carles Pina
2012-10-26 18:15:36 +01:00
Robert Knight de8531c583 Bump updater version to 0.13
MD-18896
Reviewed-by: Carles Pina
2012-10-26 15:13:26 +01:00
Robert Knight c54ecee1a9 Fix failure to install files in non-pre-existing nested directories during an update
If an update includes a new file 'dir1/dir2/file' where neither 'dir1' nor 'dir2'
already exist, the update fails as it attempts to create 'dir2' without first creating 'dir1'.

Use mkpath() instead of mkdir() to create the dest dir for a file.

MD-18896
Reviewed-by: Carles Pina
2012-10-26 15:12:38 +01:00
Robert Knight 9823b70c5a Fix build using gcc under OS X 10.8
* Change the default SDK from OS X 10.6 to 10.7.
   The 10.6 SDK is no longer bundled with the current version of XCode

 * Add explicit casts for permissions value

MD-18896
Reviewed-by: Carles Pina
2012-10-26 15:12:29 +01:00
Robert Knight 932cddfb77 Allow the OS X SDK version to be specified separately from the deployment target.
CMAKE_OSX_DEPLOYMENT_TARGET sets the minimum version that we want the app to run on,
CMAKE_OSX_SDK is the name of the SDK which we want to build against.

The OS X 10.5 SDK does not exist when building on OS X 10.7,
so allow this to be set to 10.6 instead.
2012-05-04 09:49:13 +01:00
Robert Knight 666c36a4bd Convert the README file to markdown 2011-12-06 15:08:12 +00:00
Robert Knight 66a1f6be9e Remove TODO file.
This will be replaced with the Github issue tracker.
2011-12-06 11:04:02 +00:00
Robert Knight 8a5bed77df Bump version number to 0.12 2011-12-01 13:56:16 +00:00
Robert Knight 66bafb317f Fix update failing to install if the system temporary directory path starts with a lower-case letter.
Fix FileUtils::isRelative() to check if the upper-case version of the first character
in the path is a letter.
2011-12-01 11:52:34 +00:00
Robert Knight df89da7ebd Fix create-packages.rb script under Ruby 1.9.2
The 'dependency' variable is now just a string instead of array,
avoid trying to iterate over it with .each
2011-11-02 16:20:35 +00:00
Robert Knight 99815159b4 Bump version to 0.11 in trunk. 2011-10-19 11:36:59 +01:00