--- Martin Waitz <tali@xxxxxxxxxxxxxx> wrote:
> Generate gitweb/gitweb.cgi to reduce the need to patch gitweb.cgi by
> the end user.
> The GIT installation directory and version are already known by the
> Makefile, they can be inserted directly into gitweb.
> All other gitweb configuration parameters can now be specified
> by providing GITWEB_* variables while building GIT.
> These are described in gitweb/README.
NACK.
I don't like it. While this method works, it is too much effort
to have to run make to do this, plus it pollutes your tree.
Instead, what you can do is make gitweb.cgi read a text file
from . which has those variables defined.
This way, I can just copy gitweb.cgi into my web-server directory
and voila it works, since the variable definition file would
always be there. This way:
- no need to run make to build "gitweb.cgi" or "gitweb.pl" whatever
you call it,
- no need to pollute your tree with site defined variables,
- simple copy (cp) would install a working version, instead of
the current cp + patch with local settings method.
Luben
>
> Signed-off-by: Martin Waitz <tali@xxxxxxxxxxxxxx>
> ---
> Makefile | 25 +++++++++++++++++++++++--
> gitweb/.gitignore | 1 +
> gitweb/README | 17 +++++++++++++++++
> gitweb/{gitweb.cgi => gitweb.pl} | 15 +++++++--------
> 4 files changed, 48 insertions(+), 10 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 8349e3defacca69ae48c477ff99be527b9af3b77..bd59d6b58d1cfcaecd033f186d7c2cc537416b75 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -116,6 +116,13 @@ template_dir = $(prefix)/share/git-core/
> GIT_PYTHON_DIR = $(prefix)/share/git-core/python
> # DESTDIR=
>
> +# default configuration for gitweb
> +GITWEB_SITENAME =
> +GITWEB_PROJECTROOT = /pub/git
> +GITWEB_LIST =
> +GITWEB_HOMETEXT = indextext.html
> +GITWEB_CSS = gitweb.css
> +
> export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
>
> CC = gcc
> @@ -509,7 +516,7 @@ LIB_OBJS += $(COMPAT_OBJS)
> export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
> ### Build rules
>
> -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk
> +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
>
> all:
> $(MAKE) -C templates
> @@ -567,6 +574,20 @@ git-status: git-commit
> cp $< $@+
> mv $@+ $@
>
> +gitweb/gitweb.cgi: gitweb/gitweb.pl
> + rm -f $@ $@+
> + sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
> + -e 's|@@GIT_VERSION@@|$(GIT_VERSION)|g' \
> + -e 's|@@GIT_BINDIR@@|$(bindir)|g' \
> + -e 's|@@GITWEB_SITENAME@@|$(GITWEB_SITENAME)|g' \
> + -e 's|@@GITWEB_PROJECTROOT@@|$(GITWEB_PROJECTROOT)|g' \
> + -e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \
> + -e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \
> + -e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \
> + $< >$@+
> + chmod +x $@+
> + mv $@+ $@
> +
> git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
> rm -f $@ $@+
> sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> @@ -577,7 +598,7 @@ git-instaweb: git-instaweb.sh gitweb/git
> -e '/@@GITWEB_CGI@@/d' \
> -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
> -e '/@@GITWEB_CSS@@/d' \
> - $@.sh | sed "s|/usr/bin/git|$(bindir)/git|" > $@+
> + $@.sh > $@+
> chmod +x $@+
> mv $@+ $@
>
> diff --git a/gitweb/.gitignore b/gitweb/.gitignore
> new file mode 100644
> index 0000000000000000000000000000000000000000..e83127e3f09f8496d0cd07b8f632ff341c96fd00
> --- /dev/null
> +++ b/gitweb/.gitignore
> @@ -0,0 +1 @@
> +gitweb.cgi
> diff --git a/gitweb/README b/gitweb/README
> index 8d672762eab427f3b732626d6b3f8e05a7e8f8c9..ed939e2fb5264cce24e770272583b12372c3ab68 100644
> --- a/gitweb/README
> +++ b/gitweb/README
> @@ -5,5 +5,22 @@ The one working on:
>
> From the git version 1.4.0 gitweb is bundled with git.
>
> +
> +How to configure gitweb for your local system:
> +
> +You can specify the following configuration variables when building GIT:
> + * GITWEB_SITENAME
> + Shown in the title of all generated pages, defaults to the servers name.
> + * GITWEB_PROJECTROOT
> + The root directory for all projects shown by gitweb.
> + * GITWEB_LIST
> + points to a directory to scan for projects (defaults to project root)
> + or to a file for explicit listing of projects.
> + * GITWEB_HOMETEXT
> + points to an .html file which is included on the gitweb project
> + overview page.
> + * GITWEB_CSS
> + Points to the location where you put gitweb.css on your web server.
> +
> Any comment/question/concern to:
> Kay Sievers <kay.sievers@xxxxxxxx>
> diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.pl
> similarity index 100%
> rename from gitweb/gitweb.cgi
> rename to gitweb/gitweb.pl
> index 243a2921f849568260e848201d238b3b9fe7e1f2..8e05c335f801d4c52a9b348fa56fccfae36ce621 100755
> --- a/gitweb/gitweb.cgi
> +++ b/gitweb/gitweb.pl
> @@ -24,14 +24,14 @@ our $rss_link = "";
>
> # core git executable to use
> # this can just be "git" if your webserver has a sensible PATH
> -our $GIT = "/usr/bin/git";
> +our $GIT = "@@GIT_BINDIR@@/git";
>
> # absolute fs-path which will be prepended to the project path
> #our $projectroot = "/pub/scm";
> -our $projectroot = "/home/kay/public_html/pub/scm";
> +our $projectroot = "@@GITWEB_PROJECTROOT@@";
>
> # version of the core git binary
> -our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
> +our $git_version = "@@GIT_VERSION@@";
>
> # location for temporary files needed for diffs
> our $git_temp = "/tmp/gitweb";
> @@ -44,17 +44,16 @@ our $home_link = $my_uri;
>
> # name of your site or organization to appear in page titles
> # replace this with something more descriptive for clearer bookmarks
> -our $site_name = $ENV{'SERVER_NAME'} || "Untitled";
> +our $site_name = "@@GITWEB_SITENAME@@" || $ENV{'SERVER_NAME'} || "Untitled";
>
> # html text to include at home page
> -our $home_text = "indextext.html";
> +our $home_text = "@@GITWEB_HOMETEXT@@";
>
> # URI of default stylesheet
> -our $stylesheet = "gitweb.css";
> +our $stylesheet = "@@GITWEB_CSS@@";
>
> # source of projects list
> -#our $projects_list = $projectroot;
> -our $projects_list = "index/index.aux";
> +our $projects_list = "@@GITWEB_LIST@@" || "$projectroot";
>
> # default blob_plain mimetype and default charset for text/plain blob
> our $default_blob_plain_mimetype = 'text/plain';
> --
> 1.4.2.rc2.gf055
>
> --
> Martin Waitz
> -
> : send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html