Skip to content

Commit 0c9df48

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 1c1add2 commit 0c9df48

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/"
@@ -245,6 +249,10 @@ package_git-doc-html () {
245249
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitcvs-migration.adoc
246250
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitcvs-migration.html
247251

252+
# Remove git-p4 documentation (packaged separately)
253+
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"git-p4.adoc
254+
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"git-p4.html
255+
248256
# Remove gitk and git-gui documentation (packaged separately)
249257
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitk.adoc
250258
rm -f "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"gitk.html
@@ -279,6 +287,9 @@ package_git-doc-man () {
279287
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-cvsserver.1"
280288
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man7/gitcvs-migration.7"
281289

290+
# Remove git-p4 documentation (packaged separately)
291+
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-p4.1"
292+
282293
# Remove gitk and git-gui documentation (packaged separately)
283294
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/gitk.1"
284295
rm -f "$pkgdir/$MINGW_PREFIX/share/man/man1/git-gui.1"
@@ -475,6 +486,24 @@ package_git-gui () {
475486
install -m644 Documentation/git-gui.html "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
476487
}
477488

489+
package_git-p4 () {
490+
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
491+
"python")
492+
pkgdesc="Perforce support for Git (mingw-w64)"
493+
494+
cd "$srcdir"/git
495+
496+
install -d -m755 "$pkgdir/$MINGW_PREFIX/libexec/git-core"
497+
install -m755 git-p4 "$pkgdir/$MINGW_PREFIX/libexec/git-core/"
498+
499+
# Install documentation
500+
install -d -m755 "$pkgdir/$MINGW_PREFIX/share/man/man1"
501+
install -m644 Documentation/git-p4.1 "$pkgdir/$MINGW_PREFIX/share/man/man1/"
502+
install -d -m755 "$pkgdir/$MINGW_PREFIX/share/doc/git-doc"
503+
install -m644 Documentation/git-p4.adoc "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
504+
install -m644 Documentation/git-p4.html "$pkgdir/$MINGW_PREFIX/share/doc/git-doc/"
505+
}
506+
478507
package_git-for-windows-addons () {
479508
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
480509
"${MINGW_PACKAGE_PREFIX}-${_realname}-subtree"

0 commit comments

Comments
 (0)