Commit Graph

1509 Commits

Author SHA1 Message Date
Sebastian Messmer
0163029f3c In a release build, also compile scrypt library with optimization flags. 2016-02-12 21:58:37 +01:00
Sebastian Messmer
d4272ea442 Make scrypt compilation step work on 32bit 2016-02-12 21:22:08 +01:00
Sebastian Messmer
12e62a34d8 Fix CPU core count recognition on travis 2016-02-12 20:48:13 +01:00
Sebastian Messmer
2767c68222 Merge branch 'develop' into travistest 2016-02-12 18:29:56 +01:00
Sebastian Messmer
87be0e4477 Add libssl-dev dependency to README 2016-02-12 13:27:06 +01:00
Sebastian Messmer
59dbe54a75 Recognize number of CPU cores on Mac OS X travis 2016-02-12 13:17:35 +01:00
Sebastian Messmer
b5f14b81af Check number of CPU cores on travis 2016-02-12 13:11:11 +01:00
Sebastian Messmer
d05e3841bd Mountdir has correct ownership and permissions set. Fixes https://github.com/cryfs/cryfs/issues/10 2016-02-12 12:21:39 +01:00
Sebastian Messmer
3ecbef6d11 Fix CPack package generation 2016-02-12 11:12:14 +01:00
Sebastian Messmer
8f5e5640de Be more explicit in comment 2016-02-12 10:57:11 +01:00
Sebastian Messmer
41f215e5cb Since travis CI doesn't run "make package" anymore, we don't need the rpmbuild package anymore. 2016-02-12 10:47:40 +01:00
Sebastian Messmer
f5649f9dd2 Remove "make package" from travis. That would need a newer cmake version, but it is more important to test that cryfs compiles with the old cmake. 2016-02-12 10:44:05 +01:00
Sebastian Messmer
a26aa95683 Don't need to install newer cmake on travis anymore. 2016-02-12 10:29:44 +01:00
Sebastian Messmer
cbbe6448c4 Merge branch 'develop' into oldcmake2 2016-02-12 10:17:22 +01:00
Sebastian Messmer
19bc87ea30 Removed debug output 2016-02-12 10:16:52 +01:00
Sebastian Messmer
de4b2e60ad Allow cmake 2.8 2016-02-12 10:16:38 +01:00
Sebastian Messmer
ffcc343609 Install rpmbuild on travis CI 2016-02-12 09:50:44 +01:00
Sebastian Messmer
1b0d53056c Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-11 23:54:04 +01:00
Sebastian Messmer
7734566bbd Update gitversion 2016-02-11 23:53:23 +01:00
Sebastian Messmer
799bc0ff1d Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-11 20:33:26 +01:00
Sebastian Messmer
5e6e3500e3 Also run cryfs tests on travis CI 2016-02-11 20:32:42 +01:00
Sebastian Meßmer
3be0b11029 List python as a build dependency in README 2016-02-11 20:20:57 +01:00
Sebastian Meßmer
971a061833 Use https git url 2016-02-11 19:58:55 +01:00
Sebastian Meßmer
1d09389f67 Change case of title 2016-02-11 19:58:02 +01:00
Sebastian Meßmer
a560128ac5 Remove submodule links from README, since they're now in this repository. 2016-02-11 19:57:29 +01:00
Sebastian Messmer
9a9a6ffd56 Install boost program_options on travis CI 2016-02-11 19:54:52 +01:00
Sebastian Messmer
379b2c3e2a Adapt install command in README to new repository structure 2016-02-11 17:47:16 +01:00
Sebastian Messmer
e5b5f3aa24 Fix gitignore 2016-02-11 17:38:35 +01:00
Sebastian Messmer
cfe2a48ebc Merge branch 0.9 (pre-work for version 0.9) 2016-02-11 17:35:20 +01:00
Sebastian Messmer
fff5b4b6e9 Make CPack work with new repository layout 2016-02-11 17:34:08 +01:00
Sebastian Messmer
c6e8052d93 Merge all git repositories into one 2016-02-11 16:40:48 +01:00
Sebastian Messmer
20c617376e Removed biicode files and adapted ChangeLog/README 2016-02-11 15:28:34 +01:00
Sebastian Messmer
31672e086c Fix includes after merging repositories 2016-02-11 15:19:58 +01:00
Sebastian Messmer
31d52d3c8d Merged blobstore repository 2016-02-11 14:50:18 +01:00
Sebastian Messmer
f3d614c633 Merged blockstore 2016-02-11 14:44:28 +01:00
Sebastian Messmer
489af565e2 Fix test executable location for travis CI 2016-02-11 14:37:10 +01:00
Sebastian Messmer
3c32df43eb Fix run_with_fuse.sh for travis 2016-02-11 14:23:20 +01:00
Sebastian Messmer
4202e6be89 Merge parallelaccessstore repository 2016-02-11 14:22:18 +01:00
Sebastian Messmer
3fb73e4f80 Fix run_with_fuse for travis CI 2016-02-11 14:07:26 +01:00
Sebastian Messmer
445742156d Install boost chrono on travis CI 2016-02-11 14:06:24 +01:00
Sebastian Messmer
59474b10b6 Handle vendor libraries better in cmake 2016-02-11 14:01:59 +01:00
Sebastian Messmer
cbd1a24a05 Added a reminder to the readme file 2016-02-11 13:06:34 +01:00
Sebastian Messmer
9088a3d366 Use lowercase for cmake function definitions and rename add_boost/enable_style_warnings/activate_cpp14 to target_add_boost/target_enable_style_warnings/target_activate_cpp14 2016-02-11 12:57:50 +01:00
Sebastian Messmer
1dcf36d38c Move fspp to its own subdirectories 2016-02-11 12:53:42 +01:00
Sebastian Messmer
0fb710ac69 Merge fspp repository into here 2016-02-11 12:14:44 +01:00
Sebastian Messmer
92cf6fa66d Refactor directory layout to allow other modules in same repository 2016-02-11 12:04:49 +01:00
Sebastian Messmer
11e1b89e31 Define minimal needed boost version 2016-02-11 04:33:15 +01:00
Sebastian Messmer
007934b946 Fix travis and allow clang failures 2016-02-11 04:28:16 +01:00
Sebastian Messmer
ed64b49adf Add osx tests on travis 2016-02-11 04:26:26 +01:00
Sebastian Messmer
a35e164ede Add needed packages to travis 2016-02-11 04:23:46 +01:00