Commit Graph

254 Commits

Author SHA1 Message Date
Sascha Cunz
86f92b7431 Show informational messages during cmake run as informational 2014-01-13 12:49:54 +00:00
Russell Belfer
7697e54176 Test cancel from indexer progress callback
This adds tests that try canceling an indexer operation from
within the progress callback.

After writing the tests, I wanted to run this under valgrind and
had a number of errors in that situation because mmap wasn't
working.  I added a CMake option to force emulation of mmap and
consolidated the Amiga-specific code into that new place (so we
don't actually need separate Amiga code now, just have to turn on
-DNO_MMAP).

Additionally, I made the indexer code propagate error codes more
reliably than it used to.
2013-12-11 15:02:20 -08:00
Russell Belfer
726b75d1b8 Improve iconv finding for cmake
* add FindIconv helper for CMake iconv detection
* only default using iconv to ON for MacOS
* update pkg-config generation to include iconv dependency better
2013-12-02 11:32:37 -08:00
Ben Straub
83e1efbf46 Update files that reference tests-clar 2013-11-14 14:10:32 -08:00
Vicent Martí
0df96f2b05 Merge pull request #1936 from libgit2/better-url-parsing
Streamline url-parsing logic.
2013-11-10 07:31:21 -08:00
Vicent Marti
73291aff6e cmake: Add USE_SSH option 2013-11-05 22:08:38 +01:00
Ben Straub
2d1feaa2c7 Compile HTTP parser on win32 (for url parsing) 2013-11-04 15:03:44 -08:00
Edward Thomson
1bfe7133e0 Allow -DWINHTTP=OFF to disable WinHTTP 2013-10-25 13:23:46 -04:00
Carlos Martín Nieto
474c8cf832 Really fix the pc file
It turns out that variables have function scope by default. Let's
really set -liconv and add a few libraries that were forgotten in
the previous commit.

We also need to special-case OSX, as they ship zlib but do not provide
a pkg-config file for it.
2013-10-23 22:49:52 +02:00
Carlos Martín Nieto
1ecda61ec5 Set the correct dependencies in the pkg-config file
When linking statically, the including project needs to know what the
current library build depends on so they can link to it. Store this
information in the pkg-config file.

While here, remove claims that users need to link to zlib or libcrypto.
2013-10-23 13:46:31 +02:00
Russell Belfer
92dac97586 Make reference lookups apply precomposeunicode
Before these changes, looking up a reference would return the
same precomposed or decomposed form of the reference name that
was used to look it up, so on MacOS which ignores the difference
between the two, a single reference could be looked up either way
and git_reference_name would return the form of the name that was
used to look it up!  This change makes lookup always return the
precomposed name if core.precomposeunicode is set regardless of
which version was used to look it up.  The reference iterator was
already returning the precomposed form from earlier work.

This also updates the CMakeLists.txt rules for enabling iconv
usage because the clar tests for this code were actually not being
activated properly with the old version.

Finally, this moves git_repository_reset_filesystem from include/
git2/repository.h to include/git2/sys/repository.h since it is not
really a function that normal library users should have to think
about very often.
2013-10-08 16:35:57 -07:00
Russell Belfer
219d345732 Initial iconv hookup for precomposed unicode
This hooks up git_path_direach and git_path_dirload so that they
will take a flag indicating if directory entry names should be
tested and converted from decomposed unicode to precomposed form.
This code will only come into play on the Apple platform and even
then, only when certain types of filesystems are used.

This involved adding a flag to these functions which involved
changing a lot of places in the code.

This was an opportunity to do a bit of code cleanup here and there,
for example, getting rid of the git_futils_cleanupdir_r function in
favor of a simple flag to git_futils_rmdir_r to not remove the top
level entry.  That ended up adding depth tracking during rmdir_r
which led to a safety check for infinite directory recursion.  Yay.

This hasn't actually been tested on the Mac filesystems where the
issue occurs.  I still need to get test environment for that.
2013-10-03 10:44:13 -07:00
Jameson Miller
b176ededb7 Initial Implementation of progress reports during push
This adds the basics of progress reporting during push. While progress
for all aspects of a push operation are not reported with this change,
it lays the foundation to add these later. Push progress reporting
can be improved in the future - and consumers of the API should
just get more accurate information at that point.

The main areas where this is lacking are:

1) packbuilding progress: does not report progress during deltafication,
   as this involves coordinating progress from multiple threads.

2) network progress: reports progress as objects and bytes are going
   to be written to the subtransport (instead of as client gets
   confirmation that they have been received by the server) and leaves
   out some of the bytes that are transfered as part of the push protocol.
   Basically, this reports the pack bytes that are written to the
   subtransport. It does not report the bytes sent on the wire that
   are received by the server. This should be a good estimate of
   progress (and an improvement over no progress).
2013-09-30 13:22:28 -04:00
Russell Belfer
60ee53dfce Split examples CMakeLists.txt
Also, this converts the examples/CMakeLists.txt from explicitly
listing to just globbing for all the individual C files.
2013-09-03 15:20:16 -07:00
Vicent Martí
c46fe0c651 Merge pull request #1823 from kadamski/building4android
Small changes enabling compiling libgit2 for Android.
2013-09-02 03:01:40 -07:00
Krzysztof Adamski
5c37f00505 Build all example files if BUILD_EXAMPLES used. 2013-09-01 19:00:16 +02:00
Krzysztof Adamski
82b2fc2c83 Create ANDROID build option
CMake seems not to support Android as a target and this option
lets us test this in CMakeLists.txt.
2013-09-01 18:45:36 +02:00
Carlos Martín Nieto
5be622fb56 Test SSH in travis
Set up the ssh credentials so we are able to talk to localhost and
issue git commands. Move to use a script, as the command list is
getting somewhat long.

While here, delay installing valgrind until we need it, as it and its
dependencies are by far the largest downloads and this allows us to
start compiling (and failing) faster and we only incur this cost when
the test suite runs successfully.
2013-08-14 10:49:10 +02:00
Carlos Martín Nieto
d10de8bd8d CMake: finding libssh2 should be idempotent
With the current code, running 'cmake .' in an already-configured
directory causes the removal of ssh flags passed to the compiler,
making it impossible to build with ssh support but by removing CMake's
cache.

Remove the check for LIBSSH2_LIBRARY and let CMake do the right thing
wrt finding the library.
2013-08-12 12:07:33 +02:00
Russell Belfer
e8242022bc Move slow tests to "stress" clar module
Create a new section of clar tests "stress" that will default to
being off where we can put slow tests that push the library for
performance testing purposes.
2013-08-05 09:59:02 -07:00
Ben Straub
275d8d55b2 Typo 2013-07-18 09:37:59 -07:00
Ben Straub
e49dc6872d Switch default calling convention to cdecl. 2013-07-17 14:06:31 -07:00
Edward Thomson
cdacd3d931 header files show up in vs 2013-07-12 16:53:00 -05:00
Thomas Rast
c41281ad3a CMakeLists: fix zlib linker setup
b53671a (Search for zlib unconditional, 2012-12-18) changed things
around to always (even on windows, that's what the subject refers to)
call FIND_PACKAGE(ZLIB).

However, it did not correctly handle the case where ZLIB_LIBRARY is
cached, either by the user setting it manually or by an earlier
search.  In that case, the IF(ZLIB_FOUND) would not trigger (that
variable is not cached) and we'd instead use the built-in version.

000e689 (CMake: don't try to use bundled zlib when the system's path
is in the cache, 2013-05-12) tried to fix that, but it actually made
the problem worse: now with ZLIB_LIBRARY cached, _neither_ of the
blocks would execute, resulting in a linker error for me when trying
to build such a doubly-configured setup.

To fix the issue, we just trust CMake to do the right thing.  If
ZLIB_LIBRARY is set (either from user or cache) then the find_library
in FindZLIB.cmake will use that instead of searching again.  So we can
unconditionally (for real this time) call FIND_PACKAGE(ZLIB), and just
check its result.
2013-06-19 14:02:11 +02:00
nulltoken
c1cf1af46a cmake: Add option to specify the name of the binary 2013-06-13 10:12:44 +02:00
Vicent Marti
5a6e45cc84 Revert "cmake: Update Windows resources to reflect the optional vendor string"
This reverts commit 095bfd7487.
2013-06-12 21:14:04 +02:00
Veeti Paananen
7a6e0281c6 Build with the system's http-parser installation if available 2013-05-30 21:14:05 +03:00
nulltoken
095bfd7487 cmake: Update Windows resources to reflect the optional vendor string
Make InternalName and OriginalFilename resources reflect the name of the compiled binary.
2013-05-22 00:15:13 +02:00
nulltoken
ccf1a2ba5f cmake: Fix indentation 2013-05-22 00:15:12 +02:00
Vicent Martí
e3107e0ee1 Merge pull request #1558 from bmorganpa/ssh_transport
SSH Transport
2013-05-16 11:35:02 -07:00
Carlos Martín Nieto
3bbc87d697 CMake: allow appending a string to the library filename
This helps us install multiple versions of the library side-by-side.
2013-05-14 23:40:20 +02:00
Carlos Martín Nieto
000e68961c CMake: don't try to use bundled zlib when the system's path is in the cache
The code surrounding zlib bundling did not take into consideration
that ZLIB_LIBRARY gets cached, and assumed that FIND(ZLIB) would
always set ZLIB_FOUND, which does not hold true, as this variable
signifies that we have found the package and had to look at the
system, as its location was not cached.

Only use the bundled sources if the external zlib is neither
newly-found nor cached.
2013-05-12 15:35:02 +02:00
Brad Morgan
00e43380a0 Merge remote-tracking branch 'origin/development' into ssh_transport 2013-05-07 14:30:35 -04:00
Brad Morgan
7369b3c3bf Added libssh2 cmake module 2013-05-07 14:26:33 -04:00
Vicent Marti
b641c00eeb clar: Always generate the test suite 2013-05-03 17:35:50 +02:00
Edward Thomson
ac1d85cf11 cmake 2.6 parser bug workaround 2013-04-29 11:00:05 -05:00
Edward Thomson
eb63fda2e2 git_atomic_ssize for 64-bit atomics only on 64-bit platforms 2013-04-25 12:40:33 -05:00
Ben Straub
ec7e240ba4 Add rev-list example to makefiles 2013-04-09 05:07:12 +04:00
Philip Kelley
2c7f7a66e9 http: Support 302 Found (arrbee did most of the work) 2013-03-25 17:35:36 -04:00
Vicent Marti
c2ea65eec3 clar: Disable online tests. By now. 2013-03-25 21:24:18 +01:00
QbProg
d66a7c061a Fix for a cmake bug when using MSVC + Win64 + static libraries
(see http://public.kitware.com/Bug/view.php?id=11240)
2013-03-17 10:48:41 +01:00
QbProg
08f32085ab Adds an option to select the CRT link mode ( static or dynamic ).
This is useful when linking libgit2 statically, as the setting must match the linking program's one.
2013-03-17 10:48:34 +01:00
Carlos Martín Nieto
0887b580bf Use C99 stdio in mingw-w64
MinGW >= 3.14 does this automatically, but mingw-64 wants us to define
it.
2013-03-08 15:30:18 +01:00
Vicent Martí
92ebbe99c9 Merge pull request #1399 from nathan-osman/development
Add SONAME build option to facilitate building for Android.
2013-03-07 12:06:18 -08:00
Edward Thomson
b5ec5430a8 optional tracing 2013-03-07 12:42:33 -06:00
Nathan Osman
e7da9acdcd Added build option SONAME to control whether VERSION and SOVERSION were set for the git2 target, as some platforms require that this NOT be set. 2013-03-06 17:51:38 -08:00
Philip Kelley
69c28b75df MSVC: Define NDEBUG to disable asserts in release builds 2013-03-06 13:22:50 -05:00
Philip Kelley
19be3f9e65 Improve MSVC compiler, linker flags 2013-02-13 16:01:14 -05:00
Vicent Martí
fb60d268df Merge pull request #1315 from nulltoken/development
cMakeList: Prevent MSVCR1x0.dll dependency
2013-02-05 06:18:23 -08:00
nulltoken
e8670d01e0 cMakeList: Prevent MSVCR1x0.dll dependency
Deploys the libgit2/libgit2@9041250 fix to RELWITHDEBINFO
and MINSIZEREL build flavors

Fix #255
2013-02-05 14:32:09 +01:00
Edward Thomson
c27e211219 update examples to work on windows 2013-01-23 17:38:00 -06:00
Sebastian Bauer
b41e24a65c Add -fPIC only if BUILD_SHARED_LIBS is ON 2013-01-10 09:20:43 +01:00
Sebastian Bauer
707ede8633 Compile regexp dependency when AMIGA is defined.
Before it was compiled when CMake was actually run on AmigaOS.
2013-01-10 09:19:11 +01:00
Sebastian Bauer
c57c4af327 Disable SSL when compiling for AmigaOS for now. 2013-01-10 09:16:39 +01:00
Edward Thomson
8f09f46498 remove ppc sha1 asm 2013-01-08 16:55:16 -06:00
Edward Thomson
d335e73a6a keep comments at < 80 chars 2013-01-08 16:37:19 -06:00
nulltoken
09556895b7 travis: Include the online suite when running against Travis 2013-01-06 14:40:32 +01:00
Vicent Marti
4236164a77 Prototypes warning goes away 2013-01-03 02:37:28 +01:00
Vicent Marti
2e6f06a8d4 ...and add Clar raw 2013-01-03 02:34:45 +01:00
Vicent Marti
afb181167e /deal with it 2013-01-03 01:04:18 +01:00
Vicent Marti
39444bea0a ...fine 2013-01-03 01:01:03 +01:00
Vicent Marti
ad27838bdc Proper submodule dependency 2013-01-03 00:58:46 +01:00
Vicent Marti
6443eaf22f Disable Network suite by default 2013-01-03 00:50:29 +01:00
Vicent Marti
39cd01779c This is a better name 2013-01-02 22:38:10 +01:00
Vicent Marti
a44f2e9e7b Try it like this... 2013-01-02 22:26:34 +01:00
Vicent Marti
e229c04825 Fuck you CMake 2013-01-02 21:27:00 +01:00
Vicent Marti
0df4167577 Submodule checkout 2013-01-02 21:22:19 +01:00
Vicent Marti
a368fd0f79 Checkout test 2013-01-02 20:08:49 +01:00
Vicent Marti
5c2d3f6d5d Add build dependency for clar. Also, fuck you CMake. Fuck you. 2013-01-02 04:19:13 +01:00
Vicent Marti
b0a4582975 Bump the Clar submodule 2013-01-02 02:05:11 +01:00
Vicent Marti
156cfec096 Cleanup Clar to make it SIMPLER 2013-01-02 02:05:11 +01:00
Sascha Cunz
523a3ae5a3 MSVC: Don't list all source files in an endless list
Instead tell MSVC to group the source files by directory.
2012-12-19 04:57:15 +01:00
Sascha Cunz
94243295b2 DRY: Add function that adds os-specific libraries to our targets 2012-12-19 04:57:14 +01:00
Sascha Cunz
19a766a201 Collect configuration options at the top of the file
- Also document the -DSTDCALL even better.
2012-12-19 04:57:13 +01:00
Sascha Cunz
521479b170 DRY: Don't repeat globs for libgit2's own source files 2012-12-19 04:57:12 +01:00
Sascha Cunz
c5309eb2da Remove special case source globs for Solaris
With the src/compat/*.c glob removed, there is no longer a difference to
the default globs we use for the IF( UNIX ) case.
2012-12-19 04:57:12 +01:00
Sascha Cunz
49b630086e Remove src/compat/*.c from source globs
This directory doesn't exist.
2012-12-19 04:57:11 +01:00
Sascha Cunz
b53671ae85 Search for zlib unconditional
Up to now, on windows we don't even bother to look if the user has a zlib
available somwhere.

In almost all larger commercial projects i've participated in, it was not
at all uncommon to have such a dependency somewhere in the source tree and
use it whereever required.
Searching for it, even if it's unlikely to be present, allows for such a
scenario (i.e. by prefilling the CMake-Cache).
2012-12-19 04:57:11 +01:00
Sascha Cunz
3d007f4f9c DRY: Scan for regex.c only in one place 2012-12-19 04:57:10 +01:00
Sascha Cunz
8d45789167 Only add deps/http-parser to include-dirs if required 2012-12-19 04:57:09 +01:00
Vicent Marti
cfbe4be3fb More external API cleanup
Conflicts:
	src/branch.c
	tests-clar/refs/branches/create.c
2012-11-27 13:18:27 -08:00
Russell Belfer
a9069f6154 Merge pull request #1086 from scunz/vs_warning_level
VS-Build: Append C_FLAGS to the end of the already given ones.
2012-11-19 12:11:01 -08:00
Sascha Cunz
4a03913cfb VS-Build: Disable /W4 parameter, as it is not picked up anyway
My other PR revealed, that the /W4 parameter, we give to MSVC is ignored
because cmake set CMAKE_C_FLAGS already to /W3 and we overwrite it.

The command line tools gave me a D9025 warning for this on every file and
looking into the project properties page on MSVC 2008 tells, that it has
the warning level set to /W3.

However, the warnings introduced by /W4 are far to useless for having
them enabled. So just disable them.
2012-11-19 21:07:13 +01:00
Sascha Cunz
26d9e317db Don't use precompiled headers for command-line based VC builds.
The reason, why libgit2 currently cannot support compiling via the command-line
tools cl/nmake from WinSDK and/or Microsoft Visual Studio, seems to be a
missing dependency on the generated precompiled header file.

The Visual Studio IDE automatically inserts this dependency when it sees the
right combination of "/Y" parameters.

This patch allows to compile using command line tools by disabling precompiled
headers for NON-IDE builds.
2012-11-19 05:00:02 +01:00
Edward Thomson
d6fb092409 Win32 CryptoAPI and CNG support for SHA1 2012-11-13 10:23:05 -06:00
Russell Belfer
dbd6850d06 Hide deprecations on MacOS
Why Apple, why?
2012-11-01 10:57:14 -07:00
Paul Thompson
88149fae9f Leave CMAKE_BUILD_TYPE absent on those generators which don't use it. 2012-10-28 10:21:28 +11:00
Paul Thompson
4a3be934de Removed overwrite of CMAKE_C_FLAGS_DEBUG.
- No overwriting allows control from cmake cache or cmdline
- -g is already the CMake default
- -O0 is already gcc's default
2012-10-28 09:56:18 +11:00
Paul Thompson
54c56d3efd Remove "-O2 -g" from default CMAKE_C_FLAGS.
- Those are the RelWithDebInfo flags.
- They should be controlled from CMAKE_BUILD_TYPE
2012-10-28 09:42:54 +11:00
Paul Thompson
2df7c94490 Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
- For Debug builds, CMake uses concatenated
  CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG
- This reverts commit 291f712292.
2012-10-28 09:30:08 +11:00
Edward Thomson
94155e2fa2 remove /ZM1000 from msvc builds 2012-10-25 14:51:08 -05:00
Vicent Martí
81e7b10a15 Merge pull request #1012 from carlosmn/libcrypto-sha
Use libcrypto's SHA-1 implementation when linking to it
2012-10-23 13:43:28 -07:00
Carlos Martín Nieto
7205a4d94c Use libcrypto's SHA-1 implementation when linking to it
libcryto's SHA-1 implementation is measurably better than the one that
ships with the library. If we link to it for HTTPS support already,
use that implementation instead.

Testing on a ~600MB of the linux repository, this reduces indexing
time by 40% and removes the hashing from the top spot in the perf
output.
2012-10-23 20:30:16 +02:00
Veeti Paananen
88e0fc05d6 Remove backwards compatibility for INSTALL_LIB 2012-10-20 02:59:40 +03:00
Veeti Paananen
291f712292 Let environment CFLAGS override the debug flags 2012-10-20 02:57:02 +03:00
Veeti Paananen
9795a40f88 Use standard CMake variable names for installation paths
Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and
BIN_INSTALL_DIR, which are more commonly used. This is also
consistent with the variable for the library path which is
already LIB_INSTALL_DIR.
2012-10-20 02:56:35 +03:00
Carlos Martín Nieto
a75770febc tests: add a test for tag autofollow behaviour
Also tell ctest and valgrind to run libgit2_clar with '-iall' so we
run the network tests in travis.
2012-10-11 00:19:54 +02:00
Carlos Martín Nieto
3ce22c7485 http: use WinHTTP on Windows
Wondows has its own HTTP library. Use that one when possible instead of
our own.

As we don't depend on them anymore, remove the http-parser library from
the Windows build, as well as the search for OpenSSL.
2012-09-14 02:13:30 +02:00
Ignacio Casal Quinteiro
b3237ac313 Add support for the more standard LIB_INSTALL_DIR variable 2012-07-13 17:14:08 +02:00
Chris Young
abd6d52c72 revert defaults 2012-06-20 19:27:17 +01:00