Compare commits

...
249 Commits
Author SHA1 Message Date
schetnikovich 845315eeb5 Simplified LIBSSH2 CMake listfile 2016-04-05 16:19:42 +03:00
schetnikovich 803306eea5 Default to gnu99 for both GCC and Clang 2016-04-05 14:58:51 +03:00
schetnikovich 94ef0d75d7 Modified gitignore and missed header in OpenSSL 2016-04-05 13:24:37 +03:00
schetnikovich 604d439d57 OpenSSL CMake listfile tweaks 2016-04-05 12:39:25 +03:00
schetnikovich d37f8c7bab OpenSSL 1.0.1e 2016-04-04 21:47:50 +03:00
schetnikovich c7ab94a5a5 Ignore SIGPIPE signal 2016-04-04 20:01:42 +03:00
schetnikovich a6428ce968 Use of LIBSSH2 error codes 2016-04-04 16:31:42 +03:00
schetnikovich 8dd0cd3050 Restructuring of SSH submodule. Updated to the latest version of LIBSSH2. 2016-04-04 15:53:12 +03:00
schetnikovich baede8d8bd SSH tunnel: Log functions moved to separate file II 2016-04-02 13:34:28 +03:00
schetnikovich 2328ec7b31 SSH tunnel: Log functions moved to separate file 2016-04-02 13:34:01 +03:00
schetnikovich 719df7b241 Error handling for the most important operations is restored.
1. First steps to support automatic reconnection for SSH tunnel
2. UI tweaks for Explorer tree items (handling of errors and empty children)
3. Correct handling of invalid mongo::DBClientCursor
4. Null semantic of value type EventError is restored. Was broken by reliance on emptiness of error message string, dah!
5. Error state for several messages is restored. Not for all messages, but still something :)
6. Errors produced by MongoWorker now contains exact error message, instead of constant text.
7. More strict error handling for SSH worker
2016-04-02 01:19:58 +03:00
schetnikovich dff7f0539a Preparation to handle reconnection automatically 2016-03-31 13:56:37 +03:00
schetnikovich f03cf048d8 Minor changes with whitespace characters in the code 2016-03-29 20:43:41 +03:00
schetnikovich 22ffc2ec15 Do not print batch size in the logs 2016-03-29 19:51:49 +03:00
schetnikovich 09a0edb39a Check for availability of "rc" files (this removes unnecessary warnings in logs) 2016-03-29 19:44:10 +03:00
schetnikovich a0a8a7a13e Cleanup of SSH worker thread when no more connected clients 2016-03-29 18:06:05 +03:00
schetnikovich 8f97c06408 Shift + Return when selecting connection in order to enable debug level logging for SSH submodule 2016-03-29 14:57:13 +03:00
schetnikovich af9f8fc6a9 Shift + Connect in order to enable debug level logging for SSH submodule
Added WARN log level
2016-03-29 14:36:38 +03:00
schetnikovich ef6feb2377 Log levels for SSH submodule (ERROR, INFO, DEBUG) 2016-03-28 20:57:22 +03:00
schetnikovich 4e5ffae80c Single log function for SSH submodule 2016-03-28 20:16:45 +03:00
schetnikovich 3597f438cd Handling of different types of sockets moved to separate functions 2016-03-28 19:47:15 +03:00
schetnikovich ad9cc86117 Cleanup of SSH tunnel artifacts: sessions, channels, sockets. 2016-03-28 16:34:25 +03:00
schetnikovich 6656494fda Prefix all global or public C identifiers with "rbm_" 2016-03-27 18:23:57 +03:00
schetnikovich 06ac7dd8f1 Global set of SSH channels replaced with separate channels per each worker thread 2016-03-26 11:57:26 +03:00
schetnikovich 76f4d19b42 Logging to Log panel from SSH tunnel worker 2016-03-25 16:17:25 +03:00
schetnikovich d64a1f704b Real-time logging from SSH Tunnel worker thread. 2016-03-25 12:40:14 +03:00
schetnikovich aa27148868 Detailed errors messages for all system calls when establishing SSH tunnel. 2016-03-24 20:40:12 +03:00
schetnikovich 58c42df669 Better error handling when new connection is made (for normal and via SSH tunnel) 2016-03-24 17:16:10 +03:00
schetnikovich 9c0761826b Automatically bind local SSH tunnel to the first available local port 2016-03-22 23:51:43 +03:00
schetnikovich 63f90dfeb3 SSH tunnel on hard-coded local port 2016-03-22 22:28:40 +03:00
schetnikovich 10b31ef2a9 Two-step connection skeleton (SSH tunnel, and then MongoDB connection) 2016-03-22 20:25:36 +03:00
schetnikovich bb3fd81c4d SSH tunnel worker connection and auth 2016-03-19 20:36:05 +03:00
schetnikovich 2cd6ed2928 SSH public key 2016-03-18 18:42:24 +03:00
schetnikovich fde191f6aa SSH tunnel worker sketch 2016-03-18 18:05:01 +03:00
schetnikovich 1c76852b9c Enable C99 support 2016-03-17 16:27:43 +03:00
schetnikovich 2491f417da Loading and saving of SSH settings 2016-03-17 14:43:18 +03:00
schetnikovich 443b8070f2 SSH tab and settings stub 2016-03-15 22:53:07 +03:00
schetnikovich bb51c1395b Separate SSH channels for different socket connections on the same port
* Additional major fix: restored error handling when connectivity is lost
2016-03-15 20:52:51 +03:00
schetnikovich 3e03cf3d88 Single SSH channel for all socket connections 2016-03-13 21:28:37 +03:00
schetnikovich d6a6bf9719 SSH connection, handshake and authentication routines 2016-03-13 17:43:58 +03:00
schetnikovich 3a2a9d1b7d SSH tunnel config 2016-03-12 20:28:59 +03:00
schetnikovich dda68ff53f Direct port forwarding skeleton 2016-03-11 18:26:45 +03:00
schetnikovich 0ef17c6ad7 Libssh2 compilation 2016-03-11 13:47:29 +03:00
schetnikovich ac58d23713 Libssh2 1.7.0 2016-03-10 23:13:25 +03:00
schetnikovich 5971972525 CHANGELOG updated 2016-03-08 13:58:28 +03:00
schetnikovich 4cc6662837 Merge branch 'master' of github.com:paralect/robomongo 2016-03-06 15:52:50 +03:00
schetnikovich 226cbf48d8 CMake print utils changes 2016-03-06 15:52:01 +03:00
schetnikovich 7d9909c247 #1048: Support for CMake 3.0 2016-03-06 15:50:26 +03:00
Dmitry Schetnikovich 649c096e70 Update BuildingMongoDB.md 2016-03-06 12:47:34 +03:00
Dmitry Schetnikovich ce02d5f5c8 Update BuildingRobomongo.md 2016-03-06 12:45:27 +03:00
Dmitry Schetnikovich 90c667011d Update BuildingMongoDB.md 2016-03-06 12:42:22 +03:00
Dmitry Schetnikovich 0622e85e27 Update BuildingMongoDB.md 2016-03-06 12:41:29 +03:00
Dmitry Schetnikovich 355f01f0a4 Update BuildingMongoDB.md 2016-03-06 12:36:59 +03:00
Dmitry Schetnikovich b0d6cf0842 Update BuildingMongoDB.md 2016-03-06 12:35:35 +03:00
Dmitry Schetnikovich 16b15be81b Update BuildingMongoDB.md 2016-03-06 12:30:43 +03:00
schetnikovich 2b7a8ca14e Version updated to RC7 2016-03-03 18:12:23 +03:00
Dmitry Schetnikovich c338813d1c Update BuildingRobomongoOnWindows.md 2016-03-03 17:48:00 +03:00
schetnikovich 2f38d5b00d #1017: Disable editing in View Mode. Button "Validate" is also now hidden in this mode. 2016-03-03 17:09:17 +03:00
schetnikovich 7c6738e32b Config for "clang-format" tool 2016-03-01 20:32:49 +03:00
schetnikovich 86bfeba68a #929: Show keyboard shortcuts for expand/collapse in context menu 2016-03-01 19:40:37 +03:00
schetnikovich a94aa81c07 #1045: Logs are now shown in the panel at the bottom 2016-02-29 20:50:51 +03:00
schetnikovich 080c1ed865 #1042: Double click on collection should not expand it 2016-02-29 16:49:05 +03:00
schetnikovich c6f13e347c Confirmation dialog for BSON editor when ESC is hit and content is modified
And also clone url in documentation is changed to HTTPS instead of SSH, to allow
allow unauthorized cloning.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2016-02-28 22:26:05 +03:00
schetnikovich 3cea361cc9 Merge of PR #1037 2016-02-28 22:16:31 +03:00
schetnikovich f6546fc336 Minor code cleanup 2016-02-28 22:08:35 +03:00
schetnikovich 8d12ab45c9 Mac way to "expand recursively" in a BSON subtree #929. Implemented by Anton Zering 2016-02-28 21:46:39 +03:00
schetnikovich 7dfd9184b7 Fix for broken keyboard shortcut for single document #1039 2016-02-28 21:09:10 +03:00
Anton Zering 0977bc00e3 #929: adds shortcut to expand nodes recursively 2016-02-25 01:13:31 +01:00
Anton Zering 2ea847ce0b #1039: fixes deletion of single documents with shortcut 2016-02-25 00:51:05 +01:00
Anton Zering fb2b5e0487 #1017: document editor ask to save changes when closing the window 2016-02-23 23:56:06 +01:00
Anton Zering cce30bb55b Changed clone url to use HTTPS instead of SSH
Use HTTPS instead of SSH to allow unauthorized cloning
2016-02-23 22:56:41 +01:00
Dmitry Schetnikovich 98af4fc747 CHANGELOG updated 2016-02-13 16:30:59 +03:00
schetnikovich 2c04edb1b3 List of collections is loading much faster now 2016-02-13 16:19:51 +03:00
Dmitry Schetnikovich e4500e0c5c Generate ZIP archives for Windows 2016-02-13 12:56:48 +03:00
Dmitry Schetnikovich 820c4a86f0 Fix for compilation error under Windows 2016-02-13 12:52:49 +03:00
Dmitry Schetnikovich d6253ca194 Merge pull request #1018 from CaptainPatate/CaptainPatate/fix-typo
Fix typo
2016-02-12 00:26:19 +03:00
schetnikovich 33e27917ee Version RC6 2016-02-11 15:20:06 +03:00
schetnikovich cea04368a9 Support for IPv6 addresses with and without square brackets 2016-02-11 15:19:16 +03:00
schetnikovich fe9eed7322 Removed use of monospaced font in Auth tab 2016-02-10 20:24:26 +03:00
Dmitry Schetnikovich 33304e2e7a README updated 2016-02-10 20:17:43 +03:00
schetnikovich 4cd51a7de6 IPv6 support 2016-02-10 20:16:22 +03:00
Amaury Gauthier 5ffd65b1a2 Fix typo 2016-02-09 15:18:04 +01:00
schetnikovich 82b96f4f63 Merge branch 'master' of github.com:paralect/robomongo 2016-02-06 19:00:45 +03:00
schetnikovich e0ea15adb9 Ad-free Robomongo 2016-02-06 19:00:29 +03:00
Dmitry Schetnikovich 209ce0c0a9 README updated 2016-02-03 14:34:01 +03:00
Dmitry Schetnikovich 620488c318 README updated 2016-02-03 14:31:27 +03:00
schetnikovich a270926397 CHANGELOG updated 2016-02-01 23:08:35 +03:00
schetnikovich 8c830b6f1a Robomongo RC4 2016-02-01 20:50:45 +03:00
schetnikovich 33d58189c4 All operations with MongoDB now over DBClientBase, instead of DBClientConnection 2016-02-01 18:28:21 +03:00
schetnikovich 5d8370a970 Support for SCRAM-SHA-1 and MONGODB-CR authentication mechanisms.
1. Ability to select auth mechanisms for each connection (defaults to SCRAM-SHA-1)
2. Diagnostic Dialog also now uses required mechanisms.
2016-02-01 15:17:10 +03:00
schetnikovich fb3d37e641 Message box with description of error when deleting documents. 2016-01-31 19:36:53 +03:00
schetnikovich b27f747ff2 Handling of errors when inserting/updating/removing documents. 2016-01-31 18:47:50 +03:00
schetnikovich 2854783aeb Always allow to read from slaves. 2016-01-31 17:32:28 +03:00
Dmitry Schetnikovich 4b8aa3deaf Shortcuts now will be created on Windows (on desktop and start menu)
1. A bit simplified syntax is used for NSIS commands
2. All Robomongo CMake files start from "Robomongo" (except "find" packages)
3. Clean uninstallation under Windows (only config file is not deleted)
2016-01-30 20:10:09 +03:00
schetnikovich f5397b7c68 CHANGELOG updated 2016-01-29 21:19:45 +03:00
schetnikovich 047620492c Typo fixed 2016-01-29 16:20:18 +03:00
schetnikovich bf51f5d6c9 Gray text color for hey message 2016-01-29 12:47:37 +03:00
schetnikovich d7f27e16fe Hey message added for the time of campaign. 2016-01-29 07:16:51 +03:00
schetnikovich cfb30c69c0 Merge of BSON utils 2016-01-29 05:00:13 +03:00
schetnikovich 8ed0335b7b Use of std::numeric_limits<double>::digits10 to get max float-point precision
Tests returned back.
2016-01-29 04:58:30 +03:00
Dmitry Schetnikovich 313179dfbe Temporary fix for compilation under Windows 2016-01-28 21:42:52 +03:00
schetnikovich 97503f2e81 Version RC3 2016-01-28 21:15:25 +03:00
schetnikovich 156bda2600 NumberDecimal write protection. 2016-01-28 20:59:48 +03:00
schetnikovich 6a5ad25bde Use of shortest representation for BSON double types.
#870, #831, #921, #842
2016-01-28 20:33:46 +03:00
schetnikovich 6d06a3c83c Cleanup of unused code 2016-01-28 19:50:25 +03:00
schetnikovich 76cb03b523 Correct handling and display of top-most JS/BSON arrays in tree and text modes. 2016-01-27 19:31:43 +03:00
schetnikovich 6a2f8c655e Built-in ISO date parser replaced with ptimeutil 2016-01-25 21:39:32 +03:00
schetnikovich 4f3bf50acd BSON parsing with support for ISODate and UUIDs.
1. Validate Json functionality is back
2. Use of MongoDB built-in parser for ISO Date format
3. Use of MongoDB built-in parser for NumberLong
2016-01-25 21:06:51 +03:00
Dmitry Schetnikovich 84c1679e14 Fix for Windows install directory 2016-01-25 18:39:08 +03:00
schetnikovich 5ce457b6f6 Use versioned install directory for not stable releases under Windows 2016-01-25 18:24:51 +03:00
schetnikovich 071d79b7f7 Uniformed package name for all platforms.
1. All letters are lowercase
2. Includes platform architecture in the name
2016-01-25 17:46:55 +03:00
Dmitry Schetnikovich c4ccae3ef8 Packaging for Windows
1. NSIS package is now generated for Windows
2. Images for NSIS installer added
3. DESCRIPTION file copied to installation package
4. Icon updated to have smaller resolutions (20, 24, 40 and 48)
2016-01-25 17:23:52 +03:00
Dmitry Schetnikovich 3e67fa00d4 Packaging of runtime libraries for Windows 2016-01-24 20:04:54 +03:00
Dmitry Schetnikovich e34ebdf0de Config for 0.9.x versions now namespaced in .config/robomongo/0.9 folder. Loading of .mongorc.js is turned off by default 2016-01-24 19:25:45 +03:00
Dmitry Schetnikovich c6bdd3a455 Multiresolution ICO file for Windows 2016-01-24 18:55:20 +03:00
Dmitry Schetnikovich 81f22b68d7 QAtomicInteger<int> instead of QAtomicInteger<_Bool or bool> 2016-01-24 16:49:18 +03:00
Dmitry Schetnikovich 888084b19b And now we are forced to use int instead of BOOL, because on Unix BOOL doesn't defined and bool cannot be used on Windows 2016-01-24 16:47:16 +03:00
Dmitry Schetnikovich e2ec2a2f0d Forced to use BOOL instead of bool, because on Windows –QAtomicInteger with bool template arg doesn't compile 2016-01-24 16:37:31 +03:00
schetnikovich e80245ba15 Bug fixed which made MongoWorker shutdown unsafe and incorrect. Proposed and implemented by Patrick Horlebein. 2016-01-24 16:22:02 +03:00
schetnikovich 3ef94811eb Migration notes updated 2016-01-24 15:13:56 +03:00
schetnikovich d78ff306e4 Removed notion about v0.9 branch in docs (which is merged with master) 2016-01-24 14:55:18 +03:00
Dmitry Schetnikovich 06285eb556 Merge pull request #996 from paralect/v0.9
Merge with v0.9 branch
2016-01-24 14:47:50 +03:00
schetnikovich 0a4378b9fc Always Use QProxyStyle (thanks to Patrick Allaert) 2016-01-24 14:33:50 +03:00
Dmitry Schetnikovich 8472201a36 Merge pull request #999 from alexbevi/patch-1
Sort system.js functions by name (_id)
2016-01-24 14:21:23 +03:00
Dmitry Schetnikovich 554d3f4950 Parallel build enabled for VS 2016-01-24 14:09:57 +03:00
Dmitry Schetnikovich 300713d1ad Temporary empty environment used when running under Windows 2016-01-23 21:57:17 +03:00
Dmitry Schetnikovich 0c06122b36 Documentation for building Robomongo under Windows updated 2016-01-23 21:47:13 +03:00
Dmitry Schetnikovich 08bf485229 Note to documentation added about use of SSH agent in Git Bash. 2016-01-23 21:39:33 +03:00
Dmitry Schetnikovich 0b3bc255e6 Fix for install.bat under Windows 2016-01-23 21:31:53 +03:00
Dmitry Schetnikovich c8f0acf144 MongoDB debug objects and support for debug builds on Windows. 2016-01-23 20:15:35 +03:00
Dmitry Schetnikovich 6152d64d6a Installation batch frontend for Windows 2016-01-23 19:42:16 +03:00
Dmitry Schetnikovich 916daa76c9 Windows build configuration
1. Platform integration plugins are now installed for Windows
2. Installation of Qt libraries for Windows
3. Warnings that are turned off in MongoDB code,  also turned when compiling Robomongo
2016-01-23 19:40:56 +03:00
Dmitry Schetnikovich 9636f5f0f5 Windows standard libraries 2016-01-22 22:03:57 +03:00
Dmitry Schetnikovich bda503d3c9 Compilation of QScintilla and QJson on Windows. 2016-01-22 21:30:15 +03:00
Dmitry Schetnikovich d39a79b121 Merge branch 'v0.9' of github.com:paralect/robomongo into v0.9 2016-01-22 20:09:00 +03:00
Dmitry Schetnikovich 68cd7ecc70 Towards Robomongo for Windows
1. Build objects for MongoDB in release mode
2. Shell frontend for common build operations
3. Support for basic packaging in installation phase
2016-01-22 20:07:54 +03:00
schetnikovich 3e82292cfc Prerequisites documentation for building Robomongo for Windows platform 2016-01-22 17:23:19 +03:00
schetnikovich f825309d6e Documentation stab for Building Robomongo on Windows 2016-01-21 21:38:12 +03:00
schetnikovich 852c7041d2 Safer operation for directory removing 2016-01-21 14:50:22 +03:00
schetnikovich a9e24caf67 Documentation updated for building Robomongo and MongoDB fork 2016-01-21 14:31:04 +03:00
schetnikovich f006547b37 Support for Mac SDK 10.9 2016-01-21 13:55:32 +03:00
schetnikovich fb796ce1c4 Style changes for Mac platform 2016-01-20 20:43:27 +03:00
schetnikovich 20301dd0dd Qt "qt.conf" file used for installation phase and some build code cleanup made. 2016-01-20 16:54:18 +03:00
schetnikovich 8178aa91d2 RuntimeDependencies.md troubleshooting guide 2016-01-20 13:18:44 +03:00
schetnikovich 47f963f7dc Getting rid of "robomongo.sh" on Linux.
1. RPATH is now used for both Linux and Mac
2. File "qt.conf" now embedded to binary for all platforms
2016-01-19 21:44:26 +03:00
schetnikovich dade11a029 Documentation stub for BuildingRobomongo.md 2016-01-19 20:09:56 +03:00
schetnikovich 4225dda194 Fix for 'bin/run' utility when run under Mac 2016-01-19 19:59:29 +03:00
schetnikovich e1fdff1db7 DMG .DS_Store file 2016-01-19 19:13:12 +03:00
schetnikovich 369a79b110 Creation of Application Bundle for Mac with all dependencies 2016-01-19 17:35:53 +03:00
schetnikovich a692d66106 Installation of frameworks for Mac 2016-01-18 20:48:08 +03:00
schetnikovich 5957ad03ab Readme for icns regeneration 2016-01-18 17:48:58 +03:00
schetnikovich 7dbba28a18 Logo in icns format added 2016-01-18 17:46:09 +03:00
schetnikovich 0c260945b1 Raw iconset for new logo 2016-01-18 17:41:40 +03:00
Alex Bevilacqua 9aaf94fb06 Sort system.js functions by name (_id) 2016-01-17 20:27:18 -05:00
schetnikovich 2ffc14a778 Creationg of databases fixed for MongoDB 3.x 2016-01-17 19:46:00 +03:00
schetnikovich 8910b2f0cb Default settings restored 2016-01-17 19:02:30 +03:00
schetnikovich e2323967e8 Correct background color for TabBar on Linux 2016-01-17 18:43:34 +03:00
schetnikovich d6fdffd59b First steps to style Tab bar for Mac 2016-01-17 18:28:37 +03:00
schetnikovich fd08b27857 Window position for main window and JSON editor now relative to screen size. 2016-01-17 16:31:23 +03:00
schetnikovich a6babd6e0e Bash helper script to run application 2016-01-17 14:38:02 +03:00
schetnikovich 7f371314ce List of MongoDB debug objects 2016-01-16 21:34:41 +03:00
schetnikovich 75e82917aa Compilation for Mac OS 2016-01-16 20:44:35 +03:00
schetnikovich 1befc7e7c5 Mac OS dependencies 2016-01-16 19:27:10 +03:00
schetnikovich ce86901784 Missed DBus library for Linux 2016-01-16 14:38:16 +03:00
schetnikovich 1e40dfa2c0 Several tweaks for building and packaging
1. Linux specific dependencies added
2. Current git commit hash added to package file name
3. Now we use known target Qt5::Core to find Qt lib folder
2016-01-16 14:09:58 +03:00
schetnikovich aa12fbe1c2 Fix installation and packaging for Linux 2016-01-16 13:34:08 +03:00
schetnikovich 510e699bbe Bash frontend intro documentation 2016-01-15 20:48:01 +03:00
schetnikovich 5956997e94 Bash frontends for CMake on Unix-like OSes
1. bin/configure to run CMake configuration
2. bin/build to run CMake build generator
3. bin/install to run CMake 'install/strip' target
4. bin/pack to run CMake 'package" target
5. bin/clean to completely clean 'build' folder
2016-01-15 20:42:13 +03:00
schetnikovich 6cd40d17fe TGZ package creation for Linux 2016-01-15 18:27:30 +03:00
schetnikovich e48fae561b Strip debug info when creating package 2016-01-15 17:54:58 +03:00
schetnikovich b814924352 Do not compile unused lexers for Scintilla (only CPP and JS are left) 2016-01-15 17:35:56 +03:00
schetnikovich dc674d1991 Identified set of Scintilla lexers that are not needed for Robomongo. 2016-01-15 17:15:46 +03:00
schetnikovich f3ecf42f9f PackageRobomongo.cmake added 2016-01-15 17:05:02 +03:00
schetnikovich c5f6f68225 Use relative paths in DESTINATION param of install() command. 2016-01-15 17:00:57 +03:00
schetnikovich 7aaaf6abb6 Several build tweaks for Linux (tested both for release and debug).
1. CMAKE_POSITION_INDEPENDENT_CODE turned on
2. THREADS_PREFER_PTHREADS_FLAT turned on as recommended in module documentation
3. Configuration summary moved to separate file
4. Cleanup of used CXX flags (only -fPIC and -std=c++11 are used for now)
5. Usage of Threads::Threads target instead of explicit link to "pthreads"
2016-01-15 15:35:48 +03:00
schetnikovich 63c942bd20 Installation of Qt plugins 2016-01-15 06:18:58 +03:00
schetnikovich ebbef08258 Robomongo configuration summary updated 2016-01-14 20:30:01 +03:00
schetnikovich 1aff489efe Installation of wrapper script and required ICU libraries 2016-01-14 20:26:09 +03:00
schetnikovich 83e088870e Qt5 libraries copied: Core, Gui and Widgets. 2016-01-14 19:23:10 +03:00
schetnikovich 173a4e7912 Install scripts for Linux. Qt5 libraries copied for distribution. 2016-01-14 19:22:28 +03:00
schetnikovich 9ba567752a JIT enabled (and new icon added :) 2016-01-13 19:48:27 +03:00
schetnikovich f0f0d448ae MongoDB ScriptEngine seems no longer needs to be cleaned 2016-01-13 19:11:14 +03:00
schetnikovich 63f63c4142 Diagnostic output removed from dbshell 2016-01-13 03:18:41 +03:00
schetnikovich 0a135a08b0 CMAKE_INCLUDE_CURRENT_DIR turned off 2016-01-13 03:10:01 +03:00
schetnikovich 802b15228c Several changes
1. Added missed BUILD_MINSIZEREL check
2. Cleanup of robomongo/CMakeLists.txt
3. Removed OS_WIN, OS_MAC and OS_LINUX definitions
4. Q_OBJECT added back to JSLexer
5. Manual moc for QScintilla (automatic doesn't work)
2016-01-12 21:24:49 +03:00
schetnikovich 2459a92a23 Switched to object linking mode with MongoDB instead of static libs.
1. List of objects now read from files
1. Release builds now supported for Linux (and by default)
2. Process of creation of object files is documented
3. In configuration summary we now show Build Type.
2016-01-12 18:52:47 +03:00
schetnikovich 34fc597cc8 FindMongoDB.cmake changes 2016-01-12 16:12:41 +03:00
schetnikovich 13483d3ea2 DefineDefaults.cmake with platform and build type checks 2016-01-11 20:15:14 +03:00
schetnikovich 2776da3660 Formating fix 2016-01-11 19:35:42 +03:00
schetnikovich d819ab361a Default CMAKE_BUILD_TYPE is RelWithDebInfo 2016-01-11 19:33:59 +03:00
schetnikovich 85cbe8e9cd CMake cache cleanuped. All unnecessary cache entries removed 2016-01-11 19:04:25 +03:00
schetnikovich 519fea6f66 FindMongoDB.cmake: INTERFACE IMPORTED instead of STATIC IMPORTED 2016-01-11 15:44:25 +03:00
schetnikovich f35aba90ab Minor changes in file names 2016-01-10 20:30:41 +03:00
schetnikovich 567c2cc2ad FindMongoDB.cmake module now publishes IMPORTED target with all required include dirs, libs and definitions 2016-01-10 20:22:59 +03:00
schetnikovich 47576ae8c0 FindMongoDB.cmake module integrated with Robomongo 2016-01-10 19:14:20 +03:00
schetnikovich b25b33a3a1 CMake target interface is used, instead of DIRECTORY scoped definitions and other compile options 2016-01-10 18:11:23 +03:00
schetnikovich 745bc86275 Readme updated 2016-01-10 17:22:12 +03:00
schetnikovich 128ef1e6fc QScintilla sources moved to third-party/qscintilla/sources folder. README file added 2016-01-10 17:09:48 +03:00
schetnikovich b550bb287a QJson sources moved to /third-party/qjson/sources folder. README file added 2016-01-10 16:54:22 +03:00
schetnikovich 0beb3c886a CMake scripts for QScintilla 2016-01-10 16:10:04 +03:00
schetnikovich b472e90849 CMake script for QJson 2016-01-10 15:41:02 +03:00
schetnikovich 16e09e7e82 Compilation and linking on Linux against MongoDB 3.2
1. Cleanup of CMake (in progress)
  2. FindModule for MongoDB (in progress)
2016-01-09 20:03:55 +03:00
schetnikovich 0eafa778b0 Tada! Robomongo embeds MongoDB 3.2 shell and runs. But for now it cannot connect to MongoDB :). This should be investigated in next days 2016-01-06 22:13:27 +03:00
schetnikovich f8f6f08de9 LogWidget now linked successfully 2016-01-06 21:11:57 +03:00
schetnikovich 226ebe0c75 Files in gui folders dialogs, editors, utils and widgets are compiled and linked 2016-01-06 20:59:45 +03:00
schetnikovich 8c59a8bebb New set of compiled and linked units 2016-01-06 20:48:44 +03:00
schetnikovich 08c72911c5 More compiled and linked units 2016-01-06 20:42:26 +03:00
schetnikovich 71ba8cf9e5 Logbook of migration notes 2016-01-06 20:19:57 +03:00
schetnikovich 81c27fe5dc Successfully linked against upgraded QScintilla2 2016-01-06 20:05:24 +03:00
schetnikovich a04773ccf3 Scintilla upgraded from 3.3.6 to 3.5.4. QScintilla wrapper upgraded from 2.8.4 to 2.9.1 2016-01-06 19:51:40 +03:00
schetnikovich 7273f790d6 Two additional files compiled and linked successfully 2016-01-06 19:47:39 +03:00
schetnikovich b69647d881 Third isolated scope of compilation units 2016-01-06 19:33:42 +03:00
schetnikovich 7226577fcb New isolated set of compilation units compiled and linked successfully 2016-01-06 19:11:23 +03:00
schetnikovich f323fa8b88 Compilation of isolated set of files. Log severity now uses new mongo::logger::LogSeverity() class 2016-01-05 20:31:12 +03:00
schetnikovich 875094a359 Linking with roboshell 2016-01-05 07:19:28 +03:00
schetnikovich 38e7d29a8f BsonUtils and Logger 2016-01-05 02:33:42 +03:00
schetnikovich c716ea4b30 StdUtils, QtUtils and Logger 2016-01-04 21:13:08 +03:00
schetnikovich a2c398540b CMake utils 2016-01-04 17:30:33 +03:00
schetnikovich 4d821f1261 Shell code moved to trash 2016-01-04 14:14:39 +03:00
schetnikovich baaac575c1 Radical project cleanup 2016-01-04 14:07:46 +03:00
schetnikovich ba78c201b8 Ignore vim's *.swp files 2016-01-04 13:31:16 +03:00
schetnikovich 0ec8d76220 Upgraded to newer version of QJson 2016-01-03 20:39:31 +03:00
schetnikovich 968a83c380 Ignore .idea files 2015-12-28 15:25:49 +03:00
Dmitry Schetnikovich b6a2db169e Update README.md 2015-12-11 18:28:34 +03:00
Dmitry Schetnikovich 4e615fbce4 Update README.md 2015-12-11 18:12:55 +03:00
Dmitry Schetnikovich 57251327ae Update README.md 2015-12-10 13:13:34 +03:00
Dmitry Schetnikovich 9a0becd470 Merge pull request #986 from myaskevich/patch-1
Update README.md
2015-12-10 13:11:55 +03:00
Maxim Yaskevich 974cc4b561 Update README.md
Fix Magic Backlog link
2015-12-10 12:48:17 +03:00
Andrew Orsich 165f23753f updated readme. features in mind :) feature -> future 2015-12-10 11:05:58 +03:00
Andrew Orsich 8ac6426d91 Updated readme, added notes about campaign. 2015-12-10 10:39:15 +03:00
Stephen Steneker 97c1cf55c8 Fix #831: Text mode number values displaying in scientific notation 2015-04-15 21:30:00 +10:00
Stephen Steneker c43ea0e690 Merge pull request #844 from hdeheer/patch-1
Fix missing ; for point size in settingsManager
2015-04-15 21:26:39 +10:00
Hubert 09d84aedb3 Fix missing ; 2015-04-15 13:01:20 +02:00
Stephen Steneker 40585da9a4 Merge pull request #803 from CraigKelly/bug-649
Allow font specification to work around issue #649
2015-04-15 16:43:50 +10:00
Stephen Steneker 5abd6029d5 Merge pull request #836 from candronikos/fix-CMAKE-INSTALL_PREFIX
Fixed CMAKE_INSTALL_PREFIX typo
2015-04-15 10:46:16 +10:00
Christopher Andronikos d766cf5c56 Fixed CMAKE_INSTALL_PREFIX now has effect 2015-04-04 17:07:59 +11:00
Stephen Steneker 91246d6c26 Ignore Qt5 Creator's user files 2015-03-20 17:12:28 +11:00
Stephen Steneker 7f54a7ec2c Fix #804: Some keys not working in 0.8.5 (Windows remote to Ubuntu
running xrdp)
2015-03-19 21:00:58 +11:00
Stephen Steneker f96ec0a1c2 Add a Support section and link to Gitter chat 2015-03-19 20:59:33 +11:00
Stephen Steneker e3af2978e1 Set dev version to 0.8.6 for bugfix release 2015-03-19 17:02:46 +11:00
Stephen Steneker 3298c06577 Fix #806: Respect setting of MACOSX_DEPLOYMENT_TARGET for min OS X SDK 2015-03-19 17:00:00 +11:00
Stephen Steneker 6a06ed57d2 Update README with current & upcoming release info and more ways to
contribute.
2015-03-18 05:49:38 +11:00
Craig Kelly 1204c5ddca Add text font family and point size to SettingsManager and honor in
GuiRegistry. This allows Linux users experiencing issue #649 to use a
different font (since the default monospace font appears to be giving Qt5
fits on some systems). It is also the first half of implementing #645
2015-03-16 17:30:13 -05:00
Stephen Steneker 28deda2425 Merge pull request #785 from rskvazh/master
Fix #475 wrong type for field (count) 1 != 16
2015-03-15 13:07:45 +11:00
Stephen Steneker 5446ecf43e Bump release version & copyright for 0.9.0dev 2015-03-15 13:06:39 +11:00
Stephen Steneker 3170d5dec1 Remove unused Circle icons 2015-03-15 11:02:20 +11:00
Stephen Steneker 092ba3e06d Remove unused bson-old icons 2015-03-15 11:00:23 +11:00
Roman Skvazh 025295a330 Remove unnecessary include 2015-03-11 11:54:11 +03:00
Roman Skvazh d0980f215a Fix #475 wrong type for field (count) 1 != 16 2015-03-11 11:45:32 +03:00
10644 changed files with 918665 additions and 1941194 deletions
+4 -6
View File
@@ -7,6 +7,7 @@ CMakeLists.txt.user*
.scons
*.kate-swp
*.swp
target/
target-debug/
@@ -18,7 +19,7 @@ libs/
/src/robomongo/robomongo.pro.user.1.3
/src/third-party/mongodb/src/third_party/js-1.7/jswgen
.idea/
# Created by http://www.gitignore.io
@@ -31,6 +32,7 @@ libs/
# Compiled Dynamic libraries
*.so
*.so.*
*.dylib
*.dll
@@ -77,15 +79,11 @@ libs/
*.pro.user
*.pro.user.*
*.moc
moc_*.cpp
qrc_*.cpp
ui_*.h
Makefile*
*-build-*
# QtCreator
*.autosave
*.creator.user
### Windows ###
+400
View File
@@ -0,0 +1,400 @@
0.9.0-RC6 / February 13, 2016
Most important changes: support for MongoDB 3.x and WiredTiger engine. Robomongo
now embeds MongoDB 3.2 shell. It means that you can now use the latest
shell functionality. Both MONGODB-CR and SCRAM-SHA-1 authentication mechanisms are
supprted. Also, we now allow direct connections to Replica Set members and
support IPv6 protocol. Loading of huge list of collections is now faster.
Fixed incorrect representation of floating-point numbers (fixed since RC3).
This bug was a reason of a big number of issues:
#910, #748, #697, #699, #760, #815, #870, #892,
#894, #905, #945, #974, #978, #990, #831, #842
What's new in RC7 (March 4, 2016 )
http://blog.robomongo.org/robomongo-rc7
What's new in RC6 (February 13, 2016 )
http://blog.robomongo.org/ipv6-protocol
What's new in RC5 (February 8, 2016 )
http://blog.robomongo.org/campaign-is-over-robomongo-is-not/
What's new in RC4 (February 1, 2016 )
http://blog.robomongo.org/robomongo-rc4
What's new in RC3 (January 29, 2016 )
http://blog.robomongo.org/robomongo-0-9-0-rc3-released
What's new in RC2 (January 26, 2016)
http://blog.robomongo.org/robomongo-rc2-for-windows-mac-os-x-and-linux
What's new in RC1 (January 17, 2016)
http://blog.robomongo.org/robomongo-rc1-with-full-support-for-mongodb-3
0.8.5 / March 10, 2015
Release 0.8.5 is now deprecated because of a critical bug, that is
described here: http://blog.robomongo.org/robomongo-0-9-0-rc3-released
We recommend to use Robomongo 0.9.0 or newer.
* [Stephen Steneker]
- OS X build fixes for XCode 5 / libc++ (#524)
- OS X specific keyboard shortcut tips (#505)
- View documents fail if collection name is "group" (#414)
- Problem with slash in collection names (#404)
- Add shortcut to open JS file (#408)
- Fullscreen mode not working on OS X (#519)
- Usability request - add initial curly braces to command bar (#506)
- TTL index should allow expiry of 0 seconds (#500)
- Add line numbers to JSON editing windows on OS X (#449)
- Add user preference to have line numbers displayed by default (#564)
- Space after document causes validation error (#544)
- Expand current server as soon as you connect to it (#405)
- Switching tabs using standard keys on OS X (#87)
- Cannot make the Edit Document Window smaller (#548)
- Consistent numbering for tree/table/text view items (#421)
- Reload Query with keyboard shortcut doesn't work (#551)
- Rename "Reload" to "Re-execute query" (#447)
- Add "Copy Timestamp from ObjectId" to context menu for ObjectId fields (#559)
- Bug: Type of Double changed to Int32 on save document (#622)
- "Duplicate Query In New Tab": add to Window menu with keyboard shortcut (#631)
- No errors logged if settings directory cannot be created or settings file cannot be written to (#636)
- Show execution time for operations that don't return results (#455)
- Disable broken "Copy Collection to Database" misfeature (#398)
* [Vladimir Belozyorov]
- View mode reset to default after no results (#509)
- Comment / uncomment selected code in the shell (#467)
- Passphrase and password should be hidden in authentication tab (#433)
- Cursor initialization - place between curly brackets for default find({}) query (#592)
- Include full date/time for log entries (#596)
- Option to disable selected code autoexecution when opening a new tab (#514)
- Tooltip fixes to match current keyboard shortcuts (#598)
- Expand/collapse multiple selections (#591)
- Changes in toolbars visibility are saved in config file (#457)
- Include connection name under shell tabs (#47)
* [Sergey Gavruk]
- SettingsManager typo (#558)
- Ability to disable autocompletion (#512)
* [Kanstantsin Kamkou]
- Increase display width for limit & offset input fields (#458)
* [volans-]
- CreateUserDialog.cpp: fixed typo in warning message
* [Andres Kievsky]
- Added new app icon in a variety of png and iDraw formats (#693)
* [Michael Steinacher]
- Retina text display support (#724)
0.8.4 / November 27, 2013
Read about updates in this version here:
http://robomongo.org/whats-new-in/robomongo-0.8.4.html
RC1:
* SSH support (#117)
* SSL support (first steps) (#100)
* Create or edit index problem (#341)
* Regexp error (with non-latin symbols) (#351)
* Support for latin characters in edit document console (#347)
* Robomongo fails to execute shell "comments" if the comment contains a non-latin character! (#334)
* Crash when add ISODate field (#350)
* Crash at executing several disconnections in a row (#290)
* Deleting multiple documents prompts for each document (#386)
* Connection context menu appears independently of position of Robomongo instance.
* Crash at pressing "Ctrl+T" without any connection.
RC2:
* SSH now works on Mac OS X Mavericks (#401)
* Fixed crash when parsing date (#356)
Final:
* Selected view mode of result panels now preserved between executions. Implemented by Vladimir Belozyorov (github.com/VBelozyorov) (#402)
0.8.3 / October 1, 2013
Read about updates in this version here:
http://robomongo.org/whats-new-in/robomongo-0.8.3.html
* Enable query logging (#108)
* Inserting multiple documents from UI (#173)
* Removing multiple documents from UI (#174)
* Retain current view mode when running search (#93, #79)
* Left panel collections/functions/users navigation doesn't work when authenticating against the DB (#282)
* A way to disable Alt + number shortcut (#192)
* Support mongodb 2.4.x style users (#139)
* Add "Copy JSON" menu item to context menu (#298)
* JSON list validation (#246)
* Crash creating new Database (#291)
* Incorrect handling of TTL Indexes (#313)
* Add the document _id in the tree view (#142)
* BSON Undefined type doesn't rendered to string correctly (#306)
* Entering incorrect symbols as database name isn't handled properly (#262)
* Ability to select UI theme
* We now show number of fields (inside objects) and number of items (inside arrays) in Tree View.
* Support for Mac OS X 10.6 (#287)
* Support for Mac OS X 10.9 (#254)
0.8.2 / September 13, 2013
Read about updates in this version here:
http://robomongo.org/whats-new-in/robomongo-0.8.2.html
0.8.1 / September 6, 2013
Read about updates in this version here:
http://robomongo.org/whats-new-in/robomongo-0.8.1.html
* Table Mode (in this version, only for the first-level fields in documents) (#72)
* Paging Widget tweaks (#247, #203, #244, #243)
* ~/.robomongorc.js file is loaded automatically when new shell is opened
(c:\Users\Name\.robomongorc.js for Windows)
* "Load .mongorc.js" menu item in "Options" top-level now allow to enable/disable loading
of ~/.mongorc.js file. By default it will not load this file.
* Batch Size now configurable (in this version only manually via ~/.config/robomongo.json)
* JSON parser doesn't correctly parse numbers when locale isn't en_EN (#246, #253)
* "Display Dates In" options doesn't saved/loaded correctly (#261)
* [Linux] Support for CentOS
* [Linux] Linux packages now takes 2x less space (10mb instead of 20mb)
* [Windows] Desktop icon isn't created despite corresponding checkbox was checked at installation. (#260)
* [Windows] Invalid symbols in installer for Windows if display language of system isn't English (#259)
0.8.0 / August 23, 2013
Read about updates in this version here:
http://robomongo.org/whats-new-in/robomongo-0.8.0.html
* Ability to save and load files for currently opened shell (#96)
* MongoDB Index management (#74)
* Expand all children recursively (#106)
* Ability to toggle line numbers (press F11) for any editor in Robomongo (#112)
* View Mode settings is persisted now (thanks, Luke Thompson!) (#114)
* Search capability for any editor in Robomongo - press (Ctrl + F) (#32)
* Timezone support: UTC or Local (#224)
* Auto-complete on "Tab" (#95)
* Fixed incorrect handling of Dates (#111)
* Fixed incorrect handling of collections with leading underscore (_) symbol (#109)
* Fixed incorrect rendering of float numbers (#115)
* Fixed incorrect handling of Int64 numbers (#157)
* Fixed incorrect parsing of DBRef sub-objects (#113)
* New build system, based on CMake. Greatly simplified build and package process.
* Qt updated to 5.1 version.
* QScintilla updated to 2.7.2 version.
0.7.1 / April 13, 2013
* Fixed crash when right-clicking on non-primitive elements in Tree View (#85)
* Alt + Cmd + Arrow for switching tabs on Mac (#82)
* Several minor bugs fixed (including #82)
0.7.0 / April 4, 2013
* Support for UUIDs (read more: http://robomongo.org/articles/uuids.html)
0.6.9 / April 3, 2013
* Password is hidden by default (#65)
* Fixed incorrect rendering of large values for the db.stats() results (#70)
* Collection names with invalid (for JS var name) characters now rendered correctly (#71)
0.6.8 / April 1, 2013
* Support for '~/.mongorc.js'
* Various Mac OS X UI fixes
* Fixed crash when pressing Ctrl + W (#60)
* "Copy Value" context menu item for documents in Tree View
0.6.7 / March 26, 2013
* Fixed creation of new tabs based on the current one. Before this fix initial
database for new tab wasn't identical to the "parent". (#56)
* Support for collections that starts from digits (#54)
* [Sergey Gavruk] Duplicate Collection feature (Collection -> Duplicate Collection
* Collection -> Reindex will not run immediately, as before
* Fixed incorrect disposing of tabs resources (connections etc.) (#42)
* [Stephen Steneker] Fixed KeepAlive invalid commands, when not authorised (#41)
* [Sergey Gavruk] Various Mac OS X UI fixes.
0.6.6 / March 23, 2013
* Fixed possible crash when viewing results in text mode (#34)
* Fixed possible crash when testing connection (Diagnostic window)
* Memory leak in explorer's database tree fixed.
0.6.5 / March 17, 2013
* Fixed "Dropped connection" issue (#28).
* Windows Installer now be used to destribute Robomongo.
0.6.4 / March 10, 2013
* Support for JS functions. Create/Edit/Remove/View.
* Loading indicators (three dots for now) for Server, Collections, Functions and Users.
* Count indicators for Server (number of databases), Collections, Functions and Users.
* No need to type "functionName.toString()". You can output source of function
by simply typing its name (like in the shell).
* Support for RegEx, Code and CodeWScope bson elements. But you still cannot edit
documents which contains Code or CodeWScope bson elements.
* About dialog added.
0.6.3 / March 5, 2013
* Script execution can be stopped (this works only for JS code in SpiderMonkey VM) (#23)
* Toolbar buttons shown only if needed (#21, #20)
* MongoDB Connections window opens when application starts.
* Some changes in menu items locations (#25, #26)
* View Mode buttons moved to Options menu.
* Full Screen and Logs functionality hidden right now (postponed for versions after Robomongo 1.0)
0.6.2 / March 4, 2013
* "Users" folder now shows list of users.
* User can be added (Database -> Add User)
* User can be edited (User -> Edit User)
* User can be removed (User -> Remove Users)
* Users can be refreshed (Users (folder) -> Refresh Users)
* List of users can be viewed in the shell (Users (folder) -> View Users)
0.6.1 / March 2, 2013
* Minor script editor and viewer tweaks
0.6.0 / Feb 28, 2013
* Database can be created from UI (Server -> Create Database)
* Database can be dropped from UI (Database -> Drop Database)
* Collection can be created from UI (Database -> Create Collection)
* Collection can be dropped from UI (Collection -> Drop Collection)
* Collection can be renamed from UI (Collection -> Rename Collection)
* All documents can be removed from UI (Collection -> Remove All Documents)
* Minor tweaks in naming of context menu items.
0.5.7 / Feb 27, 2013
* Support for Custom View Modes. First custom view implemented for "db.printCollectionStats()" query. You
still can view multiple output results, even if one of them presented in custom mode.
* "Show Log" context menu item for servers in Explorer.
0.5.6 / Feb 26, 2013
* Support for one-line MongoDB commands ("show dbs", "show collection", "use somedb" etc.). This commands can
be repearted (this will result in multiple output results) or they can be used together with ordinary JavaScript.
The only rule: this command should be the only text on the line, starting from the very beginning of the line.
* Refresh of databases and collections via "Refresh" context menu item.
* This version of Robomongo is the first version compiled in release mode. It works much more faster and uses lower
amount of memory.
0.5.5 / Feb 22, 2013
* New document can be added in a more user friendly way. There are two ways to do it:
1) Right-click on collection in Explorer and select "Insert Document"
2) Right-click at any place of Tree View and select "Insert Document"
* Better formatting of JSON with correct indention.
* Support for ISODate(...) factory function in JSON parser and builder. Date in JSON mode now always
displayed as ISODate(...), like in the shell. Document Editor accepts dates in two forms:
as "new Date(<millisecs>)" and "ISODate(<iso_8601_date_string>)" (this behaviour identical to MongoDB shell behaviour)
* Document editor implemented. Right-click on document in Tree View and select "Edit".
* Document viwer implemented. Right-click on document in Tree View and select "View".
* You can delete selected document in Tree View. (Right-click and select "Delete")
* Validation of JSON in Document Editor/Viewer with error report, highlighting of errors and
cursor positioning just where error is.
* Fixed problem with "signed" dates (dates before Unix Epoch) (#5)
* Fixed problem with UTF-8 (#17)
* Fixed problem with loading indicator in Explorer (#18)
0.5.2 / Jan 26, 2013
In this version autocompletion in Robomongo becomes mostly usable.
* AutoCompletion box now placed just near text you typed (in correct line and column)
* AutoCompletion now works in the middle of the text (not only at the end of line, as before)
* Ctrl + Space will trigger autocompletion for symbols under cursor.
* If you select function in autocompletion box, their open parenthesis will overwrite existing in the text, if such available.
0.5.1 / Jan 24, 2013
* Several autocompletion tweaks.
0.5.0 / Jan 24, 2013
* AutoCompletion. First version.
* Progress indicator for shells.
* Shell result panels now have equal size, if this is possible.
* Code cleanuped a bit.
0.4.6 / Jan 11, 2013
* Tooltip for collections with count and size.
0.4.5 / Jan 8, 2013
* WARNING: configuration file schema changed. Some properties will be
empty in Connection Settings Dialog. Please fill them again.
* Connection test (diagnostic) implemented.
* Indicators in the shell: current server, database and collection (if available)
This indicators are "real" - they respect your actual query.
* Execution time measurement. Displayed for each individual output result.
* Paging for each output result with respect to filtering, ordering, fields,
limit, skip etc. of actual text query (pilot version).
* Connection cloning support in Connections Dialog.
* Databases and collections now displayed in sorted order.
* Batch size extended to 50 documents.
* New shape of Shells.
* New shape of Connection Settings Dialog
* New shape of Connections Dialog.
0.4.0 / Dec 26, 2012
* No more "type 'it' for more results" when we have more than 20 objects in collection.
* Two global modes added - text and tree modes. Switch between them using F3 and F4.
* Two local modes added - text and tree modes. Switch between them using small
icons on Output panels for each resultset.
* Improved performance of json creation (from list of documents).
* Tooltips for tool buttons added.
* Maximization of output panel implemented (via small icon at the top right of output panel)
Click second time to restore back.
* Fix for not working Ctrl-O key shortcut (that opens Connections menu).
0.3.5 / Dec 25, 2012
* Context menu for server, database and collection.
* Tab management (Ctrl+Tab, Ctrl+Shift+Tab, Ctrl+T, Ctrl+F4)
* Context menu for tab
* Submenu for Connect button with connections.
* Hotkeys for first 9 connections (Alt+1, ..., Alt+9)
* Connections reordering via drag'n'drop in Connections dialog.
* Correct focus placement when opening new connection and switching tabs.
* Bonus: F12 - opens connections menu from any place.
* Memory leaks fix.
+42 -281
View File
@@ -1,285 +1,46 @@
cmake_minimum_required(VERSION 2.8.0)
if(POLICY CMP0048)
cmake_policy(SET CMP0048 OLD)
cmake_minimum_required(VERSION 3.0.0)
project(Robomongo)
# Where to look first for CMake modules, before "${CMAKE_ROOT}/Modules" is checked
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
# Project version
set(PROJECT_VERSION_MAJOR "0")
set(PROJECT_VERSION_MINOR "9")
set(PROJECT_VERSION_PATCH "0")
set(PROJECT_VERSION_BUILD "-RC7")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_BUILD}")
# Modules
include(RobomongoPrintUtils)
include(RobomongoCMakeDefaults)
include(RobomongoDefaults)
include(RobomongoCommon)
include(RobomongoTrashSymbols)
include(RobomongoTargetArch)
include(RobomongoInstallQt)
include(RobomongoPackage)
# Search for dependencies
find_package(Threading REQUIRED) # Wrapper arround CMake "Threads" module
find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5PrintSupport REQUIRED)
find_package(MongoDB REQUIRED)
if (SYSTEM_MACOSX)
find_package(Qt5MacExtras REQUIRED)
endif()
###
# Settings
#
set(PROJECT_NAME "Robomongo" CACHE STRING "Project Name")
set(PROJECT_NAME_TITLE ${PROJECT_NAME})
set(PROJECT_DOMAIN "www.robomongo.org" CACHE STRING "Internet domain name for ${PROJECT_NAME}")
set(PROJECT_COMPANYNAME "Paralect" CACHE STRING "Company name for ${PROJECT_NAME}")
set(PROJECT_COPYRIGHT "Copyright (C) 2013 ${PROJECT_COMPANYNAME} All Rights Reserved.")
set(PROJECT_COMPANYNAME_DOMAIN "www.paralect.com" CACHE STRING "Internet domain name for ${PROJECT_NAME}")
set(PROJECT_GITHUB_FORK "www.github.com/paralect/robomongo" CACHE STRING "Git fork of ${PROJECT_NAME}")
set(PROJECT_GITHUB_ISSUES "www.github.com/paralect/robomongo/issues" CACHE STRING "Git issue link for ${PROJECT_NAME}")
# Projects
add_subdirectory(src/third-party/openssl)
add_subdirectory(src/third-party/libssh2)
add_subdirectory(src/robomongo/ssh)
add_subdirectory(src/third-party/qjson)
add_subdirectory(src/third-party/qscintilla)
add_subdirectory(src/robomongo)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
set(MAJOR "0")
set(MINOR "8")
set(PATCH "5")
set(BUILD "")
set(SHORT_VERSION ${MAJOR}.${MINOR}.${PATCH} CACHE STRING "${PROJECT_NAME} short version")
set(PROJECT_VERSION "${SHORT_VERSION}${BUILD}" CACHE STRING "${PROJECT_NAME} version")
if(APPLE AND CMAKE_OSX_SYSROOT)
string(REGEX REPLACE ".*MacOSX([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_SDK_VERSION "${CMAKE_OSX_SYSROOT}")
string(REGEX REPLACE ".*MacOSX([0-9]+)\\.([0-9]+).*$" "\\2" DARWIN_MINOR_SDK_VERSION "${CMAKE_OSX_SYSROOT}")
if(EXISTS "${CMAKE_OSX_SYSROOT}")
set(MACOSX_DEPLOYMENT_TARGET ${DARWIN_MAJOR_SDK_VERSION}.${DARWIN_MINOR_SDK_VERSION})
set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
message("Setting MACOSX_DEPLOYMENT_TARGET to '${MACOSX_DEPLOYMENT_TARGET}'.")
endif()
elseif(UNIX AND NOT APPLE)
set(PROJECT_NAME ${PROJECT_NAME_LOWERCASE})
endif()
###
# Configure project
PROJECT(${PROJECT_NAME})
# Show configuration summary
include(RobomongoConfigurationSummary)
###
# Options
IF(WIN32)
OPTION(MANIFEST_ENABLE "Enable Manifest" ON)
if(POLICY CMP0020)
cmake_policy(SET CMP0020 OLD)
endif()
if(POLICY CMP0026)
cmake_policy(SET CMP0026 OLD)
endif()
ENDIF(WIN32)
set(ROBOMONGO_QT_VERSION 5 CACHE STRING "Qt version to use when building Robomongo (can be 4 or 5)")
OPTION(BOOST_ENABLED "Enable boost system support" OFF)
OPTION(OPENSSL_ENABLED "Enable openssl support" ON)
OPTION(SSH_ENABLED "Enable ssh support" ON)
OPTION(CPACK_SUPPORT "Enable package support" ON)
OPTION(DEVELOPER_DYNAMIC_RUNTIME "Build with dynamic C++ runtime" ON)
OPTION(DEVELOPER_FEATURES "Use some debug tricks for developers" OFF)
OPTION(DEVELOPER_ENABLE_TESTS "Enable tests for ${PROJECT_NAME_TITLE} project" ON)
IF(MSVC)
IF(CMAKE_CL_64)
OPTION(BUILD_64X "Build 64bit project" ON)
ELSE()
OPTION(BUILD_64X "Build 64bit project" OFF)
ENDIF()
ELSE()
IF("${OS_ARC}" STREQUAL "64")
OPTION(BUILD_64X "Build 64bit project" ON)
ELSEIF("${OS_ARC}" STREQUAL "32")
OPTION(BUILD_64X "Build 64bit project" OFF)
ELSE()
IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
OPTION(BUILD_64X "Build 64bit project" ON)
ELSE(CMAKE_SIZEOF_VOID_P MATCHES 8)
OPTION(BUILD_64X "Build 64bit project" OFF)
ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
ENDIF()
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE DEBUG)
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
ENDIF()
ENDIF()
INCLUDE(cmake/config.cmake)
DEFINE_DEFAULT_DEFINITIONS()
# Search libraries
# use Qt
DETECT_QT()
##################### Libraries search ###################
IF(DEVELOPER_QT5)
SET(QT_COMPONENTS_TO_USE Qt5Core Qt5Gui Qt5Widgets)
IF(UNIX AND NOT APPLE)
SET(QT_COMPONENTS_TO_USE ${QT_COMPONENTS_TO_USE} Qt5DBus) #for libqxcb
ENDIF(UNIX AND NOT APPLE)
IF(APPLE)
SET(QT_COMPONENTS_TO_USE ${QT_COMPONENTS_TO_USE} Qt5MacExtras)
ENDIF(APPLE)
ELSE()
SET(QT_COMPONENTS_TO_USE QtCore QtGui)
ENDIF()
INTEGRATE_QT(${QT_COMPONENTS_TO_USE})
##########################################################
IF(BUILD_64X)
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS 1)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -std=gnu++0x -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-literal-suffix -Wdeprecated-declarations")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m64")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m64")
ELSEIF(MSVC)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:x64")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /machine:x64")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /machine:x64")
ENDIF()
IF(APPLE)
SET(CMAKE_OSX_ARCHITECTURES x86_64)
ENDIF()
SET(ARCH_TEXT 64)
SET(ARCH_TEXT_PACKAGE x86_64)#amd64
ELSE()
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS 0)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32")
ELSEIF(MSVC)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:x86")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /machine:x86")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /machine:x86")
ENDIF()
IF(APPLE)
SET(CMAKE_OSX_ARCHITECTURES i386)
#-DCMAKE_OSX_ARCHITECTURES= ;i386
ENDIF()
SET(ARCH_TEXT 32)
SET(ARCH_TEXT_PACKAGE i386)
ENDIF()
##################################DEFAULT VALUES##########################################
IF(NOT CMAKE_INSTALL_PREFIX})
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
ENDIF()
IF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
MESSAGE(SEND_ERROR "In-source builds are not allowed.")
ENDIF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
############################################################################
IF(WIN32)
SET(RESOURCE_OS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/win.rc")
SET(RESOURCE_OS_IN "${CMAKE_SOURCE_DIR}/install/windows/winres.rc.in")
SET(ICON_FILE "${CMAKE_SOURCE_DIR}/src/robomongo/gui/resources/robo.ico")
SET(LIB_INSTALL_DESTINATION .)
SET(TARGET_INSTALL_DESTINATION .)
ELSEIF(APPLE)
SET(RESOURCE_OS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/robomongo.desktop")
SET(RESOURCE_OS_IN "${CMAKE_SOURCE_DIR}/install/robomongo.desktop.in")
SET(ICON_FILE "${CMAKE_SOURCE_DIR}/install/osx/Robomongo.icns")
SET(LIB_INSTALL_DESTINATION .)
SET(TARGET_INSTALL_DESTINATION .)
ELSEIF(UNIX)
SET(RESOURCE_OS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}.desktop")
SET(RESOURCE_OS_IN "${CMAKE_SOURCE_DIR}/install/robomongo.desktop.in")
SET(ICON_FILE "${CMAKE_SOURCE_DIR}/install/linux/robomongo.png")
SET(LIB_INSTALL_DESTINATION lib)
SET(TARGET_INSTALL_DESTINATION bin)
ENDIF()
# project sources
SET_PROPERTY( GLOBAL PROPERTY USE_FOLDERS ON)
ADD_SUBDIRECTORY(src)
IF(CPACK_SUPPORT)
SET(CPACK_PACKAGE_DESCRIPTION "Shell-centric cross-platform MongoDB management tool.")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME_TITLE} shell-centric cross-platform MongoDB management tool.")#CPACK_DEBIAN_PACKAGE_DESCRIPTION CPACK_RPM_PACKAGE_SUMMARY
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/DESCRIPTION")#CPACK_RPM_PACKAGE_DESCRIPTION
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_PACKAGE_VENDOR ${PROJECT_COMPANYNAME})#CPACK_RPM_PACKAGE_VENDOR
SET(CPACK_PACKAGE_CONTACT "Dmitry Schetnikovich <dima@paralect.com>")#CPACK_DEBIAN_PACKAGE_MAINTAINER
SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${SHORT_VERSION})
IF(BUILD)
STRING(REGEX REPLACE " " "" BUILD_ESCAPE ${BUILD})
SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${BUILD_ESCAPE}")
ENDIF(BUILD)
SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_PATCH})#CPACK_DEBIAN_PACKAGE_VERSION CPACK_RPM_PACKAGE_VERSION
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})#CPACK_DEBIAN_PACKAGE_NAME CPACK_RPM_PACKAGE_NAME
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${ARCH_TEXT_PACKAGE}")#out package name
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME})
SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME_TITLE};${PROJECT_NAME}")
MESSAGE(STATUS "CPACK_PACKAGE_FILE_NAME: ${CPACK_PACKAGE_FILE_NAME}")
SET(CPACK_MONOLITHIC_INSTALL ON)
IF(WIN32)
IF(NOT CPACK_GENERATOR)
SET(CPACK_GENERATOR NSIS)
ENDIF(NOT CPACK_GENERATOR)
IF(CPACK_GENERATOR STREQUAL "NSIS")
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
#SET(CPACK_NSIS_MODIFY_PATH ON)
SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/install/windows\\\\nsis-top-logo.bmp")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\${PROJECT_NAME}.exe")
SET(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}.exe")
SET(CPACK_NSIS_CREATE_ICONS "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROJECT_NAME}.lnk\\\" \\\"$INSTDIR\\\\${PROJECT_NAME}.exe\\\"")
SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$DESKTOP\\\\${PROJECT_NAME}.lnk\\\" \\\"$INSTDIR\\\\${PROJECT_NAME}.exe\\\"")
SET(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete \\\"$DESKTOP\\\\${PROJECT_NAME}.lnk\\\"")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\${PROJECT_COMPANYNAME_DOMAIN}")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\${PROJECT_DOMAIN}")
SET(SIDEBAR_IMAGE ${CMAKE_SOURCE_DIR}/install/windows\\\\database.bmp)
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "!define MUI_WELCOMEFINISHPAGE_BITMAP \\\"${SIDEBAR_IMAGE}\\\"")
SET(CPACK_NSIS_CONTACT "me@my-personal-home-page.com")
SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "..\\\\${PROJECT_NAME}.exe")
ENDIF(CPACK_GENERATOR STREQUAL "NSIS")
ELSEIF(APPLE)
IF(NOT CPACK_GENERATOR)
SET(CPACK_GENERATOR DragNDrop)
ENDIF(NOT CPACK_GENERATOR)
#SET(CPACK_OSX_PACKAGE_VERSION "10.5")
ELSEIF(UNIX)
SET(CPACK_STRIP_FILES ON)
#SET(UBUNTU_LP_BUG 300472)
#SET(CPACK_STRIP_FILES "bin/${PROJECT_NAME}")
#SET(CPACK_SOURCE_STRIP_FILES "")
IF(NOT CPACK_GENERATOR)
SET(CPACK_GENERATOR DEB)
ENDIF(NOT CPACK_GENERATOR)
IF(CPACK_GENERATOR STREQUAL "RPM" OR CPACK_GENERATOR STREQUAL "DEB")
SET(CPACK_PACKAGING_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
ENDIF(CPACK_GENERATOR STREQUAL "RPM" OR CPACK_GENERATOR STREQUAL "DEB")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install/linux/postinst.in" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/scripts/postinst" @ONLY IMMEDIATE)
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/scripts/postinst DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install/linux/prerm.in" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/scripts/prerm" @ONLY IMMEDIATE)
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/scripts/prerm DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
IF(CPACK_GENERATOR STREQUAL "RPM")
#CPACK_RPM_PACKAGE_ARCHITECTURE CPACK_RPM_PACKAGE_LICENSE CPACK_RPM_PACKAGE_DESCRIPTION CPACK_RPM_SPEC_INSTALL_POST
#SET(CPACK_PACKAGE_RELEASE 1)
SET(CPACK_RPM_PACKAGE_LICENSE "GPL v3")
#SET(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
SET(CPACK_RPM_PACKAGE_REQUIRES "libc.so.6 >= 2.12, libstdc++.so.6 >= 6.0.13, glibc, openssl, libgcc, mesa-libGL, libicu, gtk2, dbus, pango, libSM, libICE, liberation-sans-fonts")
SET(CPACK_RPM_PACKAGE_RELEASE 1)
SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries/${PROJECT_COMPANYNAME}")
SET(CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCH_TEXT_PACKAGE})
SET(CPACK_RPM_PACKAGE_VERSION ${SHORT_VERSION})
SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/postinst")
SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/prerm")
ELSEIF(CPACK_GENERATOR STREQUAL "DEB")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install/linux/fixup_deb.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/fixup_deb.sh" @ONLY IMMEDIATE)
IF(ARCH_TEXT_PACKAGE STREQUAL x86_64)
SET(ARCH_TEXT_PACKAGE amd64)
ENDIF()
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
#CPACK_DEBIAN_PACKAGE_HOMEPAGE The URL of the web site for this package
SET(CPACK_DEBIAN_PACKAGE_DEBUG ON)
SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
SET(CPACK_DEBIAN_PACKAGE_SECTION "database")#input our section
SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "Unknown")
SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "Unknown")
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH_TEXT_PACKAGE})#i386
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/postinst;${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/prerm")
ENDIF(CPACK_GENERATOR STREQUAL "RPM")
ENDIF(WIN32)
INCLUDE(CPack)
ENDIF(CPACK_SUPPORT)
+67 -13
View File
@@ -1,33 +1,87 @@
About Robomongo
===============
Robomongo &mdash; is a shell-centric crossplatform MongoDB management tool. <br />
Visit our site: [www.robomongo.org](http://www.robomongo.org)
[Robomongo](http://www.robomongo.org) is a shell-centric cross-platform MongoDB management tool. Unlike most other MongoDB admin UI tools, Robomongo embeds the actual `mongo` shell in a tabbed interface with access to a shell command line as well as GUI interaction.
Starting from version 0.9, Robomongo is compatibile with MongoDB 3.x (including SCRAM-SHA-1 auth and support for WiredTiger storage engine). Robomongo 0.9 embeds the **MongoDB 3.2** shell.
Robomongo 0.8.x embeds the **MongoDB 2.4.0** shell.
Download
========
You can download compiled version (for Mac OS X, Windows and Linux) from our site:<br />
[www.robomongo.org](http://www.robomongo.org)
You can download tested install packages for OS X, Windows, and Linux from our site: [www.robomongo.org](http://www.robomongo.org).
Vote for the Feature
====================
Please view our [Magic Backlog](http://robomongo.org/backlog). Here we are all together
building priorities for the next versions of Robomongo.
The latest stable release is currently **Robomongo 0.8.5**.
Contribute
==========
Contributions are always welcome! Just try to follow our coding style: [Robomongo Coding Style](https://github.com/paralect/robomongo/wiki/Robomongo-Coding-Style)
Support
=======
Robomongo is an open source project driven by volunteers. We'll try to get to your questions as soon as we can, but please be patient :).
You can:
- [Create a new issue in the Github issue queue](https://github.com/paralect/robomongo/issues)
- [Join developer discussion on Gitter](https://gitter.im/paralect/robomongo) [![Join the chat at https://gitter.im/paralect/robomongo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/paralect/robomongo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Build
=====
Build documentation: [Build Robomongo](https://github.com/paralect/robomongo/wiki/Build-Robomongo)
The wiki contains prerequisites and instructions to [Build Robomongo](https://github.com/paralect/robomongo/wiki/Build-Robomongo).
If you want to compile from source yourself, you should be able to do so cleanly from a [release branch](https://github.com/paralect/robomongo/releases).
What's Planned for the Next Release?
====================================
We are currently working toward a [0.9.0 release milestone](https://github.com/paralect/robomongo/milestones/Robomongo%200.9.0)
with some major features targeted including compatibility with MongoDB 3.0
(updated shell, SCRAM-SHA-1 auth, support for WiredTiger storage engine)
and full support for replica sets.
Contribute!
===========
### Vote for Features
Please view our [Magic Backlog](http://app.robomongo.org/backlog) to see features prioritised by donation. The small amount of donations we currently receive are put toward hosting costs.
### Suggest Features
New feature suggestions or UI improvements are always welcome.
This project is powered by open source volunteers, so we have a limited amount of development resource to address all requests. We will certainly make best efforts to progress (particularly for those with strong community upvotes).
### Code Contributions
Code contributions are always welcome! Just try to follow our coding style: [Robomongo Coding Style](https://github.com/paralect/robomongo/wiki/Robomongo-Coding-Style).
If you plan to contribute, please create a Github issue (or comment on the relevant existing issue) so we can help coordinate with upcoming release plans.
For a general workflow, see Github's guide to [Fork a Repo](https://help.github.com/articles/fork-a-repo/).
Pull requests (PRs) should generally be for discrete issues (i.e. one issue per PR please) and be clean to merge against the current master branch. It would also be helpful if you can confirm what testing has been done (specific O/S targets and MongoDB versions if applicable).
A usual naming approach for feature branches is `issue-###`. Include the issue number in your commit message / pull request description to link the PR to the original issue.
For example:
```#248: updated QScintilla to 2.4.8 for retina display support".```
### Design
There are some cosmetic issues we could use help with (designing images or UI). They are marked in the issue queue with a [`Cosmetic`](https://github.com/paralect/robomongo/labels/cosmetic) label. If you see an open issue that you'd like to contribute to, please feel free to volunteer by commenting on it.
### Testing
There are a number of issues we could use help with reproducing. They are marked in the issue queue with a [`Needs Repro`](https://github.com/paralect/robomongo/labels/needs%20repro) label. If you see an open issue that doesn't appear to be reproducible yet, please feel free to test and comment with your findings.
License
=======
Copyright (C) 2013 Paralect, Inc (http://www.paralect.com)
Copyright (C) 2013-2015 [Paralect, Inc](http://www.paralect.com)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
+20
View File
@@ -0,0 +1,20 @@
Bash fronted for CMake
======================
If you want to use this scripts, you need to set single environment variable:
export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5/5.5/gcc_64;/path/to/robomongo-shell"
Build Robomongo:
$ bin/configure
$ bin/build
Install Robomongo:
$ bin/install
Pack Robomongo:
$ bin/pack
Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
cd $BUILD_DIR
cmake --build . "${@:2}" -- -j8
+15
View File
@@ -0,0 +1,15 @@
@echo off
setlocal enableextensions enabledelayedexpansion
rem Path to bin and project folder
set BIN_DIR_WITH_BACKSLASH=%~dp0%
set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
set PROJECT_DIR=%BIN_DIR%\..
rem Run common setup code
call "%BIN_DIR%\common\setup.bat" %*
if %ERRORLEVEL% neq 0 (exit /b 1)
rem Run build
cd "%BUILD_DIR%"
cmake --build . --config %BUILD_TYPE%
Executable
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
cd $VARIANT_DIR && rm -rf $BUILD_DIR_NAME
+15
View File
@@ -0,0 +1,15 @@
@echo off
setlocal enableextensions enabledelayedexpansion
rem Path to bin and project folder
set BIN_DIR_WITH_BACKSLASH=%~dp0%
set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
set PROJECT_DIR=%BIN_DIR%\..
rem Run common setup code
call "%BIN_DIR%\common\setup.bat" %*
if %ERRORLEVEL% neq 0 (exit /b 1)
rem Clear build directory
cd "%VARIANT_DIR%"
rmdir /s /q "%BUILD_DIR_NAME%"
+49
View File
@@ -0,0 +1,49 @@
#!/usr/bin/env bash
if [ "$1" == "debug" ]; then
BUILD_TYPE=Debug
else
BUILD_TYPE=Release
# Prepend "release" in front of $@
set -- release "$@"
fi
# Build dir name is a lowercase of BUILD_TYPE
# i.e. debug
BUILD_DIR_NAME="$(echo $BUILD_TYPE | tr '[A-Z]' '[a-z]')"
# i.e. /path/to/robomongo/build
VARIANT_DIR=$PROJECT_DIR/build
# i.e. /path/to/robomongo/build/debug
BUILD_DIR=$VARIANT_DIR/$BUILD_DIR_NAME
# i.e. /path/to/robomongo/build/debug/install
INSTALL_PREFIX=$BUILD_DIR/install
# i.e. /path/to/robomongo/build/debug/package
PACK_PREFIX=$BUILD_DIR/package
PREFIX_PATH=$ROBOMONGO_CMAKE_PREFIX_PATH
mkdir -p $BUILD_DIR
if [ "$(uname -s)" == "Darwin" ]; then
# On Mac OS we specify minimal OS version that we support.
#
# The following environment variable will set "-mmacosx-version-min=10.6" option
# for compiler. From documentation to GCC or Clang:
#
# -mmacosx-version-min=version
#
# The earliest version of MacOS X that this executable will run on is
# version. Typical values of version include 10.1, 10.2, and 10.3.9.
#
# This value can also be set with the MACOSX_DEPLOYMENT_TARGET environment
# variable. If both the command-line option is specified and the
# environment variable is set, the command-line option will take precedence.
#
export MACOSX_DEPLOYMENT_TARGET=10.9
fi
+48
View File
@@ -0,0 +1,48 @@
rem Check that ROBOMONGO_CMAKE_PREFIX_PATH is set
if not defined ROBOMONGO_CMAKE_PREFIX_PATH (
echo Set environment variable ROBOMONGO_CMAKE_PREFIX_PATH in order to use this script
echo.
echo For example, execute the following command:
echo setx ROBOMONGO_CMAKE_PREFIX_PATH "c:\Qt-5\5.5\msvc2013_64;c:\robomongo-shell"
echo.
echo You also need to reopen your Windows Command Prompt.
exit /b 1
)
rem Check for debug build type
if %1. == debug. (
set BUILD_TYPE=Debug
) else (
rem If build type wasn't specified - Release mode assumed
if %1. ==. (
set BUILD_TYPE=Release
) else (
echo Invalid build type "%1". Supported build types: debug or release.
exit /b 1
)
)
rem Build dir name (i.e. Release)
set BUILD_DIR_NAME=%BUILD_TYPE%
rem i.e. /path/to/robomongo/build
set VARIANT_DIR=%PROJECT_DIR%\build
rem i.e. /path/to/robomongo/build/debug
set BUILD_DIR=%VARIANT_DIR%\%BUILD_DIR_NAME%
rem i.e. /path/to/robomongo/build/debug/install
set INSTALL_PREFIX=%BUILD_DIR%\install
rem i.e. /path/to/robomongo/build/debug/package
set PACK_PREFIX=%BUILD_DIR%/package
rem Get value from environment variable
set PREFIX_PATH=%ROBOMONGO_CMAKE_PREFIX_PATH%
rem Create BUILD_DIR if it is not exists already
if not exist "%BUILD_DIR%" (
md "%BUILD_DIR%"
)
Vendored Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
cd $BUILD_DIR
cmake -D "CMAKE_PREFIX_PATH=$PREFIX_PATH" -D "CMAKE_BUILD_TYPE=$BUILD_TYPE" -D "CMAKE_INSTALL_PREFIX=$INSTALL_PREFIX" "${@:2}" $PROJECT_DIR
+15
View File
@@ -0,0 +1,15 @@
@echo off
setlocal enableextensions enabledelayedexpansion
rem Path to bin and project folder
set BIN_DIR_WITH_BACKSLASH=%~dp0%
set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
set PROJECT_DIR=%BIN_DIR%\..
rem Run common setup code
call "%BIN_DIR%\common\setup.bat" %*
if %ERRORLEVEL% neq 0 (exit /b 1)
rem Run CMake configuration step
cd "%BUILD_DIR%"
cmake -G "Visual Studio 12 2013 Win64" -D "CMAKE_PREFIX_PATH=%PREFIX_PATH%" -D "CMAKE_BUILD_TYPE=%BUILD_TYPE%" -D "CMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" %PROJECT_DIR%
Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
cd $BUILD_DIR
cmake --build . --target install/strip "${@:2}"
+15
View File
@@ -0,0 +1,15 @@
@echo off
setlocal enableextensions enabledelayedexpansion
rem Path to bin and project folder
set BIN_DIR_WITH_BACKSLASH=%~dp0%
set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
set PROJECT_DIR=%BIN_DIR%\..
rem Run common setup code
call "%BIN_DIR%\common\setup.bat" %*
if %ERRORLEVEL% neq 0 (exit /b 1)
rem Run install
cd "%BUILD_DIR%"
cmake --build . --config %BUILD_TYPE% --target install
Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
cd $BUILD_DIR
cmake --build . --target package "${@:2}"
+15
View File
@@ -0,0 +1,15 @@
@echo off
setlocal enableextensions enabledelayedexpansion
rem Path to bin and project folder
set BIN_DIR_WITH_BACKSLASH=%~dp0%
set BIN_DIR=%BIN_DIR_WITH_BACKSLASH:~0,-1%
set PROJECT_DIR=%BIN_DIR%\..
rem Run common setup code
call "%BIN_DIR%\common\setup.bat" %*
if %ERRORLEVEL% neq 0 (exit /b 1)
rem Run install
cd "%BUILD_DIR%"
cmake --build . --config %BUILD_TYPE% --target package
Executable
+12
View File
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get directory of this file
PROJECT_DIR=$(dirname $BIN_DIR) # Get root directory of project
source $BIN_DIR/common/setup $1
if [ "$(uname -s)" == "Darwin" ]; then
# On Mac OS we should run executable from bundle
"$BUILD_DIR/src/robomongo/Robomongo.app/Contents/MacOS/Robomongo"
else
"$BUILD_DIR/src/robomongo/robomongo"
fi
+142
View File
@@ -0,0 +1,142 @@
#
# Find the MongoDB libraries
#
# This module defines the following variables:
# MongoDB_FOUND
# MongoDB_LIBS
# MongoDB_INCLUDE_DIRS
# MongoDB_DEFINITIONS
#
# Imported target "mongodb" is created
#
# We assume, that at least "mongo" target was build by the following command:
# $ scons mongo
#
#
# Try to find MongoDB directory (uses CMAKE_PREFIX_PATH locations)
find_path(
MongoDB_DIR src/mongo/config.h.in
DOC "Path to MongoDB (github.com/robomongo-shell) root directory"
)
# Find relative path to build directory
if(BUILD_RELEASE OR BUILD_RELWITHDEBINFO OR BUILD_MINSIZEREL)
set(MongoDB_RELATIVE_BUILD_DIR build/opt)
set(MongoDB_OBJECT_LIST_BUILD_TYPE_PART release)
elseif(BUILD_DEBUG)
set(MongoDB_RELATIVE_BUILD_DIR build/debug)
set(MongoDB_OBJECT_LIST_BUILD_TYPE_PART debug)
endif()
# Set absolute path to build directory
set(MongoDB_BUILD_DIR ${MongoDB_DIR}/${MongoDB_RELATIVE_BUILD_DIR})
# Set commong compiler definitons
set(MongoDB_DEFINITIONS
PCRE_STATIC
BOOST_THREAD_VERSION=4
BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD
BOOST_THREAD_NO_DEPRECATED
BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS
BOOST_THREAD_HAS_BUG
MONGO_CONFIG_HAVE_HEADER_UNISTD_H
)
# Set common compiler include directories
set(MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src
${MongoDB_DIR}/src/third_party/boost-1.56.0
${MongoDB_DIR}/src/third_party/mozjs-38/include
${MongoDB_DIR}/src/third_party/mozjs-38/mongo_sources
${MongoDB_DIR}/src/third_party/pcre-8.37
${MongoDB_BUILD_DIR}
)
if(SYSTEM_LINUX)
set(MongoDB_OBJECT_LIST_PLATFORM_PART linux)
list(APPEND MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/linux/include)
elseif(SYSTEM_WINDOWS)
set(MongoDB_OBJECT_LIST_PLATFORM_PART windows)
list(APPEND MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/windows/include)
elseif(SYSTEM_MACOSX)
set(MongoDB_OBJECT_LIST_PLATFORM_PART macosx)
list(APPEND MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/osx/include)
elseif(SYSTEM_FREEBSD)
set(MongoDB_OBJECT_LIST_PLATFORM_PART freebsd)
list(APPEND MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/freebsd/include)
elseif(SYSTEM_OPENBSD)
set(MongoDB_OBJECT_LIST_PLATFORM_PART openbsd)
list(APPEND MongoDB_INCLUDE_DIRS
${MongoDB_DIR}/src/third_party/mozjs-38/platform/x86_64/openbsd/include)
endif()
# Read list of object files
# See "mongodb/README.md" file (relative to the current folder) for more information.
file(READ
${CMAKE_CURRENT_LIST_DIR}/mongodb/${MongoDB_OBJECT_LIST_PLATFORM_PART}-${MongoDB_OBJECT_LIST_BUILD_TYPE_PART}.objects
MongoDB_RELATIVE_LIBS)
string(STRIP "${MongoDB_RELATIVE_LIBS}" MongoDB_RELATIVE_LIBS)
# Convert string to list
string(REPLACE " " ";" MongoDB_RELATIVE_LIBS ${MongoDB_RELATIVE_LIBS})
# Convert to absolute path
foreach(lib ${MongoDB_RELATIVE_LIBS})
list(APPEND MongoDB_LIBS ${MongoDB_DIR}/${lib})
endforeach()
# Get MongoDB repository recent tag
execute_process(
COMMAND git describe --abbrev=0 --tags
WORKING_DIRECTORY ${MongoDB_DIR}
OUTPUT_VARIABLE MongoDB_RECENT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# Handle the QUIETLY and REQUIRED arguments and set ALSA_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MongoDB
FOUND_VAR MongoDB_FOUND # When using CMake 3.0 MONGODB_FOUND variable will be created.
# Make it explicit that variable name is MongoDB_FOUND.
REQUIRED_VARS MongoDB_DIR MongoDB_BUILD_DIR
VERSION_VAR MongoDB_RECENT_TAG
FAIL_MESSAGE "Could not find Robomongo Shell (MongoDB fork). Make sure that CMAKE_PREFIX_PATH points to Robomongo Shell project root.\n")
if(MongoDB_FOUND)
set(MongoDB_VERSION ${MongoDB_RECENT_TAG})
# Original MongoDB link command has the following in the end: m rt dl
set(MongoDB_LIBS
${LINK_WHOLE_ARCHIVE_START} # Linux: -Wl,--whole-archive
${LINK_LIBGROUP_START} # Linux: -Wl,--start-group
${MongoDB_LIBS}
${LINK_LIBGROUP_END} # Linux: -Wl,--end-group
${LINK_WHOLE_ARCHIVE_END} # Linux: -Wl,--no-whole-archive
${CMAKE_DL_LIBS} # Linux: dl
)
# Add imported target
add_library(mongodb INTERFACE IMPORTED)
# Specify INTERFACE properties for this target
set_target_properties(mongodb PROPERTIES
INTERFACE_LINK_LIBRARIES "${MongoDB_LIBS}"
INTERFACE_COMPILE_DEFINITIONS "${MongoDB_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${MongoDB_INCLUDE_DIRS}"
)
endif()
# Cleanup
unset(MongoDB_OBJECT_LIST_BUILD_TYPE_PART)
unset(MongoDB_OBJECT_LIST_PLATFORM_PART)
unset(MongoDB_RELATIVE_BUILD_DIR)
unset(MongoDB_RELATIVE_LIBS)
unset(MongoDB_RECENT_TAG)
+21
View File
@@ -0,0 +1,21 @@
# This wrapper is created in order to support CMake 3.0
# Only starting from CMake 3.1 "Threads" module exports
# "Threads::Threads" target.
find_package(Threads REQUIRED)
# Support for CMake 3.0
# Export "Threads::Threads" imported target if it wasn't exported.
# This lines are taken from the "FindThreads.cmake" of CMake 3.1:
# https://github.com/Kitware/CMake/blob/v3.1.0/Modules/FindThreads.cmake
if(THREADS_FOUND AND NOT TARGET Threads::Threads)
add_library(Threads::Threads INTERFACE IMPORTED)
if(THREADS_HAVE_PTHREAD_ARG)
set_property(TARGET Threads::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread")
endif()
if(CMAKE_THREAD_LIBS_INIT)
set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
endif()
endif()
+20
View File
@@ -0,0 +1,20 @@
Quick reference to CMake
========================
if(<constant>)
True if the constant is `1`, `ON`, `YES`, `TRUE`, `Y`, or a non-zero number.
False if the constant is `0`, `OFF`, `NO`, `FALSE`, `N`, `IGNORE`, `NOTFOUND`,
the empty string, or ends in the suffix `-NOTFOUND`. Named boolean constants
are case-insensitive. If the argument is not one of these constants, it is
treated as a variable.
if(<variable>)
True if the variable is defined to a value that is not a false constant. False otherwise.
(Note macro arguments are not variables.)
if(DEFINED <variable>)
True if the given variable is defined. It does not matter if the variable is
true or false just if it has been set. (Note macro arguments are not variables.)
+32
View File
@@ -0,0 +1,32 @@
# Put the include dirs which are in the source or build tree
# before all other include dirs, so the headers in the sources
# are prefered over the already installed ones
# Since cmake 2.4.1
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
# Use colored output
# Since cmake 2.4.0
set(CMAKE_COLOR_MAKEFILE ON)
# MongoDB compiled with this option
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# This variable is used by CMake "FindThreads" module
# From documentation to FindThreads module:
# > Please note that the compiler flag can only be
# > used with the imported target. Use of both the imported
# > target as well as this switch is highly recommended for new code.
set(THREADS_PREFER_PTHREAD_FLAG ON)
# Set the default build type to release with debug info
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo
CACHE STRING "Choose the type of build, options are: Debug, Release, RelWithDebInfo, MinSizeRel and None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)"
FORCE)
endif()
# Do not use Qt moc, uic and rcc by default
# Since CMake 2.8.6
set(CMAKE_AUTOMOC OFF)
set(CMAKE_AUTORCC OFF)
set(CMAKE_AUTOUIC OFF)
+3
View File
@@ -0,0 +1,3 @@
set(ROBOMONGO_DISPLAY_NAME "Robomongo")
set(ROBOMONGO_DISPLAY_FULL_NAME "Robomongo ${PROJECT_VERSION}")
+30
View File
@@ -0,0 +1,30 @@
# Show configuration summary and build tip
message("")
message(" _______________[ Robomongo configuration summary ]________________")
message("| ")
message("|-- Dependencies:")
message("| ")
message("| Qt5 Core: ${Qt5Core_VERSION} ${Qt5Core_DIR}")
message("| Qt5 Gui: ${Qt5Gui_VERSION} ${Qt5Gui_DIR}")
message("| Qt5 Widgets: ${Qt5Widgets_VERSION} ${Qt5Widgets_DIR}")
message("| Qt5 PrintSupport: ${Qt5Widgets_VERSION} ${Qt5PrintSupport_DIR}")
message("| MongoDB: ${MongoDB_VERSION} ${MongoDB_BUILD_DIR}")
message("|")
message("|-- Summary:")
message("|")
message("| System: ${CMAKE_SYSTEM_NAME}")
if (SYSTEM_MACOSX)
message("| Target SDK: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
message("| Build type: ${CMAKE_BUILD_TYPE}")
message("| Install path: ${CMAKE_INSTALL_PREFIX}")
message("|")
message("|-- Building and installing:")
message("| ")
message("| Now you can build Robomongo with the following command:")
message("| $ cmake --build .")
message("|")
message("| And install it to ${CMAKE_INSTALL_PREFIX}:")
message("| $ cmake --build . --target install")
message("|__________________________________________________________________")
message("")
+66
View File
@@ -0,0 +1,66 @@
# This files defines:
#
# 1) Platform checks
#
# SYSTEM_MACOSX
# SYSTEM_WINDOWS
# SYSTEM_LINUX
# SYSTEM_FREEBSD
# SYSTEM_OPENBSD
# SYSTEM_NETBSD
#
# 2) Build types checks
#
# BUILD_DEBUG
# BUILD_RELEASE
# BUILD_RELWITHDEBINFO
# BUILD_MINSIZEREL
#
# 3) Link "lib groups" and "whole-archive" options
#
# LINK_LIBGROUP_START
# LINK_LIBGROUP_END
# LINK_WHOLE_ARCHIVE_START
# LINK_WHOLE_ARCHIVE_END
# Platform checks
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(SYSTEM_MACOSX TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
set(SYSTEM_WINDOWS TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(SYSTEM_LINUX TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(SYSTEM_FREEBSD TRUE)
set(SYSTEM_BSD TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
set(SYSTEM_OPENBSD TRUE)
set(SYSTEM_BSD TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
set(SYSTEM_NETBSD TRUE)
set(SYSTEM_BSD TRUE)
endif()
# Build types
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
set(BUILD_DEBUG TRUE)
elseif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
set(BUILD_RELEASE TRUE)
elseif("${CMAKE_BUILD_TYPE}" MATCHES "RelWithDebInfo")
set(BUILD_RELWITHDEBINFO TRUE)
elseif("${CMAKE_BUILD_TYPE}" MATCHES "MinSizeRel")
set(BUILD_MINSIZEREL TRUE)
endif()
# Link "groups" and "whole-archive" options
if(SYSTEM_LINUX OR SYSTEM_FREEBSD OR SYSTEM_OPENBSD)
set(LINK_LIBGROUP_START -Wl,--start-group)
set(LINK_LIBGROUP_END -Wl,--end-group)
set(LINK_WHOLE_ARCHIVE_START -Wl,--whole-archive)
set(LINK_WHOLE_ARCHIVE_END -Wl,--no-whole-archive)
elseif(SYSTEM_MACOSX)
set(LINK_LIBGROUP_START "")
set(LINK_LIBGROUP_END "")
set(LINK_WHOLE_ARCHIVE_START -Wl,-all_load)
set(LINK_WHOLE_ARCHIVE_END -Wl,-noall_load)
endif()
+108
View File
@@ -0,0 +1,108 @@
# Note for maintainers
# --------------------
#
# Do not use absolute paths in DESTINATION arguments for install() command.
# Because the same install code will be executed again by CPack. And CPack will
# change internally CMAKE_INSTALL_PREFIX to point to some temporary folder
# for package content.
#
#
# Temporary change
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install"
CACHE STRING "Install path prefix, prepended onto install directories"
FORCE)
if(SYSTEM_LINUX)
set(bin_dir bin)
set(lib_dir lib)
set(resources_dir share)
set(license_dir .)
set(qt_plugins_dir ${lib_dir})
set(qt_conf_dir ${bin_dir})
set(qt_conf_plugins "../lib")
elseif(SYSTEM_MACOSX)
set(bundle_name Robomongo.app)
set(contents_path ${bundle_name}/Contents)
set(bin_dir ${contents_path}/MacOS)
set(lib_dir ${contents_path}/Frameworks)
set(resources_dir ${contents_path}/Resources)
set(license_dir ${resources_dir})
set(qt_plugins_dir ${contents_path}/PlugIns/Qt)
set(qt_conf_dir ${resources_dir})
set(qt_conf_plugins "PlugIns/Qt")
elseif(SYSTEM_WINDOWS)
set(bin_dir .)
set(lib_dir .)
set(resources_dir .)
set(license_dir .)
set(qt_plugins_dir ${lib_dir})
set(qt_conf_dir ${bin_dir})
set(qt_conf_plugins .)
endif()
# Generate qt.conf file
configure_file(
"${CMAKE_SOURCE_DIR}/install/qt.conf.in"
"${CMAKE_BINARY_DIR}/qt.conf")
# Install qt.conf file
install(
FILES "${CMAKE_BINARY_DIR}/qt.conf"
DESTINATION "${qt_conf_dir}")
# Install binary
install(
TARGETS robomongo
RUNTIME DESTINATION ${bin_dir}
BUNDLE DESTINATION .)
# Install license, copyright and changelogs files
install(
FILES
${CMAKE_SOURCE_DIR}/LICENSE
${CMAKE_SOURCE_DIR}/COPYRIGHT
${CMAKE_SOURCE_DIR}/CHANGELOG
${CMAKE_SOURCE_DIR}/DESCRIPTION
DESTINATION ${license_dir})
# Install common dependencies
install_qt_lib(Core Gui Widgets PrintSupport)
install_qt_plugins(QGifPlugin QICOPlugin)
install_icu_libs()
if(SYSTEM_LINUX)
install_qt_lib(XcbQpa DBus)
install_qt_plugins(
QGtk2ThemePlugin
QXcbIntegrationPlugin)
elseif(SYSTEM_MACOSX)
install_qt_lib(MacExtras DBus)
install_qt_plugins(
QCocoaIntegrationPlugin
QMinimalIntegrationPlugin
QOffscreenIntegrationPlugin)
# Install icon
install(
FILES "${CMAKE_SOURCE_DIR}/install/macosx/Robomongo.icns"
DESTINATION "${resources_dir}")
elseif(SYSTEM_WINDOWS)
install_qt_plugins(
QWindowsIntegrationPlugin
QMinimalIntegrationPlugin
QOffscreenIntegrationPlugin)
# Install runtime libraries:
# msvcp120.dll
# msvcr120.dll
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
include(InstallRequiredSystemLibraries)
endif()
+105
View File
@@ -0,0 +1,105 @@
function(install_qt_lib)
foreach(module ${ARGV})
set(target_name Qt5::${module})
set(module_name Qt5${module})
# Get full path to some known Qt library (i.e. /path/to/lib/libQt5Widgets.so.5.5.1)
get_target_property(target_path Qt5::Core LOCATION)
# Get folder path of library (i.e. /path/to/lib)
get_filename_component(qt_lib_dir ${target_path} DIRECTORY)
if (SYSTEM_LINUX)
# Not very good solution, but we simply take all files with *Qt5<module>* in names (including symlinks)
file(GLOB module_libs ${qt_lib_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}${module_name}*)
# Install to "lib" folder
install(FILES ${module_libs}
DESTINATION ${lib_dir})
endif()
if(SYSTEM_MACOSX)
set(module_name Qt${module})
# On Mac OS we are still located in .framework folder,
# and we need to go one level up
get_filename_component(qt_lib_dir ${qt_lib_dir} DIRECTORY)
install(
DIRECTORY ${qt_lib_dir}/${module_name}.framework
DESTINATION ${lib_dir}
PATTERN "*_debug" EXCLUDE # Exclude debug libraries
PATTERN "Headers" EXCLUDE) # Exclude Headers folders
endif()
if (SYSTEM_WINDOWS)
# Install single DLL to lib directory
install(FILES ${qt_lib_dir}/${module_name}${CMAKE_SHARED_LIBRARY_SUFFIX}
DESTINATION ${lib_dir})
endif()
endforeach()
endfunction()
function(install_icu_libs)
# We are trying to get 'lib' folder of Qt installation.
# For this we take some known target (Qt5::Core in this case)
# and taking path to this library.
# Get full path to known library (i.e. /path/to/lib/libQt5Core.so.5.5.1)
get_target_property(target_path Qt5::Core LOCATION)
# Get absolute path to 'lib' folder (which is a parent folder of 'known' library)
get_filename_component(qt_lib_dir ${target_path} DIRECTORY)
# Not very good solution, but we simply take all files with *icu* in names (including symlinks)
file(GLOB icu_libs ${qt_lib_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}icu*)
# Install to "lib" folder
install(FILES ${icu_libs}
DESTINATION ${lib_dir})
endfunction()
# Installs Qt5 plugins. Uses value of global variable "qt_plugins_dir" as
# absolute path to where install plugins.
#
# You can find list of plugin names by examing this variable: Qt5<Module>_PLUGINS
# For example, Qt5Gui_PLUGINS.
#
# Debug plugins, running application in this way:
# QT_DEBUG_PLUGINS=1 ./yourapp
#
# Some examples of plugin names:
# QGifPlugin, QGtk2ThemePlugin, QIbusPlatformInputContextPlugin
#
# Sample:
# install_qt_plugins(QGifPlugin QGtk2ThemePlugin QIbusPlatformInputContextPlugin)
#
function(install_qt_plugins)
foreach(name ${ARGV})
set(target_name Qt5::${name})
# We are trying to get 'plugins' folder of Qt installation.
# Get full path to plugin library (i.e. /path/to/plugins/imageformats/libqgif.so)
get_target_property(target_path ${target_name} LOCATION)
# Get absolute path to parent folder (i.e. /path/to/plugins/imageformats for Qt5::QGifPlugin)
get_filename_component(plugin_dir ${target_path} DIRECTORY)
# Get plugin parent directory (i.e. "imageformats" for Qt5::QGifPlugin)
get_filename_component(plugin_dir_name ${plugin_dir} NAME)
# Get plugin file name (i.e. "libqgif.so" for Qt5::QGifPlugin)
get_filename_component(plugin_file_name ${target_path} NAME)
# Get absolute path to plugins folder (i.e. /path/to/plugins)
get_filename_component(plugins_dir ${plugin_dir} DIRECTORY)
# Install to "lib" folder
install(
FILES ${target_path}
DESTINATION ${qt_plugins_dir}/${plugin_dir_name})
endforeach()
endfunction()
+120
View File
@@ -0,0 +1,120 @@
# Notes for maintainers.
#
# 1. Make sure that we use only lowercase letters in file name of outputed
# package for all platforms and package types.
#
# Get last commit hash
execute_process(
COMMAND git rev-parse --short HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE git_hash
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Timestamp (not used for now)
string(TIMESTAMP timestamp "%Y-%m-%d")
# Package name (as it should appear in UI)
set(CPACK_PACKAGE_NAME Robomongo)
# Version of the package
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
# Where to put generated package
set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}/package)
# Disables the component-based install process for installers
# that support it (NSIS, for instance)
set(CPACK_MONOLITHIC_INSTALL ON)
# Strip debug information on platforms that support it
set(CPACK_STRIP_FILES ON)
# Additional information
set(CPACK_PACKAGE_VENDOR Paralect)
set(CPACK_PACKAGE_CONTACT robomongo@paralect.com)
set(CPACK_PACKAGE_DESCRIPTION "Shell-centric cross-platform MongoDB management tool.")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Robomongo is a shell-centric cross-platform MongoDB management tool.")
# Use lowercase for system name and package file name
string(TOLOWER ${CMAKE_SYSTEM_NAME} system_name)
string(TOLOWER ${CPACK_PACKAGE_NAME} package_file_name)
string(TOLOWER ${CPACK_PACKAGE_VERSION} package_file_version)
# We use function from TargetArch.cmake module
# Returns string with target architecture value
# Output for common architectures is: i386 or x86_64
target_architecture(target_arch)
# Package file name
set(CPACK_PACKAGE_FILE_NAME ${package_file_name}-${package_file_version}-${system_name}-${target_arch}-${git_hash})
if(SYSTEM_LINUX)
set(CPACK_GENERATOR TGZ)
elseif(SYSTEM_MACOSX)
set(CPACK_GENERATOR DragNDrop)
set(CPACK_DMG_DS_STORE ${CMAKE_SOURCE_DIR}/install/macosx/DMG_DS_Store)
elseif(SYSTEM_WINDOWS)
set(files_dir "${CMAKE_SOURCE_DIR}/install/windows")
set(exe_name "Robomongo.exe")
set(CPACK_GENERATOR NSIS ZIP)
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/DESCRIPTION")
# License file will be shown in the installation wizard
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
# Default installation directory (not full path), just the path after
# default "c:\Program Files"
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${ROBOMONGO_DISPLAY_FULL_NAME}")
# A path to the executable inside installed package that contains icon
# This icon is used in Windows "Add or remove programs" control panel
set(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\${exe_name}")
# Create shortcuts on desktop and start-up menu
set(CPACK_NSIS_CREATE_ICONS_EXTRA "
CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${ROBOMONGO_DISPLAY_FULL_NAME}.lnk' '$INSTDIR\\\\${exe_name}'
CreateShortCut '$DESKTOP\\\\${ROBOMONGO_DISPLAY_FULL_NAME}.lnk' '$INSTDIR\\\\${exe_name}'
")
# Cleanup during uninstallation. This cleanup is required because shortcuts
# will not be deleted automatically.
# Without line '!insertmacro...' shortcut in start menu will not be removed
# (i.e. it doesn't work when we referece '$STARTMENU_FOLDER' that is used
# when creating shortcuts). This solution was found somewhere in internet.
set(CPACK_NSIS_DELETE_ICONS_EXTRA "
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
Delete '$DESKTOP\\\\${ROBOMONGO_DISPLAY_FULL_NAME}.lnk'
Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\${ROBOMONGO_DISPLAY_FULL_NAME}.lnk'
")
# The title displayed at the top of the installer
set(CPACK_NSIS_PACKAGE_NAME "${ROBOMONGO_DISPLAY_FULL_NAME}")
# Installer images (for sidebar and topbar)
set(CPACK_PACKAGE_ICON "${files_dir}\\\\nsis-topbar.bmp")
set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "!define MUI_WELCOMEFINISHPAGE_BITMAP \\\"${files_dir}\\\\nsis-sidebar.bmp\\\"")
# URL to a web site providing more information about application
# This url was noticed at least in "Add or remove programs" control
# panel.
set(CPACK_NSIS_URL_INFO_ABOUT "www.robomongo.org")
# Specify an executable to add an option to run on the finish
# page of the NSIS installer. Without "..\\\\" it dowsn't work for NSIS 2.5
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "..\\\\${exe_name}")
# Trying to set for installer and uninstaller, but this is
# doesn't work and default icons are still used...
set(CPACK_NSIS_MUI_ICON "${files_dir}\\\\robomongo.ico")
set(CPACK_NSIS_MUI_UNIICON "${files_dir}\\\\robomongo.ico")
endif()
include(CPack)
+123
View File
@@ -0,0 +1,123 @@
###
# Prints CMake variables.
#
# Print all variables in the current scope:
#
# print_vars()
# print_vars("") # the same result, as previous line
#
# Print all variables with names, matching regex, case insensitive:
#
# print_vars("SOMEVAR")
# print_vars("someVar") # the same result, as previous line
# print_vars("^CMAKE") # print all variables, that starts from "CMAKE"
# print_vars("VAR$") # ends by "VAR"
# print_vars("^VAR$") # exact match
#
function(print_vars)
if(ARGV0)
set(regex ${ARGV0})
endif()
get_cmake_property(names VARIABLES)
foreach(name ${names})
# Make lowercase variants for case-insensitive comparing
string(TOLOWER "${name}" lc_name)
string(TOLOWER "${regex}" lc_regex)
if(lc_name MATCHES "${lc_regex}")
message("${name}=${${name}}")
endif()
endforeach()
endfunction()
###
# Print content of variable.
#
# print_var(PROJECT_NAME)
# print_var("PROJECT_NAME") # the same result as previous line
#
function(print_var name)
# Show nice output for not defined or empty variables
if(NOT DEFINED ${name})
set(value " is not defined.")
elseif("${${name}}" STREQUAL "")
set(value " is defined but empty.")
else()
set(value "=${${name}}")
endif()
message("${name}${value}")
endfunction()
###
# Prints included directories
#
function(print_include_dirs)
get_property(dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
foreach(dir ${dirs})
message("${dir}")
endforeach()
endfunction()
###
# Prints link directories
#
function(print_link_dirs)
get_property(dirs DIRECTORY PROPERTY LINK_DIRECTORIES)
foreach(dir ${dirs})
message("${dir}")
endforeach()
endfunction()
###
# Prints compile definitions
#
function(print_compile_definitions)
get_property(defs DIRECTORY PROPERTY COMPILE_DEFINITIONS)
foreach(def ${defs})
message("${def}")
endforeach()
endfunction()
###
# Prints target include directories
#
function(print_target_include_dirs target)
get_property(dirs TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
foreach(dir ${dirs})
message("${dir}")
endforeach()
endfunction()
###
# Prints target compile definitions
#
function(print_target_compile_definitions target)
get_property(defs TARGET ${target} PROPERTY INTERFACE_COMPILE_DEFINITIONS)
foreach(def ${defs})
message("${def}")
endforeach()
endfunction()
###
# Prints target link libraries
#
function(print_target_link_libraries target)
get_property(defs TARGET ${target} PROPERTY INTERFACE_LINK_LIBRARIES)
foreach(def ${defs})
message("${def}")
endforeach()
endfunction()
###
# Prints Qt5 module plugins
#
function(print_qt_module_plugins module)
foreach(plugin ${Qt5${module}_PLUGINS})
get_target_property(loc ${plugin} LOCATION)
message("Plugin ${plugin} is at location ${loc}")
endforeach()
endfunction()
+154
View File
@@ -0,0 +1,154 @@
# Copyright (c) 2012 Petroules Corporation. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice, this list of conditions and the following
# disclaimer.
#
# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Based on the Qt 5 processor detection code, so should be very accurate
# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
# Regarding POWER/PowerPC, just as is noted in the Qt source,
# "There are many more known variants/revisions that we do not handle/detect."
set(archdetect_c_code "
#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
#if defined(__ARM_ARCH_7__) \\
|| defined(__ARM_ARCH_7A__) \\
|| defined(__ARM_ARCH_7R__) \\
|| defined(__ARM_ARCH_7M__) \\
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
#error cmake_ARCH armv7
#elif defined(__ARM_ARCH_6__) \\
|| defined(__ARM_ARCH_6J__) \\
|| defined(__ARM_ARCH_6T2__) \\
|| defined(__ARM_ARCH_6Z__) \\
|| defined(__ARM_ARCH_6K__) \\
|| defined(__ARM_ARCH_6ZK__) \\
|| defined(__ARM_ARCH_6M__) \\
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
#error cmake_ARCH armv6
#elif defined(__ARM_ARCH_5TEJ__) \\
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
#error cmake_ARCH armv5
#else
#error cmake_ARCH arm
#endif
#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
#error cmake_ARCH i386
#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
#error cmake_ARCH x86_64
#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
#error cmake_ARCH ia64
#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
|| defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC) \\
|| defined(_M_MPPC) || defined(_M_PPC)
#if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
#error cmake_ARCH ppc64
#else
#error cmake_ARCH ppc
#endif
#endif
#error cmake_ARCH unknown
")
# Set ppc_support to TRUE before including this file or ppc and ppc64
# will be treated as invalid architectures since they are no longer supported by Apple
function(target_architecture output_var)
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
# On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
# First let's normalize the order of the values
# Note that it's not possible to compile PowerPC applications if you are using
# the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
# disable it by default
# See this page for more information:
# http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
# Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
# On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
set(osx_arch_ppc TRUE)
elseif("${osx_arch}" STREQUAL "i386")
set(osx_arch_i386 TRUE)
elseif("${osx_arch}" STREQUAL "x86_64")
set(osx_arch_x86_64 TRUE)
elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
set(osx_arch_ppc64 TRUE)
else()
message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
endif()
endforeach()
# Now add all the architectures in our normalized order
if(osx_arch_ppc)
list(APPEND ARCH ppc)
endif()
if(osx_arch_i386)
list(APPEND ARCH i386)
endif()
if(osx_arch_x86_64)
list(APPEND ARCH x86_64)
endif()
if(osx_arch_ppc64)
list(APPEND ARCH ppc64)
endif()
else()
file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
enable_language(C)
# Detect the architecture in a rather creative way...
# This compiles a small C program which is a series of ifdefs that selects a
# particular #error preprocessor directive whose message string contains the
# target architecture. The program will always fail to compile (both because
# file is not a valid C program, and obviously because of the presence of the
# #error preprocessor directives... but by exploiting the preprocessor in this
# way, we can detect the correct target architecture even when cross-compiling,
# since the program itself never needs to be run (only the compiler/preprocessor)
try_run(
run_result_unused
compile_result_unused
"${CMAKE_BINARY_DIR}"
"${CMAKE_BINARY_DIR}/arch.c"
COMPILE_OUTPUT_VARIABLE ARCH
CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
)
# Parse the architecture name from the compiler output
string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
# Get rid of the value marker leaving just the architecture name
string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
# If we are compiling with an unknown architecture this variable should
# already be set to "unknown" but in the case that it's empty (i.e. due
# to a typo in the code), then set it to unknown
if (NOT ARCH)
set(ARCH unknown)
endif()
endif()
set(${output_var} "${ARCH}" PARENT_SCOPE)
endfunction()
+26
View File
@@ -0,0 +1,26 @@
if(SYSTEM_LINUX OR SYSTEM_MACOSX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
elseif(SYSTEM_WINDOWS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_NO_LIB")
# Do not show some warnings. We turned off the same warnings as MongoDB do
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4355 /wd4800 /wd4267 /wd4244 /wd4290 /wd4068 /wd4351")
# The /MP option can reduce the total time to compile the source files. This option
# causes the compiler to create one or more copies of itself, each in a separate process.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} psapi.lib bcrypt.lib Iphlpapi.lib dbghelp.lib ws2_32.lib winmm.lib version.lib")
endif()
set(PROJECT_NAME "Robomongo")
set(PROJECT_NAME_TITLE ${PROJECT_NAME})
set(PROJECT_DOMAIN "www.robomongo.org")
set(PROJECT_COMPANYNAME "Paralect")
set(PROJECT_COPYRIGHT "Copyright (C) 2013-2015 ${PROJECT_COMPANYNAME} All Rights Reserved.")
set(PROJECT_COMPANYNAME_DOMAIN "www.paralect.com")
set(PROJECT_GITHUB_FORK "www.github.com/paralect/robomongo")
set(PROJECT_GITHUB_ISSUES "www.github.com/paralect/robomongo/issues")
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
+55
View File
@@ -0,0 +1,55 @@
What is this?
-------------
Files in this folder are read by FindMongoDB.cmake script.
We link with MongoDB shell using objects instead of static libs, because:
> We require the use of the 'object' mode for release builds because it is the only linking
> model that works across all of our platforms. We would like to ensure that all of our
> released artifacts are built with the same known-good-everywhere model.
This is a quote from root SConstruct file in MongoDB repository.
It is possible to build MongoDB shell in the following way:
$ scons mongo --link-model=static
Than we will have produced static libs that we can link with. But in release mode MongoDB
SConstruct file do not support static link mode by default. This command will *not* work:
$ scons mongo --release --link-model=static
We decided to use object link mode even for debug builds, in order to use single mode across
all platforms and configurations.
How did you receive content for this files?
-------------------------------------------
First we build MongoDB shell with the following command:
$ scons mongo -j8 --release
Than we remove compiled `mongo` and run the same command again to see only final link command:
$ rm build/opt/mongo/mongo
$ scons mongo -j8 --release > release-link-command.txt
And finally we manually copy/paste list of objects to `<platform>-release.objects` file. Make sure
that they are single-line files.
Almost the same steps we are doing for debug builds:
$ scons mongo -j8 --dbg
$ rm build/debug/mongo/mongo
$ scons mongo -j8 --dbg > debug-link-command.txt
And list of objects is copied to `<platform>-debug.objects` file.
We found, that on Linux (Ubuntu 14.10), list of debug objects differ from list of release objects only
by two files. File `debugallocation.o` is linked in debug mode, but not in release.
File `debugallocation.o` is linked in release mode, but not in debug. Both are located
in `third_party/gperftools-2.2/src` folder. In any way, we keep separate lists of object files
for both configurations. Still we need to test that objects are the same even across different
versions of Linux.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+50
View File
@@ -0,0 +1,50 @@
Building Robomongo Shell
========================
Robomongo uses [modified version](https://github.com/paralect/robomongo-shell/tree/roboshell-v3.2) of MongoDB that we call Robomongo Shell. Before you can build Robomongo, you have to build Robomongo Shell. The following instructions are applicable only for Mac OS X and Linux. For Windows instructions please check [Building Robomongo on Windows](BuildingRobomongoOnWindows.md).
Build for Mac OS X or Linux
---------------------------
1. Clone Robomongo Shell and checkout to `roboshell-v3.2` branch:
```sh
$ git clone https://github.com/paralect/robomongo-shell.git
$ cd robomongo-shell
$ git checkout roboshell-v3.2
```
2. Build Robomongo Shell:
```sh
$ bin/build
```
Done! Now you can continue with [Step 2](BuildingRobomongo.md#step-2) and build Robomongo
with embedded MongoDB 3.2 shell (that you've just built).
<br/>
#### Advanced helper commands
The following commands are needed only if you are planning to develop or deeper understand
Robomongo or Robomongo Shell build processes.
Clean build files for release mode (folder `build/opt` will be removed):
$ bin/clean
Here is a command that is executed by `bin/build` script:
$ scons mongo -j8 --release --osx-version-min=10.9
Argument `--osx-version-min` is required only for Mac OS.
Build MongoDB shell in debug mode:
$ scons mongo -j8 --dbg
Clear builds:
$ scons -c mongo # clears release build
$ scons -c --dbg mongo # clears debug build
+52
View File
@@ -0,0 +1,52 @@
Building Robomongo
==================
#### Step 1.
Download and build Robomongo Shell (our fork of MongoDB).
Refer to [Building Robomongo Shell](BuildingMongoDB.md) document.
#### Step 2.
Download Robomongo:
$ git clone https://github.com/paralect/robomongo
$ cd robomongo
Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to a set of
directories:
1. Location of Qt 5 SDK
2. Location of Robomongo Shell (built in "Step 1")
Separate directories by semicolon `;` (not colon):
$ export ROBOMONGO_CMAKE_PREFIX_PATH="/path/to/qt-5.5/5.5/clang_64;/path/to/robomongo-shell"
Run configuration step:
$ bin/configure
And finally, build Robomongo:
$ bin/build
<br>
## Helper commands
Execute just built Robomongo:
$ bin/run
Clean build files (in order to start build from scratch):
$ bin/clean
Install Robomongo to `build/release/install` folder:
$ bin/install
Create package for your OS in `build/release/package` folder:
$ bin/pack
+132
View File
@@ -0,0 +1,132 @@
Building Robomongo for Windows
==============================
Prerequisites
-------------
#### 0. Git
Download Git installer from http://git-scm.com (we are using Git-2.7.0-64-bit).
When you'll see "Adjusting your PATH environment" wizard page, select
"Use Git from the Windows Command Prompt" option. This will allow to
execute Git from both Windows Command Prompt and Bash. This is required,
because both MongoDB and Robomongo uses `git` command during build process
which must be perfomed from Windows Command Prompt (not Bash).
On "Configuring the line ending conversion" wizard page, select "Checkout
Windows-style, commit Unix-style line ending" option. This is a common mode
for cross-platform projects and required by both MongoDB and Robomongo.
All other Git installer options are not important (use defaults).
If you are using SSH clone url, start SSH agent and add your private key
with this commands in Git Bash:
$ eval `ssh-agent` # starts ssh agent
$ ssh-add ~/.ssh/mykey # add your key (which can be in any folder)
#### 1. Visual Studio 2013 (i.e. MSVC12) Update 4 or newer
We use Visual Studio 2013 Update 5, and recommend to use this version to save
time for Qt compilation. Currently prebuilt binaries for Qt are available
from official Qt site. But you can use any newer version and compile Qt library
yourself.
If you already have VS2013, you can download Update 5 here:
https://www.microsoft.com/en-us/download/details.aspx?id=48129
Update 4 or newer version is required to compile MongoDB.
#### 2. ActivePython 2.7
Download ActivePython from http://www.activestate.com/activepython/downloads
Download MSI x64 version. Use default settings in installation wizard.
This installer will add path to `python.exe` to your `PATH` variable.
#### 3. Scons 2.3.4
Download Scons from http://scons.org/tag/releases.html
Use ZIP archive, not MSI (we use scons-2.3.4.zip)
Open Command Prompt, navigate to Scons directory and run:
$ setup.py install
This command will make `scons` command accessible from Command Prompt
#### 4. CMake
Download CMake from https://cmake.org/download (we use cmake-3.3.2-win32-x86.exe)
Use installer package, it will allow you to configure your PATH variable and `cmake`
command will be available from Command Prompt. For this set "Add CMake to the system
PATH for current user" in the installer wizard page.
#### 5. Qt 5.5
Download Qt from http://www.qt.io/download-open-source/ (we use Qt Online installer)
When installing Qt, only one component is required by Robomongo:
Qt 5.5
[x] msvc2013 64-bit.
This components contains prebuilt 64-bit binaries for Visual Studio 2013.
You may uncheck all other components to download as little as possible.
## Build Robomongo Shell (fork of MongoDB)
Refer to MongoDB documentation for additional information:
https://docs.mongodb.org/manual/contributors/tutorial/build-mongodb-from-source/#windows-specific-instructions
Open VS2013 x64 Native Tools Command Prompt and navigate to `robomongo-shell` folder.
Build shell:
> bin\build
Note that backslash is used (`\`), and not forward slash (`/`).
Clean build files:
> bin\clean
## Build Robomongo
Set special environment variable `ROBOMONGO_CMAKE_PREFIX_PATH` to point to set of
directories:
1. Location of Qt SDK
2. Location of Robomongo Shell
Separate directories by semicolon `;` (not colon). You can do this in Command Prompt:
> setx ROBOMONGO_CMAKE_PREFIX_PATH "d:\Qt-5\5.5\msvc2013_64;d:\Projects\robomongo-shell"
Reopen your Command Prompt to make this variable available.
Run configuration step:
> bin\configure
And finally, build Robomongo:
> bin\build
#### Helper commands
Clean build files (in order to start build from scratch):
> bin\clean
Install Robomongo to `build\Release\install` folder:
> bin\install
+49
View File
@@ -0,0 +1,49 @@
Runtime Dependencies
====================
This information is for maintainers. If you want to just use Robomongo - download
prebuild packages for your platform.
Runtime dependencies that are not privided by platforms but required by Robomongo are:
1. Qt libraries
2. Qt plugins
Diagnostic of dependencies
--------------------------
##### Linux
View dependencies of executable or shared library:
$ ldd robomongo
View RPATH or RUNPATH records of executable or shared library:
$ objdump -x bin/robomongo | grep "RPATH\|RUNPATH"
For Robomongo binary it should be `$ORIGIN/../lib`
##### Mac OS X
Show dependencies of executable or shared library:
$ otool -L robomongo
View LC_RPATH records of executable or shared library:
$ otool -l robomongo | grep -C2 RPATH
(option `-C2` asks grep to output 2 context lines before and after the match)
For Robomongo binary it should be `$executable_path/../Frameworks`
Diagnostic of Qt plugins
------------------------
Run Robomongo in the following way to see how plugins are resolved:
$ QT_DEBUG_PLUGINS=1 ./robomongo
+1
View File
@@ -13,5 +13,6 @@ ROBO_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
export LD_LIBRARY_PATH="$ROBO_DIR/../lib:$LD_LIBRARY_PATH"
export QT_PLUGIN_PATH="$ROBO_DIR/../lib:$QT_PLUGIN_PATH"
export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb
export XKB_DEFAULT_RULES=base
"$ROBO_DIR/robomongo"
Binary file not shown.
+8
View File
@@ -0,0 +1,8 @@
How to generate "icns" icon file
================================
In this directory run:
$ iconutil -c icns Robomongo.iconset
File `Robomongo.icns` will be generated.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

+2
View File
@@ -0,0 +1,2 @@
[Paths]
Plugins = PlugIns/Qt
+2
View File
@@ -0,0 +1,2 @@
[Paths]
Plugins = @qt_conf_plugins@
+46
View File
@@ -0,0 +1,46 @@
How to generate ICO file from the set of PNGs
=============================================
Install ImageMagick (http://www.imagemagick.org/). Make sure that you
have added its utils to your PATH (installer will give you such an option)
In `icon-set` directory run:
> convert 256x256.png 128x128.png 64x64.png 48x48.png 40x40.png 32x32.png 24x24.png 20x20.png 16x16.png robomongo.ico
File `robomongo.ico` will be generated.
Which icon sizes are used on Windows?
=====================================
The most important sizes are the one that is small. Robomongo should include
16, 20, 24, 40, 48. The bigger sizes are usually scaled well, without notable
degrading in quality.
The following statistic was provided in this answer:
http://stackoverflow.com/a/12283978/407599
> After some testing with an icon with 8, 16, 20, 24, 32, 40, 48, 64, 96, 128
> and 256 pixels (256 in PNG) in Windows 7:
>
> At 100% resolution:
> Explorer uses 16, 40, 48, and 256. Windows Photo Viewer uses 96. Paint uses 256.
>
> At 125% resolution:
> Explorer uses 20, 40, and 256. Windows Photo Viewer uses 96. Paint uses 256.
>
> At 150% resolution:
> Explorer uses 24, 48, and 256. Windows Photo Viewer uses 96. Paint uses 256.
>
> At 200% resolution:
> Explorer uses 40, 64, 96, and 256. Windows Photo Viewer uses 128. Paint uses 256.
>
> So 8, 32 were never used (it's strange to me for 32) and 128 only by Windows Photo
> Viewer with a very high dpi screen, i.e. almost never used.
>
> It means your icon should at least provide 16, 48 and 256 for Windows 7. For supporting
> newer screens with high resolutions, you should provide 16, 20, 24, 40, 48, 64, 96, and 256.
> For Windows 7, all pictures can be compressed using PNG but for backward compatibility with
> Windows XP, 16 to 48 should not be compressed.
Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 129 KiB

Executable → Regular
+11 -11
View File
@@ -1,13 +1,13 @@
#include "verrsrc.h"
IDI_ICON1 ICON "@ICON_FILE@"
IDI_ICON1 ICON "@windows_icon@"
#define VER_FILEVERSION @MAJOR_VER@,@MINOR_VER1@,@MINOR_VER2@
#define VER_FILEVERSION_STR "@MAJOR_VER@.@MINOR_VER1@.@MINOR_VER2@\0"
#define VER_FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@
#define VER_FILEVERSION_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@\0"
#define VER_PRODUCTVERSION @MAJOR_VER@,@MINOR_VER1@,@MINOR_VER2@
#define VER_PRODUCTVERSION_STR "@MAJOR_VER@.@MINOR_VER1@.@MINOR_VER2@\0"
#define VER_PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@
#define VER_PRODUCTVERSION_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@\0"
1 VERSIONINFO
FILEVERSION VER_FILEVERSION
@@ -26,14 +26,14 @@ IDI_ICON1 ICON "@ICON_FILE@"
BEGIN
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", "@COMPANYNAME@\0"
VALUE "FileDescription", "@PRODUCTNAME@\0"
VALUE "CompanyName", "Paralect, Inc\0"
VALUE "FileDescription", "Robomongo, MongoDB management tool\0"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "LegalCopyright", "@PRODUCTCOPYRIGHT@\0"
VALUE "ProductName", "@PRODUCTNAME@\0"
VALUE "LegalCopyright", "Copyright Paralect, 2013 - 2016\0"
VALUE "ProductName", "Robomongo\0"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
VALUE "OriginalFilename", "@SHORTPRODUCTNAME@.exe\0"
VALUE "InternalName", "@SHORTPRODUCTNAME@\0"
VALUE "OriginalFilename", "Robomongo.exe\0"
VALUE "InternalName", "Robomongo\0"
END
END
BLOCK "VarFileInfo"
+11
View File
@@ -0,0 +1,11 @@
This is a logbook for notes about migration to MongoDB 3.2
DocumentTextEditor.cpp
----------------------
Commented error reporting.
Logger.cpp
----------
Commented Logger::print().
+61
View File
@@ -0,0 +1,61 @@
# BasedOnStyle: Google
AccessModifierOffset: -4
AlignOperands: false
AlignAfterOpenBracket: true
AlignEscapedNewlinesLeft: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: false
BinPackParameters: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 100
CommentPragmas: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IndentCaseLabels: true
IndentFunctionDeclarationAfterType: false
IndentWidth: 4
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
Language: Cpp
MaxEmptyLinesToKeep: 2
NamespaceIndentation: None
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: false
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: true
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 4
UseTab: Never
+215
View File
@@ -0,0 +1,215 @@
# Automatically generate code for Qt moc, uic and rcc files
# Since CMake 2.8.6
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
set(SOURCES
# Isolated Scope #1
core/utils/QtUtils.cpp
core/utils/StdUtils.cpp
core/utils/Logger.cpp
core/HexUtils.cpp
core/utils/BsonUtils.cpp
core/settings/CredentialSettings.cpp
core/settings/ConnectionSettings.cpp
core/Event.cpp
core/Enums.cpp
core/EventError.cpp
core/EventBusSubscriber.cpp
core/EventBusDispatcher.cpp
core/EventWrapper.cpp
core/EventBus.cpp
core/KeyboardManager.cpp
core/domain/MongoNamespace.cpp
core/domain/MongoUser.cpp
core/domain/MongoUser.cpp
core/domain/MongoFunction.cpp
core/domain/MongoUtils.cpp
core/domain/MongoCollection.cpp
core/domain/MongoCollectionInfo.cpp
core/domain/MongoQueryInfo.cpp
core/domain/MongoShellResult.cpp
core/domain/CursorPosition.cpp
core/domain/ScriptInfo.cpp
core/events/MongoEventsInfo.cpp
shell/db/ptimeutil.cpp
shell/bson/json.cpp
# Isolated Scope #2
core/engine/ScriptEngine.cpp
core/events/MongoEvents.cpp
core/domain/MongoDocument.cpp
gui/AppStyle.cpp
core/domain/MongoServer.cpp
core/domain/MongoShell.cpp
core/domain/MongoDatabase.cpp
core/domain/App.cpp
core/mongodb/MongoClient.cpp
core/mongodb/MongoWorker.cpp
core/settings/SettingsManager.cpp
core/AppRegistry.cpp
# Isolated Scope #3
gui/GuiRegistry.cpp
gui/dialogs/AboutDialog.cpp
gui/dialogs/ConnectionAdvancedTab.cpp
gui/dialogs/ConnectionAuthTab.cpp
gui/dialogs/ConnectionBasicTab.cpp
gui/dialogs/ConnectionDiagnosticDialog.cpp
gui/dialogs/ConnectionDialog.cpp
gui/dialogs/CopyCollectionDialog.cpp
gui/widgets/workarea/IndicatorLabel.cpp
gui/dialogs/CreateDatabaseDialog.cpp
gui/dialogs/CreateUserDialog.cpp
gui/utils/ComboBoxUtils.cpp
gui/utils/DialogUtils.cpp
# Isolated scope #4
gui/dialogs/PreferencesDialog.cpp
gui/dialogs/ConnectionsDialog.cpp
# Isolated scope #5
gui/editors/PlainJavaScriptEditor.cpp
gui/editors/JSLexer.cpp
gui/editors/FindFrame.cpp
gui/widgets/explorer/EditIndexDialog.cpp
gui/widgets/workarea/ScriptWidget.cpp
# Isolated scope #6
gui/widgets/explorer/ExplorerCollectionTreeItem.cpp
gui/widgets/explorer/ExplorerTreeItem.cpp
gui/widgets/explorer/ExplorerDatabaseTreeItem.cpp
gui/widgets/explorer/ExplorerDatabaseCategoryTreeItem.cpp
gui/widgets/explorer/ExplorerUserTreeItem.cpp
gui/widgets/explorer/ExplorerFunctionTreeItem.cpp
gui/dialogs/DocumentTextEditor.cpp
gui/dialogs/FunctionTextEditor.cpp
# Isolated scope #7
gui/widgets/explorer/ExplorerServerTreeItem.cpp
gui/widgets/explorer/ExplorerTreeWidget.cpp
gui/widgets/explorer/ExplorerWidget.cpp
gui/widgets/workarea/BsonTableModel.cpp
gui/widgets/workarea/BsonTableView.cpp
gui/widgets/workarea/BsonTreeItem.cpp
gui/widgets/workarea/BsonTreeModel.cpp
gui/widgets/workarea/BsonTreeView.cpp
core/domain/Notifier.cpp
# Isolated scope #8
gui/widgets/workarea/CollectionStatsTreeItem.cpp
gui/widgets/workarea/CollectionStatsTreeWidget.cpp
gui/widgets/workarea/JsonPrepareThread.cpp
gui/widgets/workarea/OutputItemContentWidget.cpp
gui/widgets/workarea/OutputItemHeaderWidget.cpp
gui/widgets/workarea/OutputWidget.cpp
gui/widgets/workarea/PagingWidget.cpp
gui/widgets/workarea/ProgressBarPopup.cpp
gui/widgets/workarea/QueryWidget.cpp
gui/widgets/workarea/WorkAreaTabBar.cpp
gui/widgets/workarea/WorkAreaTabWidget.cpp
# Final scope
gui/widgets/LogWidget.cpp
gui/MainWindow.cpp
gui/dialogs/SSHTunnelTab.cpp
core/settings/SshSettings.cpp
core/mongodb/SshTunnelWorker.cpp
gui/resources/gui.qrc
)
# Robomongo target
add_executable(robomongo MACOSX_BUNDLE WIN32 app/main.cpp ${SOURCES})
target_link_libraries(robomongo
PRIVATE
Qt5::Widgets
qjson
qscintilla
mongodb
ssh
Threads::Threads) # Target from FindThreads CMake module
target_include_directories(robomongo
PRIVATE
${CMAKE_HOME_DIRECTORY}/src)
target_compile_definitions(robomongo
PRIVATE
PROJECT_NAME="${PROJECT_NAME}"
PROJECT_NAME_TITLE="${PROJECT_NAME_TITLE}"
PROJECT_COPYRIGHT="${PROJECT_COPYRIGHT}"
PROJECT_DOMAIN="${PROJECT_DOMAIN}"
PROJECT_COMPANYNAME="${PROJECT_COMPANYNAME}"
PROJECT_COMPANYNAME_DOMAIN="${PROJECT_COMPANYNAME_DOMAIN}"
PROJECT_GITHUB_FORK="${PROJECT_GITHUB_FORK}"
PROJECT_GITHUB_ISSUES="${PROJECT_GITHUB_ISSUES}"
PROJECT_VERSION="${PROJECT_VERSION}"
PROJECT_NAME_LOWERCASE="${PROJECT_NAME_LOWERCASE}")
if(SYSTEM_WINDOWS)
# Create Windows Resource file
set(windows_icon "${CMAKE_SOURCE_DIR}/install/windows/robomongo.ico")
configure_file(
"${CMAKE_SOURCE_DIR}/install/windows/winres.rc.in"
"${CMAKE_BINARY_DIR}/winres.rc")
unset(windows_icon)
# Add additional source file to "robomongo" target
target_sources(robomongo
PRIVATE
"${CMAKE_BINARY_DIR}/winres.rc")
# Rename output name for Windows
set_target_properties(robomongo PROPERTIES
OUTPUT_NAME "Robomongo")
# Seems that we do not need to do this with recent versions of Qt
target_link_libraries(robomongo
PRIVATE
Qt5::WinMain)
elseif(SYSTEM_MACOSX)
set_target_properties(robomongo PROPERTIES
INSTALL_RPATH "@executable_path/../Frameworks"
OUTPUT_NAME "Robomongo"
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/install/macosx/Info.plist.in"
MACOSX_BUNDLE_BUNDLE_NAME "Robomongo"
MACOSX_BUNDLE_GUI_IDENTIFIER "com.paralect.Robomongo"
MACOSX_BUNDLE_INFO_STRING "Robomongo ${PROJECT_VERSION}. Copyright Paralect, 2013 - 2016"
MACOSX_BUNDLE_SHORT_VERSION "${PROJECT_VERSION}"
MACOSX_BUNDLE_LONG_VERSION "${PROJECT_VERSION}"
MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
MACOSX_BUNDLE_COPYRIGHT "Copyright Paralect, 2013 - 2016"
MACOSX_BUNDLE_ICON_FILE "Robomongo")
elseif(SYSTEM_LINUX)
set_target_properties(robomongo PROPERTIES
INSTALL_RPATH "$ORIGIN/../lib")
endif()
# Install
include(RobomongoInstall)
#
# Tests targets (code below should be moved to separate file)
#
add_executable(tests WIN32 EXCLUDE_FROM_ALL app/main_test.cpp gui/editors/JSLexer.cpp)
target_link_libraries(tests Qt5::Widgets qjson qscintilla mongodb Threads::Threads)
target_include_directories(tests
PRIVATE
${CMAKE_HOME_DIRECTORY}/src)
# Target that creates original MongoDB shell
# Used to test compilation and linking
add_executable(shell EXCLUDE_FROM_ALL shell/shell/dbshell.cpp)
target_link_libraries(shell
mongodb
Threads::Threads) # Target from FindThreads CMake module
+53 -12
View File
@@ -3,27 +3,68 @@
#include <locale.h>
// Header "mongo/util/net/sock" is needed for mongo::enableIPv6()
// Header "mongo/platform/basic" is required by "sock.h" under Windows
#include <mongo/platform/basic.h>
#include <mongo/util/net/sock.h>
#include <mongo/base/initializer.h>
#include "robomongo/gui/MainWindow.h"
#include "robomongo/gui/AppStyle.h"
int main(int argc, char *argv[])
#include "robomongo/ssh/ssh.h"
int main(int argc, char *argv[], char** envp)
{
QApplication app(argc, argv);
Robomongo::detail::initStyle();
setlocale(LC_NUMERIC,"C"); // do not move this line!!!
if (rbm_ssh_init()) {
return 1;
}
QRect screenGeometry = QApplication::desktop()->availableGeometry();
QSize size(screenGeometry.width() - 450, screenGeometry.height() - 165);
Robomongo::MainWindow win;
win.resize(size);
#if defined(Q_OS_MAC)
win.setUnifiedTitleAndToolBarOnMac(true);
// Please check, do we really need envp for other OSes?
#ifdef Q_OS_WIN
envp = NULL;
#endif
// Support for IPv6 is disabled by default. Enable it.
mongo::enableIPv6(true);
// Initialization routine for MongoDB shell
mongo::runGlobalInitializersOrDie(argc, argv, envp);
// Initialize Qt application
QApplication app(argc, argv);
// On Unix/Linux Qt is configured to use the system locale settings by default.
// This can cause a conflict when using POSIX functions, for instance, when
// converting between data types such as floats and strings, since the notation
// may differ between locales. To get around this problem, call the POSIX
// function setlocale(LC_NUMERIC,"C") right after initializing QApplication or
// QCoreApplication to reset the locale that is used for number formatting to "C"-locale.
// (http://doc.qt.io/qt-5/qcoreapplication.html#locale-settings)
setlocale(LC_NUMERIC, "C");
// Init GUI style
Robomongo::AppStyleUtils::initStyle();
// Application main window
Robomongo::MainWindow win;
// Resize main window. We are trying to keep it "almost" maximized.
QRect screenGeometry = QApplication::desktop()->availableGeometry();
int horizontalMargin = (int)(screenGeometry.width() * 0.1);
int verticalMargin = (int)(screenGeometry.height() * 0.1);
int width = screenGeometry.width() - horizontalMargin;
int height = screenGeometry.height() - verticalMargin;
win.resize(QSize(width, height));
// Center main window
int x = (screenGeometry.width() - win.width()) / 2;
int y = (screenGeometry.height() - win.height()) / 2;
win.move(x, y);
win.show();
return app.exec();
int rc = app.exec();
rbm_ssh_cleanup();
return rc;
}
+26
View File
@@ -0,0 +1,26 @@
#include <QApplication>
#include <QDesktopWidget>
#include <QDebug>
#include <locale.h>
#include <mongo/bson/bsonobjbuilder.h>
#include <robomongo/core/utils/BsonUtils.h>
using namespace Robomongo;
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
mongo::BSONObjBuilder m;
m.append("test", 56);
const mongo::BSONObj &obj = m.obj();
std::string str = BsonUtils::jsonString(obj, mongo::TenGen, 1, DefaultEncoding, Utc);
qDebug() << "Hello!";
qDebug() << QString::fromStdString(str);
return app.exec();
}
+69
View File
@@ -0,0 +1,69 @@
#undef NDEBUG
#include <sstream>
#include <iostream>
#include <assert.h>
#include <limits>
#include <mongo/util/exit_code.h>
#include <mongo/util/net/hostandport.h>
namespace mongo {
extern bool isShell;
void logProcessDetailsForLogRotate() {}
void exitCleanly(ExitCode code) {}
}
void testHostAndPort() {
mongo::HostAndPort hp = mongo::HostAndPort("127.0.0.1", 20017);
assert(hp.toString() == "127.0.0.1:20017");
hp = mongo::HostAndPort("2a03:b0c0:3:d0::f3:1001", 20017);
assert(hp.toString() == "[2a03:b0c0:3:d0::f3:1001]:20017");
// toString() will wrap IPv6 address in brackets even if they
// are already exist. This is true at least for MongoDB 3.2
hp = mongo::HostAndPort("[2a03:b0c0:3:d0::f3:1001]", 20017);
assert(hp.toString() == "[[2a03:b0c0:3:d0::f3:1001]]:20017");
hp = mongo::HostAndPort("[2a03:b0c0:3:d0::f3:1001", 20017);
assert(hp.toString() == "[[2a03:b0c0:3:d0::f3:1001]:20017");
}
void precisionAssert(const std::string &text, double d) {
std::stringstream s;
s.precision(std::numeric_limits<double>::digits10);
s << d;
std::cout << "Checking " << text << " - ";
assert(text == s.str());
std::cout << "Correct. " << std::endl;
}
void testPrecision() {
precisionAssert("9.8", 9.8);
precisionAssert("9.9", 9.9);
precisionAssert("9.98", 9.98);
precisionAssert("9.987", 9.987);
precisionAssert("9.9876", 9.9876);
precisionAssert("9.98765", 9.98765);
precisionAssert("9.987654", 9.987654);
precisionAssert("9.9876543", 9.9876543);
precisionAssert("9.98765432", 9.98765432);
precisionAssert("9.987654321", 9.987654321);
precisionAssert("9.987654321", 9.9876543210);
precisionAssert("9.98765432109", 9.98765432109);
precisionAssert("9.987654321098", 9.987654321098);
precisionAssert("9.9876543210987", 9.9876543210987);
precisionAssert("9.98765432109876", 9.98765432109876);
precisionAssert("9.98765432109876", 9.987654321098765);
precisionAssert("9.98765432109877", 9.9876543210987654);
precisionAssert("3.1415", 3.1415);
precisionAssert("1.1", 1.1);
precisionAssert("9.7", 9.7);
}
int main(int argc, char *argv[], char** envp)
{
testHostAndPort();
testPrecision();
return 0;
}
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Robomongo
private:
AppRegistry();
~AppRegistry();
~AppRegistry();
const EventBusScopedPtr _bus;
const SettingsManagerScopedPtr _settingsManager;
+10 -4
View File
@@ -2,12 +2,18 @@
namespace Robomongo
{
EventError::EventError() {}
EventError::EventError() :
_isNull(true) {}
EventError::EventError(const std::string &errorMessage) :
_errorMessage(errorMessage) {}
_errorMessage(errorMessage),
_isNull(false) {}
bool EventError::isNull() const { return _errorMessage.empty(); }
bool EventError::isNull() const {
return _isNull;
}
const std::string &EventError::errorMessage() const { return _errorMessage; }
const std::string &EventError::errorMessage() const {
return _errorMessage;
}
}
+2
View File
@@ -41,5 +41,7 @@ namespace Robomongo
* @brief Error message
*/
const std::string _errorMessage;
bool _isNull;
};
}
+79 -13
View File
@@ -5,6 +5,8 @@
#include "robomongo/core/domain/MongoShell.h"
#include "robomongo/core/domain/MongoCollection.h"
#include "robomongo/core/settings/ConnectionSettings.h"
#include "robomongo/core/settings/SshSettings.h"
#include "robomongo/core/mongodb/SshTunnelWorker.h"
#include "robomongo/core/EventBus.h"
#include "robomongo/core/utils/QtUtils.h"
#include "robomongo/core/utils/StdUtils.h"
@@ -31,7 +33,11 @@ namespace Robomongo
}
App::App(EventBus *const bus) : QObject(),
_bus(bus) { }
_bus(bus) {
_bus->subscribe(this, EstablishSshConnectionResponse::Type);
_bus->subscribe(this, ListenSshConnectionResponse::Type);
_bus->subscribe(this, LogEvent::Type);
}
App::~App()
{
@@ -40,22 +46,29 @@ namespace Robomongo
}
/**
* @brief Creates and opens new server connection.
* Creates and opens new server connection.
* @param connection: ConnectionSettings, that will be owned by MongoServer.
* @param visible: should this server be visible in UI (explorer) or not.
*/
MongoServer *App::openServer(ConnectionSettings *connection,
bool visible)
{
MongoServer *server = new MongoServer(connection, visible);
_servers.push_back(server);
MongoServer *App::openServer(ConnectionSettings *connection, bool visible) {
if (visible)
_bus->publish(new ConnectingEvent(this, server));
_bus->publish(new ConnectingEvent(this));
LOG_MSG(QString("Connecting to %1...").arg(QtUtils::toQString(server->connectionRecord()->getFullAddress())), mongo::LL_INFO);
server->tryConnect();
return server;
// When connection is not "visible" or do not have
// ssh settings enabled, continue without SSH Tunnel
if (!visible || !connection->sshSettings()->enabled()) {
return continueOpenServer(connection, visible);
}
// Open SSH channel and only after that open connection
LOG_MSG(QString("Creating SSH tunnel to %1:%2...")
.arg(QtUtils::toQString(connection->sshSettings()->host()))
.arg(connection->sshSettings()->port()), mongo::logger::LogSeverity::Info());
ConnectionSettings* settingsCopy = connection->clone();
SshTunnelWorker* sshWorker = new SshTunnelWorker(settingsCopy);
_bus->send(sshWorker, new EstablishSshConnectionRequest(this, sshWorker, settingsCopy, visible));
return NULL;
}
/**
@@ -102,7 +115,6 @@ namespace Robomongo
MongoShell *shell = new MongoShell(server,scriptInfo);
_shells.push_back(shell);
_bus->publish(new OpeningShellEvent(this, shell));
LOG_MSG("Opening shell...", mongo::LL_INFO);
shell->execute();
return shell;
}
@@ -122,4 +134,58 @@ namespace Robomongo
closeServer(shell->server());
delete shell;
}
MongoServer* App::continueOpenServer(ConnectionSettings *connection, bool visible, int localport) {
ConnectionSettings* settings = connection->clone();
// Modify connection settings when SSH tunnel is used
if (visible && settings->sshSettings()->enabled()) {
settings->setServerHost("127.0.0.1");
settings->setServerPort(localport);
}
MongoServer *server = new MongoServer(settings, visible);
_servers.push_back(server);
server->runWorkerThread();
LOG_MSG(QString("Connecting to %1...").arg(QtUtils::toQString(server->connectionRecord()->getFullAddress())), mongo::logger::LogSeverity::Info());
server->tryConnect();
return server;
}
void App::handle(EstablishSshConnectionResponse *event) {
if (event->isError()) {
_bus->publish(new ConnectionFailedEvent(this, event->error().errorMessage()));
return;
}
LOG_MSG(QString("SSH tunnel created successfully"), mongo::logger::LogSeverity::Info());
_bus->send(event->worker, new ListenSshConnectionRequest(this));
continueOpenServer(event->settings, event->visible, event->localport);
// record event->worker and delete when needed
}
void App::handle(LogEvent *event) {
if (event->level == LogEvent::ERROR) {
LOG_MSG(event->message, mongo::logger::LogSeverity::Error());
} else if (event->level == LogEvent::WARN) {
LOG_MSG(event->message, mongo::logger::LogSeverity::Warning());
} else if (event->level == LogEvent::INFO) {
LOG_MSG(event->message, mongo::logger::LogSeverity::Info());
} else if (event->level == LogEvent::DEBUG) {
LOG_MSG(event->message, mongo::logger::LogSeverity::Log());
}
}
void App::handle(ListenSshConnectionResponse *event) {
if (event->isError()) {
_bus->publish(new ConnectionFailedEvent(this, event->error().errorMessage()));
return;
}
LOG_MSG(QString("SSH tunnel closed."), mongo::logger::LogSeverity::Error());
}
}
+16 -8
View File
@@ -1,6 +1,7 @@
#pragma once
#include <QObject>
#include <vector>
#include <robomongo/core/events/MongoEvents.h>
#include "robomongo/core/domain/ScriptInfo.h"
@@ -12,9 +13,12 @@ namespace Robomongo
class MongoCollection;
class MongoShell;
class MongoDatabase;
class EstablishSshConnectionResponse;
class LogEvent;
namespace detail
{
/**
/**
* @brief Builds single collection query (i.e. db.my_col.find()) from
* string that doesn't contain "db.my_col." prefix.
*
@@ -59,11 +63,11 @@ namespace Robomongo
MongoShell *openShell(MongoServer *server, const QString &script, const std::string &dbName = std::string(),
bool execute = true, const QString &shellName = QString(),
const CursorPosition &cursorPosition = CursorPosition(),const QString &file=QString());
const CursorPosition &cursorPosition = CursorPosition(), const QString &file = QString());
MongoShell *openShell(MongoDatabase *database, const QString &script,
bool execute = true, const QString &shellName = QString(),
const CursorPosition &cursorPosition = CursorPosition(),const QString &filePathToSave=QString());
const CursorPosition &cursorPosition = CursorPosition(), const QString &filePathToSave = QString());
MongoShell *openShell(ConnectionSettings *connection, const ScriptInfo &scriptInfo);
MongoServersContainerType getServers() const {return _servers; };
@@ -74,20 +78,24 @@ namespace Robomongo
*/
void closeShell(MongoShell *shell);
public Q_SLOTS:
void handle(EstablishSshConnectionResponse *event);
void handle(ListenSshConnectionResponse *event);
void handle(LogEvent *event);
private:
MongoServer* continueOpenServer(ConnectionSettings *connection, bool visible, int localport = 0);
/**
* @brief MongoServers, owned by this App.
* MongoServers, owned by this App.
*/
MongoServersContainerType _servers;
/**
* @brief MongoShells, owned by this App.
* MongoShells, owned by this App.
*/
MongoShellsContainerType _shells;
/**
* @brief EventBus
*/
EventBus *const _bus;
};
}
@@ -18,7 +18,7 @@ namespace Robomongo
_system = true;
}
std::string MongoCollection::sizeString() const
/* std::string MongoCollection::sizeString() const
{
return MongoUtils::buildNiceSizeString(_info.sizeBytes()).toStdString();
}
@@ -26,5 +26,5 @@ namespace Robomongo
QString MongoCollection::storageSizeString() const
{
return MongoUtils::buildNiceSizeString(_info.storageSizeBytes());
}
}*/
}
+2 -2
View File
@@ -17,8 +17,8 @@ namespace Robomongo
std::string fullName() const { return _ns.toString(); }
MongoDatabase *database() const { return _database; }
std::string sizeString() const;
QString storageSizeString() const;
// std::string sizeString() const;
// QString storageSizeString() const;
private:
@@ -1,17 +1,20 @@
#include "MongoCollectionInfo.h"
#include "robomongo/core/utils/BsonUtils.h"
#include <mongo/client/dbclient.h>
#include <mongo/client/dbclientinterface.h>
namespace Robomongo
{
MongoCollectionInfo::MongoCollectionInfo(mongo::BSONObj stats) : _ns(stats.getStringField("ns"))
MongoCollectionInfo::MongoCollectionInfo(const std::string &ns) : _ns(ns) {}
/* MongoCollectionInfo::MongoCollectionInfo(mongo::BSONObj stats) : _ns(stats.getStringField("ns"))
{
// if "size" and "storageSize" are of type Int32 or Int64, they
// will be converted to double by "numberDouble()" function.
_sizeBytes = BsonUtils::getField<mongo::NumberDouble>(stats,"size");
_storageSizeBytes = BsonUtils::getField<mongo::NumberDouble>(stats,"storageSize");
_count = BsonUtils::getField<mongo::NumberInt>(stats,"count");
}
// NumberLong because of mongodb can have very big collections
_count = BsonUtils::getField<mongo::NumberLong>(stats,"count");
}*/
}
@@ -7,7 +7,9 @@ namespace Robomongo
class MongoCollectionInfo
{
public:
MongoCollectionInfo(mongo::BSONObj stats);
MongoCollectionInfo() {}
MongoCollectionInfo(const std::string &ns);
// MongoCollectionInfo(mongo::BSONObj stats);
std::string name() const { return _ns.collectionName(); }
std::string fullName() const { return _ns.toString(); }
@@ -18,16 +20,16 @@ namespace Robomongo
* It is double, because db.stats()'s "size" field may be double
* for large values, while Int32 for small.
*/
double sizeBytes() const { return _sizeBytes; }
// double sizeBytes() const { return _sizeBytes; }
/**
* @brief Storage size in bytes
* It is double, because db.stats()'s "storageSize" field may be double
* for large values, while Int32 for small.
*/
double storageSizeBytes() const { return _storageSizeBytes; }
// double storageSizeBytes() const { return _storageSizeBytes; }
int count() const { return _count; }
// long long count() const { return _count; }
private:
MongoNamespace _ns;
@@ -46,7 +48,7 @@ namespace Robomongo
*/
double _storageSizeBytes;
int _count;
long long _count;
};
}
+12 -9
View File
@@ -8,7 +8,6 @@
namespace Robomongo
{
R_REGISTER_EVENT(MongoDatabaseCollectionListLoadedEvent)
R_REGISTER_EVENT(MongoDatabaseUsersLoadedEvent)
R_REGISTER_EVENT(MongoDatabaseFunctionsLoadedEvent)
@@ -21,9 +20,7 @@ namespace Robomongo
_system(name == "admin" || name == "local"),
_server(server),
_bus(AppRegistry::instance().bus()),
_name(name)
{
}
_name(name) {}
MongoDatabase::~MongoDatabase()
{
@@ -99,8 +96,10 @@ namespace Robomongo
void MongoDatabase::handle(LoadCollectionNamesResponse *loaded)
{
if (loaded->isError())
if (loaded->isError()) {
_bus->publish(new MongoDatabaseCollectionListLoadedEvent(this, loaded->error()));
return;
}
clearCollections();
const std::vector<MongoCollectionInfo> &colectionsInfos = loaded->collectionInfos();
@@ -122,17 +121,21 @@ namespace Robomongo
void MongoDatabase::handle(LoadUsersResponse *event)
{
if (event->isError())
if (event->isError()) {
_bus->publish(new MongoDatabaseUsersLoadedEvent(this, event->error()));
return;
}
_bus->publish(new MongoDatabaseUsersLoadedEvent(this, this, event->users()));
}
void MongoDatabase::handle(LoadFunctionsResponse *event)
{
if (event->isError())
if (event->isError()) {
_bus->publish(new MongoDatabaseFunctionsLoadedEvent(this, event->error()));
return;
}
_bus->publish(new MongoDatabaseFunctionsLoadedEvent(this, this, event->functions()));
}
@@ -86,6 +86,9 @@ namespace Robomongo
Event(sender),
collections(list) { }
MongoDatabaseCollectionListLoadedEvent(QObject *sender, const EventError &error) :
Event(sender, error) {}
std::vector<MongoCollection *> collections;
};
@@ -98,6 +101,9 @@ namespace Robomongo
_users(list),
_database(database) {}
MongoDatabaseUsersLoadedEvent(QObject *sender, const EventError &error) :
Event(sender, error) {}
std::vector<MongoUser> users() const { return _users; }
MongoDatabase *database() const { return _database; }
@@ -115,6 +121,9 @@ namespace Robomongo
_functions(list),
_database(database) {}
MongoDatabaseFunctionsLoadedEvent(QObject *sender, const EventError &error) :
Event(sender, error) {}
std::vector<MongoFunction> functions() const { return _functions; }
MongoDatabase *database() const { return _database; }
+1 -43
View File
@@ -1,6 +1,6 @@
#include "robomongo/core/domain/MongoDocument.h"
#include <mongo/client/dbclient.h>
#include <mongo/client/dbclientinterface.h>
#include "robomongo/core/settings/SettingsManager.h"
#include "robomongo/core/AppRegistry.h"
#include "robomongo/core/utils/BsonUtils.h"
@@ -44,46 +44,4 @@ namespace Robomongo
return list;
}
/*
** Convert to json string
*/
void MongoDocument::buildJsonString(std::string &con)
{
BsonUtils::buildJsonString(_bsonObj, con,
AppRegistry::instance().settingsManager()->uuidEncoding(),
AppRegistry::instance().settingsManager()->timeZone());
}
/*
** Build JsonString from list of documents
*/
std::string MongoDocument::buildJsonString(const QList<MongoDocumentPtr> &documents)
{
mongo::StringBuilder sb;
int position = 0;
for (QList<MongoDocumentPtr>::const_iterator it = documents.begin(); it != documents.end(); ++it) {
if (position == 0)
sb << "/* 0 */\n";
else
sb << "\n\n/* " << position << " */\n";
std::string jsonString = (*it)->bsonObj().jsonString(mongo::TenGen, 1);
sb << jsonString;
position++;
}
std::string final = sb.str();
return final;
}
std::string MongoDocument::buildJsonString(const MongoDocumentPtr &doc)
{
//qt4 QTextCodec::setCodecForCStrings(codec);
std::string jsonString = doc->bsonObj().jsonString(mongo::TenGen, 1);
return jsonString;
}
}
-12
View File
@@ -42,17 +42,5 @@ namespace Robomongo
** Return "native" BSONObj
*/
mongo::BSONObj bsonObj() const { return _bsonObj; }
/*
** Convert to json string
*/
void buildJsonString(std::string &con);
/*
** Build JsonString from list of documents
*/
static std::string buildJsonString(const QList<MongoDocumentPtr> &documents);
static std::string buildJsonString(const MongoDocumentPtr &documents);
};
}
+1 -1
View File
@@ -1,6 +1,6 @@
#include "robomongo/core/domain/MongoFunction.h"
#include "robomongo/core/utils/BsonUtils.h"
#include <mongo/client/dbclient.h>
#include <mongo/client/dbclientinterface.h>
namespace Robomongo
{
+1 -1
View File
@@ -1,6 +1,6 @@
#include "robomongo/core/domain/MongoQueryInfo.h"
#include <mongo/client/dbclient.h>
#include <mongo/client/dbclientinterface.h>
namespace Robomongo
{
+88 -75
View File
@@ -2,70 +2,71 @@
#include "robomongo/core/domain/MongoDatabase.h"
#include "robomongo/core/settings/ConnectionSettings.h"
#include "robomongo/core/settings/SshSettings.h"
#include "robomongo/core/settings/SettingsManager.h"
#include "robomongo/core/mongodb/MongoWorker.h"
#include "robomongo/core/mongodb/SshTunnelWorker.h"
#include "robomongo/core/AppRegistry.h"
#include "robomongo/core/EventBus.h"
#include "robomongo/core/utils/QtUtils.h"
namespace Robomongo
{
namespace Robomongo {
R_REGISTER_EVENT(MongoServerLoadingDatabasesEvent)
MongoServer::MongoServer(ConnectionSettings *connectionRecord, bool visible) : QObject(),
MongoServer::MongoServer(ConnectionSettings *settings, bool visible) : QObject(),
_version(0.0f),
_visible(visible),
_client(new MongoWorker(connectionRecord->clone(),AppRegistry::instance().settingsManager()->loadMongoRcJs(),AppRegistry::instance().settingsManager()->batchSize())),
_isConnected(false)
{
}
_client(NULL),
_isConnected(false),
_settings(settings),
_bus(AppRegistry::instance().bus()) { }
bool MongoServer::isConnected() const
{
bool MongoServer::isConnected() const {
return _isConnected;
}
ConnectionSettings *MongoServer::connectionRecord() const
{
return _client->connectionRecord();
ConnectionSettings *MongoServer::connectionRecord() const {
return _settings;
}
MongoServer::~MongoServer()
{
MongoServer::~MongoServer() {
clearDatabases();
delete _client;
if (_client != NULL) {
_client->stopAndDelete();
}
// MongoWorker "_client" does not deleted here, because it is now owned by
// another thread (call to moveToThread() made in MongoWorker constructor).
// It will be deleted by this thread by means of "deleteLater()", which
// is also specified in MongoWorker constructor.
delete _settings;
}
/**
* @brief Try to connect to MongoDB server.
* @throws MongoException, if fails
*/
void MongoServer::tryConnect()
{
AppRegistry::instance().bus()->send(_client,new EstablishConnectionRequest(this,
"_connectionRecord->databaseName()",
"_connectionRecord->userName()",
"_connectionRecord->userPassword()"));
void MongoServer::tryConnect() {
_bus->send(_client, new EstablishConnectionRequest(this));
}
QStringList MongoServer::getDatabasesNames() const
{
QStringList MongoServer::getDatabasesNames() const {
QStringList result;
for (DatabasesContainerType::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
for (QList<MongoDatabase *>::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
MongoDatabase *datab = *it;
result.append(QtUtils::toQString(datab->name()));
}
return result;
}
void MongoServer::createDatabase(const std::string &dbName)
{
AppRegistry::instance().bus()->send(_client,new CreateDatabaseRequest(this, dbName));
void MongoServer::createDatabase(const std::string &dbName) {
_bus->send(_client,new CreateDatabaseRequest(this, dbName));
}
MongoDatabase *MongoServer::findDatabaseByName(const std::string &dbName) const
{
for (DatabasesContainerType::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
MongoDatabase *MongoServer::findDatabaseByName(const std::string &dbName) const {
for (QList<MongoDatabase *>::const_iterator it = _databases.begin(); it != _databases.end(); ++it) {
MongoDatabase *datab = *it;
if (datab->name() == dbName) {
return datab;
@@ -74,79 +75,82 @@ namespace Robomongo
return NULL;
}
void MongoServer::dropDatabase(const std::string &dbName)
{
AppRegistry::instance().bus()->send(_client,new DropDatabaseRequest(this, dbName));
void MongoServer::dropDatabase(const std::string &dbName) {
_bus->send(_client,new DropDatabaseRequest(this, dbName));
}
void MongoServer::insertDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns)
{
void MongoServer::insertDocuments(const std::vector<mongo::BSONObj> &objCont,
const MongoNamespace &ns) {
for (std::vector<mongo::BSONObj>::const_iterator it = objCont.begin(); it != objCont.end(); it++) {
insertDocument(*it, ns);
}
}
void MongoServer::insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns)
{
AppRegistry::instance().bus()->send(_client,new InsertDocumentRequest(this, obj, ns));
void MongoServer::insertDocument(const mongo::BSONObj &obj, const MongoNamespace &ns) {
_bus->send(_client,new InsertDocumentRequest(this, obj, ns));
}
void MongoServer::saveDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns)
{
void MongoServer::saveDocuments(const std::vector<mongo::BSONObj> &objCont, const MongoNamespace &ns) {
for (std::vector<mongo::BSONObj>::const_iterator it = objCont.begin(); it != objCont.end(); it++) {
saveDocument(*it,ns);
}
}
void MongoServer::saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns)
{
AppRegistry::instance().bus()->send(_client, new InsertDocumentRequest(this, obj, ns, true));
void MongoServer::saveDocument(const mongo::BSONObj &obj, const MongoNamespace &ns) {
_bus->send(_client, new InsertDocumentRequest(this, obj, ns, true));
}
void MongoServer::removeDocuments(mongo::Query query, const MongoNamespace &ns, bool justOne)
{
AppRegistry::instance().bus()->send(_client, new RemoveDocumentRequest(this, query, ns, justOne));
void MongoServer::removeDocuments(mongo::Query query, const MongoNamespace &ns, bool justOne) {
_bus->send(_client, new RemoveDocumentRequest(this, query, ns, justOne));
}
void MongoServer::loadDatabases()
{
AppRegistry::instance().bus()->publish(new MongoServerLoadingDatabasesEvent(this));
AppRegistry::instance().bus()->send(_client, new LoadDatabaseNamesRequest(this));
void MongoServer::loadDatabases() {
_bus->publish(new MongoServerLoadingDatabasesEvent(this));
_bus->send(_client, new LoadDatabaseNamesRequest(this));
}
void MongoServer::clearDatabases()
{
void MongoServer::clearDatabases() {
qDeleteAll(_databases);
_databases.clear();
}
void MongoServer::addDatabase(MongoDatabase *database)
{
void MongoServer::addDatabase(MongoDatabase *database) {
_databases.append(database);
}
void MongoServer::handle(EstablishConnectionResponse *event)
{
void MongoServer::handle(EstablishConnectionResponse *event) {
if (event->isError()) {
_isConnected = false;
std::stringstream ss;
ss << "Cannot connect to the MongoDB at " << connectionRecord()->getFullAddress()
<< ".\n\nError:\n" << event->error().errorMessage();
_bus->publish(new ConnectionFailedEvent(this, ss.str()));
return;
}
const ConnectionInfo &info = event->info();
_isConnected = !event->isError();
if (event->isError()) {
AppRegistry::instance().bus()->publish(new ConnectionFailedEvent(this, event->error()));
} else if (_visible) {
AppRegistry::instance().bus()->publish(new ConnectionEstablishedEvent(this));
clearDatabases();
for(std::vector<std::string>::const_iterator it = info._databases.begin(); it != info._databases.end(); ++it) {
const std::string &name = *it;
MongoDatabase *db = new MongoDatabase(this, name);
addDatabase(db);
}
}
_version = info._version;
_isConnected = true;
// Do nothing if this is not "visible" connection
if (!_visible) {
return;
}
_bus->publish(new ConnectionEstablishedEvent(this));
clearDatabases();
for(std::vector<std::string>::const_iterator it = info._databases.begin(); it != info._databases.end(); ++it) {
const std::string &name = *it;
MongoDatabase *db = new MongoDatabase(this, name);
addDatabase(db);
}
}
void MongoServer::handle(LoadDatabaseNamesResponse *event)
{
void MongoServer::handle(LoadDatabaseNamesResponse *event) {
if (event->isError()) {
AppRegistry::instance().bus()->publish(new ConnectionFailedEvent(this, event->error()));
_bus->publish(new DatabaseListLoadedEvent(this, event->error()));
return;
}
@@ -157,11 +161,20 @@ namespace Robomongo
addDatabase(db);
}
AppRegistry::instance().bus()->publish(new DatabaseListLoadedEvent(this, _databases));
_bus->publish(new DatabaseListLoadedEvent(this, _databases));
}
void MongoServer::handle(InsertDocumentResponse *event)
{
AppRegistry::instance().bus()->publish(new InsertDocumentResponse(event->sender(), event->error()));
void MongoServer::handle(InsertDocumentResponse *event) {
_bus->publish(new InsertDocumentResponse(event->sender(), event->error()));
}
void MongoServer::handle(RemoveDocumentResponse *event) {
_bus->publish(new RemoveDocumentResponse(event->sender(), event->error()));
}
void MongoServer::runWorkerThread() {
_client = new MongoWorker(_settings->clone(),
AppRegistry::instance().settingsManager()->loadMongoRcJs(),
AppRegistry::instance().settingsManager()->batchSize());
}
}
+8 -3
View File
@@ -11,6 +11,7 @@ namespace Robomongo
class EstablishConnectionResponse;
class LoadDatabaseNamesResponse;
class InsertDocumentResponse;
class EventBus;
/**
* @brief MongoServer represents active connection to MongoDB server.
@@ -28,10 +29,11 @@ namespace Robomongo
* @param visible
* @param defaultDatabase
*/
typedef QList<MongoDatabase *> DatabasesContainerType;
MongoServer(ConnectionSettings *connectionRecord, bool visible);
~MongoServer();
void runWorkerThread();
/**
* @brief Try to connect to MongoDB server.
* @throws MongoException, if fails
@@ -68,18 +70,21 @@ namespace Robomongo
void handle(EstablishConnectionResponse *event);
void handle(LoadDatabaseNamesResponse *event);
void handle(InsertDocumentResponse *event);
void handle(RemoveDocumentResponse *event);
private:
void clearDatabases();
void addDatabase(MongoDatabase *database);
MongoWorker *const _client;
MongoWorker* _client;
ConnectionSettings* _settings;
EventBus* _bus;
float _version;
bool _visible;
bool _isConnected;
DatabasesContainerType _databases;
QList<MongoDatabase *> _databases;
};
class MongoServerLoadingDatabasesEvent : public Event
+19 -3
View File
@@ -25,7 +25,7 @@ namespace Robomongo
AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
_scriptInfo.setScript(QtUtils::toQString(script));
AppRegistry::instance().bus()->send(_server->client(), new ExecuteScriptRequest(this, query(), dbName));
LOG_MSG(_scriptInfo.script(), mongo::LL_INFO);
LOG_MSG(_scriptInfo.script(), mongo::logger::LogSeverity::Info());
}
std::string MongoShell::query() const
@@ -39,7 +39,7 @@ namespace Robomongo
AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
AppRegistry::instance().bus()->send(_server->client(), new ExecuteScriptRequest(this, query(), dbName));
if(!_scriptInfo.script().isEmpty())
LOG_MSG(_scriptInfo.script(), mongo::LL_INFO);
LOG_MSG(_scriptInfo.script(), mongo::logger::LogSeverity::Info());
} else {
AppRegistry::instance().bus()->publish(new ScriptExecutingEvent(this));
_scriptInfo.setScript("");
@@ -62,7 +62,8 @@ namespace Robomongo
void MongoShell::stop()
{
mongo::Scope::setInterruptFlag(true);
// _server->client()->interrupt();
// mongo::Scope::setInterruptFlag(true);
}
bool MongoShell::loadFromFile()
@@ -82,16 +83,31 @@ namespace Robomongo
void MongoShell::handle(ExecuteQueryResponse *event)
{
if (event->isError()) {
AppRegistry::instance().bus()->publish(new DocumentListLoadedEvent(this, event->error()));
return;
}
AppRegistry::instance().bus()->publish(new DocumentListLoadedEvent(this, event->resultIndex, event->queryInfo, query(), event->documents));
}
void MongoShell::handle(ExecuteScriptResponse *event)
{
if (event->isError()) {
AppRegistry::instance().bus()->publish(new ScriptExecutedEvent(this, event->error()));
return;
}
AppRegistry::instance().bus()->publish(new ScriptExecutedEvent(this, event->result, event->empty));
}
void MongoShell::handle(AutocompleteResponse *event)
{
if (event->isError()) {
AppRegistry::instance().bus()->publish(new AutocompleteResponse(this, event->error()));
return;
}
AppRegistry::instance().bus()->publish(new AutocompleteResponse(this, event->list, event->prefix));
}
}

Some files were not shown because too many files have changed in this diff Show More