mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dj/runtime-prefix'

Browse Source 
A build-time option has been added to allow Git to be told to refer
to its associated files relative to the main binary, in the same
way that has been possible on Windows for quite some time, for
Linux, BSDs and Darwin.

* dj/runtime-prefix:
  Makefile: quote $INSTLIBDIR when passing it to sed
  Makefile: remove unused @@PERLLIBDIR@@ substitution variable
  mingw/msvc: use the new-style RUNTIME_PREFIX helper
  exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows
  exec_cmd: RUNTIME_PREFIX on some POSIX systems
  Makefile: add Perl runtime prefix support
  Makefile: generate Perl header from template file
This commit is contained in:
Junio C Hamano
2018-05-08 15:59:17 +09:00
parent c988f6425a 64f982b8a7
commit 92034a9cd5
14 changed files with 412 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl/Git/I18N.pm
View File

@ -18,7 +18,7 @@ our @EXPORT_OK = @EXPORT;
sub __bootstrap_locale_messages {
our $TEXTDOMAIN = 'git';
our $TEXTDOMAINDIR = $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
require POSIX;
POSIX->import(qw(setlocale));

1
perl/header_templates/fixed_prefix.template.pl Normal file
View File

@ -0,0 +1 @@
use lib (split(/@@PATHSEP@@/, $ENV{GITPERLLIB} || '@@INSTLIBDIR@@'));

42
perl/header_templates/runtime_prefix.template.pl Normal file
View File

@ -0,0 +1,42 @@
# BEGIN RUNTIME_PREFIX generated code.
#
# This finds our Git::* libraries relative to the script's runtime path.
sub __git_system_path {
my ($relpath) = @_;
my $gitexecdir_relative = '@@GITEXECDIR_REL@@';
# GIT_EXEC_PATH is supplied by `git` or the test suite.
my $exec_path;
if (exists $ENV{GIT_EXEC_PATH}) {
$exec_path = $ENV{GIT_EXEC_PATH};
} else {
# This can happen if this script is being directly invoked instead of run
# by "git".
require FindBin;
$exec_path = $FindBin::Bin;
}
# Trim off the relative gitexecdir path to get the system path.
(my $prefix = $exec_path) =~ s/\Q$gitexecdir_relative\E$//;
require File::Spec;
return File::Spec->catdir($prefix, $relpath);
}
BEGIN {
use lib split /@@PATHSEP@@/,
(
$ENV{GITPERLLIB} ||
do {
my $perllibdir = __git_system_path('@@PERLLIBDIR_REL@@');
(-e $perllibdir) || die("Invalid system path ($relpath): $path");
$perllibdir;
}
);
# Export the system locale directory to the I18N module. The locale directory
# is only installed if NO_GETTEXT is set.
$Git::I18N::TEXTDOMAINDIR = __git_system_path('@@LOCALEDIR_REL@@');
}
# END RUNTIME_PREFIX generated code.