Merge branch 'ps/build'
Build procedure update plus introduction of Meson based builds. * ps/build: (24 commits) Introduce support for the Meson build system Documentation: add comparison of build systems t: allow overriding build dir t: better support for out-of-tree builds Documentation: extract script to generate a list of mergetools Documentation: teach "cmd-list.perl" about out-of-tree builds Documentation: allow sourcing generated includes from separate dir Makefile: simplify building of templates Makefile: write absolute program path into bin-wrappers Makefile: allow "bin-wrappers/" directory to exist Makefile: refactor generators to be PWD-independent Makefile: extract script to generate gitweb.js Makefile: extract script to generate gitweb.cgi Makefile: extract script to massage Python scripts Makefile: extract script to massage Shell scripts Makefile: use "generate-perl.sh" to massage Perl library Makefile: extract script to massage Perl scripts Makefile: consistently use PERL_PATH Makefile: generate doc versions via GIT-VERSION-GEN Makefile: generate "git.rc" via GIT-VERSION-GEN ...
This commit is contained in:
@ -35,7 +35,7 @@ BEGIN {
|
||||
CGI->compile() if $ENV{'MOD_PERL'};
|
||||
}
|
||||
|
||||
our $version = "++GIT_VERSION++";
|
||||
our $version = "@GIT_VERSION@";
|
||||
|
||||
our ($my_url, $my_uri, $base_url, $path_info, $home_link);
|
||||
sub evaluate_uri {
|
||||
@ -80,46 +80,46 @@ sub evaluate_uri {
|
||||
|
||||
# core git executable to use
|
||||
# this can just be "git" if your webserver has a sensible PATH
|
||||
our $GIT = "++GIT_BINDIR++/git";
|
||||
our $GIT = "@GIT_BINDIR@/git";
|
||||
|
||||
# absolute fs-path which will be prepended to the project path
|
||||
#our $projectroot = "/pub/scm";
|
||||
our $projectroot = "++GITWEB_PROJECTROOT++";
|
||||
our $projectroot = "@GITWEB_PROJECTROOT@";
|
||||
|
||||
# fs traversing limit for getting project list
|
||||
# the number is relative to the projectroot
|
||||
our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++";
|
||||
our $project_maxdepth = @GITWEB_PROJECT_MAXDEPTH@;
|
||||
|
||||
# string of the home link on top of all pages
|
||||
our $home_link_str = "++GITWEB_HOME_LINK_STR++";
|
||||
our $home_link_str = "@GITWEB_HOME_LINK_STR@";
|
||||
|
||||
# extra breadcrumbs preceding the home link
|
||||
our @extra_breadcrumbs = ();
|
||||
|
||||
# name of your site or organization to appear in page titles
|
||||
# replace this with something more descriptive for clearer bookmarks
|
||||
our $site_name = "++GITWEB_SITENAME++"
|
||||
our $site_name = "@GITWEB_SITENAME@"
|
||||
|| ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
|
||||
|
||||
# html snippet to include in the <head> section of each page
|
||||
our $site_html_head_string = "++GITWEB_SITE_HTML_HEAD_STRING++";
|
||||
our $site_html_head_string = "@GITWEB_SITE_HTML_HEAD_STRING@";
|
||||
# filename of html text to include at top of each page
|
||||
our $site_header = "++GITWEB_SITE_HEADER++";
|
||||
our $site_header = "@GITWEB_SITE_HEADER@";
|
||||
# html text to include at home page
|
||||
our $home_text = "++GITWEB_HOMETEXT++";
|
||||
our $home_text = "@GITWEB_HOMETEXT@";
|
||||
# filename of html text to include at bottom of each page
|
||||
our $site_footer = "++GITWEB_SITE_FOOTER++";
|
||||
our $site_footer = "@GITWEB_SITE_FOOTER@";
|
||||
|
||||
# URI of stylesheets
|
||||
our @stylesheets = ("++GITWEB_CSS++");
|
||||
our @stylesheets = ("@GITWEB_CSS@");
|
||||
# URI of a single stylesheet, which can be overridden in GITWEB_CONFIG.
|
||||
our $stylesheet = undef;
|
||||
# URI of GIT logo (72x27 size)
|
||||
our $logo = "++GITWEB_LOGO++";
|
||||
our $logo = "@GITWEB_LOGO@";
|
||||
# URI of GIT favicon, assumed to be image/png type
|
||||
our $favicon = "++GITWEB_FAVICON++";
|
||||
our $favicon = "@GITWEB_FAVICON@";
|
||||
# URI of gitweb.js (JavaScript code for gitweb)
|
||||
our $javascript = "++GITWEB_JS++";
|
||||
our $javascript = "@GITWEB_JS@";
|
||||
|
||||
# URI and label (title) of GIT logo link
|
||||
#our $logo_url = "https://www.kernel.org/pub/software/scm/git/docs/";
|
||||
@ -128,7 +128,7 @@ our $logo_url = "https://git-scm.com/";
|
||||
our $logo_label = "git homepage";
|
||||
|
||||
# source of projects list
|
||||
our $projects_list = "++GITWEB_LIST++";
|
||||
our $projects_list = "@GITWEB_LIST@";
|
||||
|
||||
# the width (in characters) of the projects list "Description" column
|
||||
our $projects_list_description_width = 25;
|
||||
@ -147,7 +147,7 @@ our $default_projects_order = "project";
|
||||
|
||||
# show repository only if this file exists
|
||||
# (only effective if this variable evaluates to true)
|
||||
our $export_ok = "++GITWEB_EXPORT_OK++";
|
||||
our $export_ok = "@GITWEB_EXPORT_OK@";
|
||||
|
||||
# don't generate age column on the projects list page
|
||||
our $omit_age_column = 0;
|
||||
@ -161,11 +161,11 @@ our $omit_owner=0;
|
||||
our $export_auth_hook = undef;
|
||||
|
||||
# only allow viewing of repositories also shown on the overview page
|
||||
our $strict_export = "++GITWEB_STRICT_EXPORT++";
|
||||
our $strict_export = "@GITWEB_STRICT_EXPORT@";
|
||||
|
||||
# list of git base URLs used for URL to where fetch project from,
|
||||
# i.e. full URL is "$git_base_url/$project"
|
||||
our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
|
||||
our @git_base_url_list = grep { $_ ne '' } ("@GITWEB_BASE_URL@");
|
||||
|
||||
# default blob_plain mimetype and default charset for text/plain blob
|
||||
our $default_blob_plain_mimetype = 'text/plain';
|
||||
@ -200,7 +200,7 @@ our $prevent_xss = 0;
|
||||
# http://andre-simon.de/zip/download.php due to assumptions about parameters and output).
|
||||
# Useful if highlight is not installed on your webserver's PATH.
|
||||
# [Default: highlight]
|
||||
our $highlight_bin = "++HIGHLIGHT_BIN++";
|
||||
our $highlight_bin = "@HIGHLIGHT_BIN@";
|
||||
|
||||
# information about snapshot formats that gitweb is capable of serving
|
||||
our %known_snapshot_formats = (
|
||||
@ -741,9 +741,9 @@ sub read_config_file {
|
||||
|
||||
our ($GITWEB_CONFIG, $GITWEB_CONFIG_SYSTEM, $GITWEB_CONFIG_COMMON);
|
||||
sub evaluate_gitweb_config {
|
||||
our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
|
||||
our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
|
||||
our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++";
|
||||
our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@GITWEB_CONFIG@";
|
||||
our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "@GITWEB_CONFIG_SYSTEM@";
|
||||
our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "@GITWEB_CONFIG_COMMON@";
|
||||
|
||||
# Protect against duplications of file names, to not read config twice.
|
||||
# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so
|
||||
|
Reference in New Issue
Block a user