Commit Graph

215 Commits

Author SHA1 Message Date
Jamie Couture
6419c9b57c Makefile: add tag target to generate ctags
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
2012-10-08 23:40:23 +02:00
Lars Hjemli
7996157f14 Merge branch 'stable' 2012-03-18 10:19:59 +00:00
Lars Hjemli
e032761a5e CGIT-0.9.0.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2012-03-18 10:16:27 +00:00
Lars Hjemli
aa25ff3c8b Merge branch 'stable' 2012-01-03 16:48:22 +00:00
Lars Hjemli
fbd254d54e Makefile: fetch git tarballs from http://hjemli.net/git/git/
The git tarballs are currently not available from kernel.org, so for now
the makefile will download autogenerated tarballs from cgit.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2012-01-03 16:43:33 +00:00
Lars Hjemli
bf8c7a4c93 Merge branch 'stable' 2011-07-21 14:27:03 +00:00
Lars Hjemli
654ebb55d4 CGIT 0.9.0.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-07-21 14:24:10 +00:00
Ferry Huberts
96f05018c9 Makefile: fix oversight of not using $(DESTDIR) in uninstall
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-07-19 07:15:26 +00:00
Lars Hjemli
9782752223 CGIT 0.9.0.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-06-13 12:37:04 +00:00
Lars Hjemli
cc59ee5026 CGIT 0.9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-03-05 14:23:12 +01:00
Lars Hjemli
1b09cbd303 Merge branch 'stable' 2011-03-05 14:01:59 +01:00
Lars Hjemli
9e849950dc CGIT 0.8.3.5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-03-05 13:52:39 +01:00
Lukas Fleischer
7c2dea0367 Makefile: Make make get-git work under OpenBSD.
OpenBSD tar(1) defaults to read from "/dev/rst0" when not specifying an
filename and thus fails to extract the Git sourcecode when not passing
stdin as input file descriptor explicitly.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-02-19 14:13:08 +01:00
Lars Hjemli
e66a16cebc Merge branch 'lh/improve-range-search'
* lh/improve-range-search:
  html.c: use '+' to escape spaces in urls
  ui-log.c: improve handling of range-search argument
  Add vector utility functions
2011-02-19 14:00:59 +01:00
Lars Hjemli
286c4c0a1d Use GIT-1.7.4
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-02-19 13:55:43 +01:00
Lars Hjemli
7618cac1ee Merge branch 'tz/make-improvements' 2010-11-10 00:28:56 +01:00
Lars Hjemli
958a95b378 Add vector utility functions
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-10 00:22:41 +01:00
Lars Hjemli
53f487dd71 Makefile: avoid spurious rebuilds of git sources due to sudo make
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-10 00:20:50 +01:00
Lars Hjemli
5807fb79fa Makefile: add -MP option
Work around errors `make` gives when header files are removed without
the Makefile being updated.

Signed-off-by: Lynn Lin <Lynn.Lin@emc.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-07 16:13:49 +01:00
Lars Hjemli
d41b2ddcb3 Merge branch 'stable'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-27 08:20:42 +02:00
Lars Hjemli
af492114cc CGIT 0.8.3.4
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-27 08:00:47 +02:00
Lars Hjemli
82a883ede7 Use GIT-1.7.3
This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542.

Noticed-by: Silvio Cesare <silvio.cesare@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-27 07:58:13 +02:00
Todd Zullinger
6d10c13058 Install filter scripts
The syntax-highlighting.sh script is quite useful without any changes.
Installing it by default makes it easier to use and package.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19 19:11:45 +02:00
Todd Zullinger
0c3130de96 Add Makefile targets to install/uninstall docs
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19 19:11:45 +02:00
Todd Zullinger
679f7ef4f3 Generalize doc generation
This borrows from the git Documentation/Makefile.  The goal is to make
it easier to add new man pages and other documentation as well as to
prevent make from re-generating the documentation needlessly.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19 19:11:45 +02:00
Lars Hjemli
a9d6e6e695 Merge branch 'ml/bugfix' 2010-09-19 19:00:05 +02:00
Lars Hjemli
857696dd3d Use GIT-1.7.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19 14:00:57 +02:00
Mark Lodato
e4ddc8f72b fix errors in printf-style format strings
There were many places where the arguments to a printf-like function did
not match the format string.  Mostly, these were a missing 'l' flag, but
there were three exceptions:

- In ui-stats.c, a size_t argument must be printed.  C99 has the "%zu"
  flag for this purpose, but not all compilers support this.  Therefore,
  we mimic what git does - use a NO_C99_FORMAT Makefile variable.

- In ui-stats.c, cgit_print_error() was called with a pointer instead of
  a character.

- In ui-log.c, the "columns" argument was never used.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-09-04 11:35:38 -04:00
Lars Hjemli
6d7552bc07 Use GIT-1.7.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-08-22 13:29:57 +02:00
Lars Hjemli
6a8f65bf18 Merge branch 'stable' 2010-08-03 22:52:11 +02:00
Lars Hjemli
15c64c5e47 CGIT 0.8.3.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-08-03 22:50:02 +02:00
Lynn Lin
ab61029201 Makefile: do not include dependency-file on make clean
When envoking clean target, make should not perform the dependency file
generation triggered by include.
2010-07-22 23:32:06 +02:00
Lars Hjemli
c8bc3fc04c Merge branch 'stable' 2010-06-19 11:52:42 +02:00
Lars Hjemli
f072bc55b0 CGIT 0.8.3.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-06-19 11:50:58 +02:00
Lars Hjemli
c151ce61d8 Use GIT-1.7.0
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-02-27 13:39:53 +01:00
Lars Hjemli
547a64fbd6 Merge branch 'stable' 2009-12-12 12:09:47 +01:00
Lars Hjemli
c86e206a97 CGIT 0.8.3.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-12-12 12:08:14 +01:00
Lars Hjemli
f4f6210b4f Merge branch 'ro/ssdiff' 2009-12-08 19:32:48 +01:00
Mikhail Gusarov
59310ab102 Add NO_OPENSSL option
Linking with OpenSSL is not always desirable. Add NO_OPENSSL option
to use SHA-1 code bundled with Git.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2009-11-07 16:23:19 +01:00
Ragnar Ouchterlony
40e174d536 First version of side-by-side diff.
This constitutes the first prototype of a side-by-side diff. It is not
possible to switch between unidiff and side-by-side diff at all at this
stage.

Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-16 20:17:56 +02:00
Lars Hjemli
27479ac54c CGIT 0.8.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-13 22:17:02 +02:00
Lars Hjemli
33998c51be Merge branch 'stable' 2009-09-13 22:15:38 +02:00
Lars Hjemli
f92ca06e4b CGIT 0.8.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-13 22:14:12 +02:00
Lars Hjemli
45c49d6cf4 Use GIT-1.6.4.3
Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
2009-09-13 21:56:45 +02:00
Lars Hjemli
ff0ff807a3 Use GIT-1.6.3.4
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-08-16 20:53:20 +02:00
Lars Hjemli
45e7fcecc1 Merge branch 'stable' 2009-03-15 09:32:46 +01:00
Lars Hjemli
fdd559abd6 CGIT 0.8.2.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-03-15 09:31:05 +01:00
Lars Hjemli
290c2a752f Fix doc-related glitches in Makefile and .gitignore
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-03-15 09:27:54 +01:00
Lars Hjemli
5e57cb24fc Makefile: add doc-related targets
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12 10:53:31 +01:00
Lars Hjemli
8cc0287123 CGIT 0.8.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01 19:31:37 +01:00
Lars Hjemli
8cbbb64481 Use GIT-1.6.1.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01 19:30:16 +01:00
Lars Hjemli
a61871a18f Merge branch 'stable' 2009-01-27 23:03:05 +01:00
Lars Hjemli
ba75f6613e CGIT 0.8.1.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:35:49 +01:00
Lars Hjemli
7710178e45 Merge branch 'lh/stats'
Conflicts:
	cgit.c
	cgit.css
	cgit.h
	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:16:37 +01:00
Lars Hjemli
e78186dcb6 Merge branch 'stable' 2009-01-12 08:57:23 +01:00
Todd Zullinger
d529c6fbdc Makefile: install cgit.{css,png} in CGIT_DATA_PATH
CGIT_DATA_PATH defaults to CGIT_SCRIPT_PATH, but allows users to
install the cgi and the data files in different locations.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:56:54 +01:00
Todd Zullinger
4ac89ec8b4 Makefile: add INSTALL var to set install command
This also explicitly sets the modes for installed files (755 for the
.cgi, 644 for the .css and .png).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:22:24 +01:00
Lars Hjemli
d1c48e5139 Merge branch 'stable' 2009-01-11 12:18:25 +01:00
Lars Hjemli
c63aaff2ad Makefile: avoid libcurl when building git
We don't need support for fetching/pushing in libgit.a, hence we don't need
to link with libcurl.

Noticed-by: Robin Redeker <elmex@ta-sa.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-10 15:18:18 +01:00
Lars Hjemli
06de14d0fd Use GIT-1.6.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-26 11:03:01 +01:00
Lars Hjemli
f86a23ff53 Add a 'stats' page to each repo
This new page, which is disabled by default, can be used to print some
statistics about the number of commits per period in the repository,
where period can be either weeks, months, quarters or years.

The function can be activated globally by setting 'enable-stats=1' in
cgitrc and disabled for individual repos by setting 'repo.enable-stats=0'.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-06 17:38:19 +01:00
Lars Hjemli
a5e899e4c7 Makefile: allow cgit.conf to override platform-specific tweaks
If the makefile doesn't automatically define the correct build variables
it is nice to be able to define them explicitly.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-05 18:47:16 +01:00
Ramsay Jones
97fdac1608 Extra cygwin-specific changes
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-03 23:39:30 +01:00
Karl Chen
5b27248301 Use mode 0644 for non-executable files
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 20:46:44 +01:00
Lars Hjemli
a918c068a6 Use GIT-1.6.0.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 19:17:57 +01:00
Lars Hjemli
140012d7a8 CGIT 0.8.1 2008-10-11 20:22:57 +02:00
Lars Hjemli
efaccb3d6a Makefile: enable compilation on uclibc
Original-patch-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-11 20:21:06 +02:00
Lars Hjemli
ae83752b41 CGIT 0.8 2008-10-05 21:23:39 +02:00
Lars Hjemli
b7f33786ef Use GIT-1.6.0.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 19:19:59 +02:00
Harley Laue
06e14dc61c Add LDFLAGS to makefile.
This will allow for creating static builds which is useful for chrooted
environments.

Signed-off-by: Harley Laue <losinggeneration@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-20 13:47:58 +02:00
Lars Hjemli
93397a765b Add support for --scan-tree=<path> option to cgit
This option makes cgit scan a directory tree looking for git repositories,
generating suitable definitions for a cgitrc file on stdout.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-15 23:35:27 +02:00
Lars Hjemli
b28765135d Update Makefile to use GIT-1.6.0.1
When updating the git submodule to 1.6.0.1 (and 1.6.0), the Makefile was
left behind. This fixes it.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-03 00:18:09 +02:00
Lars Hjemli
d532c4d161 Merge branch 'lh/plain'
* lh/plain:
  Supply status description to html_status()
  ui-tree: link to plain view instead of blob view
  Implement plain view
2008-09-01 22:40:55 +02:00
Lars Hjemli
288d502b3d Merge branch 'lh/clone'
* lh/clone:
  Add support for cloning over http

Conflicts:
	cmd.c
2008-09-01 22:40:24 +02:00
Lars Hjemli
7fa088e99a Use GIT-1.6.0.rc1
Now that rc1 is released as a tarball `make get-git` should start working
again.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 22:34:20 +02:00
Lars Hjemli
8c2a1367c4 Makefile: Git dependency, take 3
In commit a1266edfe the build instructions for the git libs where moved
to their real targets, which in turn depended on the phony target `git`.
But since `git` is an actual directory in cgit the git libs wouldn't be
recompiled when needed.

So with this patch (third time lucky), cgit is declared to depend on the
really phony target `libgit` and the build instructions for `libgit` is
to unconditionally rebuild git/libgit.a and git/xdiff/lib.a.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 18:52:27 +02:00
Lars Hjemli
e5da4bca54 Implement plain view
This implements a way to access plain blobs by path (similar to the
tree view) instead of by sha1.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 11:21:30 +02:00
Lars Hjemli
02a545e634 Add support for cloning over http
This patch implements basic support for cloning over http, based on the
work on git-http-backend by Shawn O. Pearce.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 11:21:09 +02:00
Lars Hjemli
b2a3d31e88 Add atom-support
This enables a page which generates atom feeds for the current branch and
path, heavily inspired by the atom-support in gitweb.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-01 22:12:34 +02:00
Lars Hjemli
a1266edfe6 Makefile: another take on git dependency rules
When building cgit we depend on xdiff/lib.a and libgit.a in the git
directory, but the previous attempt on describing this dependency
failed since the build instructions for the libs was placed under the
phony `git` target.

This patch fixes the issue by moving the build instructions to their
real targets. It also makes it clear that only the `cgit` target
depends on the git binaries (since they're only used during linking).

And while at it, the patch also cleans up the list of phony targets.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-01 02:04:41 +02:00
Lars Hjemli
50989d3b47 Makefile: remove the distclean and emptycache targets
The `distclean` was hardly useful while the `emptycache` was actively harmful.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-07-22 20:06:16 +02:00
Lars Hjemli
a75968df10 Makefile: do not touch the git objects with make clean
I've been avoiding `make clean` for a long time due to its eagerness to kill
all the git objectfiles.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-07-22 19:58:37 +02:00
Lars Hjemli
bb7485e8d7 Makefile: fix git dependency rules
The objectfiles depends unconditionally on some specific git binaries while
those git binaries depends on the phony `git` target and this patch seems to
get these dependencies spelled out correctly.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-07-22 19:42:06 +02:00
Lars Hjemli
833b0d2732 Use GIT-1.5.6 2008-06-25 17:39:25 +02:00
Lars Hjemli
c3de425acb Use GIT-1.5.5.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-05-18 21:40:28 +02:00
Lars Hjemli
4a84228826 Use GIT-1.5.5 2008-04-09 18:06:26 +02:00
Lars Hjemli
23296ad648 Merge branch 'lh/cleanup'
* lh/cleanup: (21 commits)
  Reset ctx.repo to NULL when the config parser is finished
  Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
  Move function for configfile parsing into configfile.[ch]
  Add cache.h
  Remove global and obsolete cgit_cmd
  Makefile: copy the QUIET constructs from the Makefile in git.git
  Move cgit_version from shared.c to cgit.c
  Makefile: autobuild dependency rules
  Initial Makefile cleanup
  Move non-generic functions from shared.c to cgit.c
  Add ui-shared.h
  Add separate header-files for each page/view
  Refactor snapshot support
  Add command dispatcher
  Remove obsolete cacheitem parameter to ui-functions
  Add struct cgit_page to cgit_context
  Introduce html.h
  Improve initialization of git directory
  Move cgit_repo into cgit_context
  Add all config variables into struct cgit_context
  ...
2008-04-08 21:29:21 +02:00
Lars Hjemli
20a33548b9 Move function for configfile parsing into configfile.[ch]
This is a generic function which wanted its own little object file.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-28 00:09:11 +01:00
Lars Hjemli
c60781d677 Makefile: copy the QUIET constructs from the Makefile in git.git
These constructs were introduced by Shawn O. Pearce in commit
74f2b2a8d006a49e1be7e30731c2f7365d2741d1.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-25 01:41:10 +01:00
Lars Hjemli
92908af455 Move cgit_version from shared.c to cgit.c
With the matching Makefile change, this makes sure that only cgit.o and cgit
proper needs to be rebuildt when VERSION has been modified.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-24 23:27:16 +01:00
Lars Hjemli
df90b51baf Makefile: autobuild dependency rules
This uses gcc to generate dependency rules for each `.o` file, based on the
corresponding `.c` file, into a new set of `.d` files (which are also defined
to depend on the same set of source files as their `.o` files).

Result:
* all objectfile dependencies are correctly calculated
* only the necessary dependencies are recalculated when a sourcefile is updated

Inspiration for the build rules:
* http://www.gnu.org/software/make/manual/make.html#Automatic-Prerequisites
* http://make.paulandlesley.org/autodep.html

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-24 23:27:12 +01:00
Lars Hjemli
271818693d Initial Makefile cleanup
Sort the list of object files to improve readability/mergeability and remove
manual dependency information which will soon be generated automatically.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-24 23:16:30 +01:00
Lars Hjemli
e0e4478e7b Add command dispatcher
This simplifies the code in cgit.c and makes it easier to extend cgit with
new pages/commands.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-03-24 01:43:48 +01:00
Lars Hjemli
cb41af16d9 Use GIT-1.5.5.rc1 2008-03-23 11:36:38 +01:00
Lars Hjemli
0537a7d1cf Use GIT-1.5.4.4 2008-03-17 23:01:25 +01:00
Lars Hjemli
e5ed227ef0 Use GIT-1.5.4.1 2008-02-16 11:28:16 +01:00
Lars Hjemli
2106c96ca0 Use GIT-1.5.4 2008-02-02 08:55:09 +01:00
Lars Hjemli
ac195ce710 Use GIT-1.5.4.rc5 2008-01-28 21:18:28 +01:00
Lars Hjemli
776200b1c1 Use GIT-1.5.4.rc4 2008-01-21 08:52:09 +01:00
Lars Hjemli
2122c696a3 Merge branch 'stable'
* stable:
  CGIT 0.7.2
  Use GIT-1.5.3.8
  Compare string lengths when parsing the snapshot mask
  Default repo description to "[no description]"
2008-01-13 18:34:37 +01:00