Skip to content

Commit 8b773ae

Browse files
committed
git: split out the Perforce helper into a separate package
This is the only Python script in Git, so after splitting it into its own package, `mingw-w64-git` can stop depending on `python`. Technically, this new package should be a dependency of `mingw-w64-git-for-windows-addons` so that the `git-p4` script is included in Git for Windows again. However, while that script had been included, it was not functional because no Python interpreter is distributed with Git for Windows. So it's better to omit it. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4df59f5 commit 8b773ae

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

mingw-w64-git/PKGBUILD

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
1313
"${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
1414
"${MINGW_PACKAGE_PREFIX}-${_realname}-archimport"
1515
"${MINGW_PACKAGE_PREFIX}-${_realname}-cvs"
16+
"${MINGW_PACKAGE_PREFIX}-${_realname}-p4"
1617
"${MINGW_PACKAGE_PREFIX}-gitk"
1718
"${MINGW_PACKAGE_PREFIX}-${_realname}-gui"
1819
"${MINGW_PACKAGE_PREFIX}-${_realname}-for-windows-addons")
@@ -203,6 +204,9 @@ package_git () {
203204
rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-citool"
204205
rm -rf "$pkgdir/$MINGW_PREFIX/share/git-gui"
205206

207+
# Remove git-p4 (packaged separately)
208+
rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-p4"
209+
206210
# completions
207211
install -d "$pkgdir$SHAREDIR/completion/"
208212
install contrib/completion/* "$pkgdir$SHAREDIR/completion/"
@@ -241,6 +245,10 @@ package_git-doc-html () {
241245
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitcvs-migration.adoc
242246
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitcvs-migration.html
243247

248+
# Remove git-p4 documentation (packaged separately)
249+
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"git-p4.adoc
250+
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"git-p4.html
251+
244252
# Remove gitk and git-gui documentation (packaged separately)
245253
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitk.adoc
246254
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitk.html
@@ -272,6 +280,9 @@ package_git-doc-man () {
272280
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-cvsserver.1"
273281
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man7/gitcvs-migration.7"
274282

283+
# Remove git-p4 documentation (packaged separately)
284+
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-p4.1"
285+
275286
# Remove gitk and git-gui documentation (packaged separately)
276287
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/gitk.1"
277288
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-gui.1"
@@ -468,6 +479,24 @@ package_git-gui () {
468479
install -m644 Documentation/git-gui.html "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
469480
}
470481

482+
package_git-p4 () {
483+
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
484+
"python")
485+
pkgdesc="Perforce support for Git (mingw-w64)"
486+
487+
cd "$srcdir"/git
488+
489+
install -d -m755 "$pkgdir/$MINGW_PREFIX/libexec/git-core"
490+
install -m755 git-p4 "$pkgdir/$MINGW_PREFIX/libexec/git-core/"
491+
492+
# Install documentation
493+
install -d -m755 "$pkgdir/$MINGW_PREFIX/share/man/man1"
494+
install -m644 Documentation/git-p4.1 "$pkgdir/$MINGW_PREFIX/share/man/man1/"
495+
install -d -m755 "$pkgdir/$MINGW_PREFIX/share/doc/git-doc"
496+
install -m644 Documentation/git-p4.adoc "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
497+
install -m644 Documentation/git-p4.html "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
498+
}
499+
471500
package_git-for-windows-addons () {
472501
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
473502
"${MINGW_PACKAGE_PREFIX}-${_realname}-subtree"

0 commit comments

Comments
 (0)