Small tweak for WRKDIST handling in GH_* case

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Small tweak for WRKDIST handling in GH_* case

Vadim Zhukov
Hello all, especially those who worked on GH_* stuff already. :)

This small tweak for bsd.port.mk makes WRKDIST handling more close
to upstream (i.e., Github) handling. It allows to shave a line in
existing port (www/linkchecker) and also helps in my ongoing work
on devel/intellij port. I see no other GH_TAGNAME with slash
mentions in tree.

Unfortunately, this won't help another port I've sent recently
(adobe-fonts reimport proposal), as the situation is much more
complex there.

Okay?
--
WBR,
  Vadim Zhulkov


Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1297
diff -u -p -r1.1297 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 11 Jun 2015 09:26:01 -0000 1.1297
+++ infrastructure/mk/bsd.port.mk 15 Aug 2015 09:55:49 -0000
@@ -777,7 +777,7 @@ GH_ACCOUNT ?=
 GH_PROJECT ?=
 
 .if !empty(GH_TAGNAME)
-WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
+WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C,^v,,:C,/,-,g}
 .elif !empty(GH_COMMIT)
 WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
 .else
Index: www/linkchecker/Makefile
===================================================================
RCS file: /cvs/ports/www/linkchecker/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- www/linkchecker/Makefile 8 Apr 2015 07:51:54 -0000 1.44
+++ www/linkchecker/Makefile 15 Aug 2015 09:55:49 -0000
@@ -37,7 +37,6 @@ RUN_DEPENDS-x11= devel/desktop-file-util
 SEPARATE_BUILD= Yes
 MULTI_PACKAGES= -main -x11
 
-WRKDIST= ${WRKDIR}/${GH_PROJECT}-upstream-${V}
 NO_TEST= Yes
 
 post-extract:

Reply | Threaded
Open this post in threaded view
|

Re: Small tweak for WRKDIST handling in GH_* case

Nigel Taylor-2
On 08/15/15 11:03, Vadim Zhukov wrote:

> Hello all, especially those who worked on GH_* stuff already. :)
>
> This small tweak for bsd.port.mk makes WRKDIST handling more close
> to upstream (i.e., Github) handling. It allows to shave a line in
> existing port (www/linkchecker) and also helps in my ongoing work
> on devel/intellij port. I see no other GH_TAGNAME with slash
> mentions in tree.
>
> Unfortunately, this won't help another port I've sent recently
> (adobe-fonts reimport proposal), as the situation is much more
> complex there.
>
> Okay?
> --
> WBR,
>   Vadim Zhulkov
>
>
> Index: infrastructure/mk/bsd.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1297
> diff -u -p -r1.1297 bsd.port.mk
> --- infrastructure/mk/bsd.port.mk 11 Jun 2015 09:26:01 -0000 1.1297
> +++ infrastructure/mk/bsd.port.mk 15 Aug 2015 09:55:49 -0000
> @@ -777,7 +777,7 @@ GH_ACCOUNT ?=
>  GH_PROJECT ?=
>  
>  .if !empty(GH_TAGNAME)
> -WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
> +WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C,^v,,:C,/,-,g}
>  .elif !empty(GH_COMMIT)
>  WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
>  .else
> Index: www/linkchecker/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/linkchecker/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- www/linkchecker/Makefile 8 Apr 2015 07:51:54 -0000 1.44
> +++ www/linkchecker/Makefile 15 Aug 2015 09:55:49 -0000
> @@ -37,7 +37,6 @@ RUN_DEPENDS-x11= devel/desktop-file-util
>  SEPARATE_BUILD= Yes
>  MULTI_PACKAGES= -main -x11
>  
> -WRKDIST= ${WRKDIR}/${GH_PROJECT}-upstream-${V}
>  NO_TEST= Yes
>  
>  post-extract:
>
>

This is to cope with a github project using bad tag names. The
recommendation is a version number like v1.25 adding special one off
cases is not a good idea, get upstream to fix their tagging.

https://help.github.com/articles/creating-releases/

You can fix the tagging by forking the github project, and tagging yourself.

The download for source is here, not github
https://pypi.python.org/packages/source/L/LinkChecker/LinkChecker-9.3.tar.gz
The source includes signature files found here.

https://pypi.python.org/pypi/LinkChecker/9.3


This is a listed python package.

For perl CPAN we don't use github we still get source from CPAN.
Being on github doesn't automatically mean github is the method for release.

Is there a standard way of dealing with python packages from pypi?
Haven't done much python myself.



Reply | Threaded
Open this post in threaded view
|

Re: Small tweak for WRKDIST handling in GH_* case

Stuart Henderson-6
On 2015/08/15 12:57, Nigel Taylor wrote:

>
> The download for source is here, not github
> https://pypi.python.org/packages/source/L/LinkChecker/LinkChecker-9.3.tar.gz
> The source includes signature files found here.
>
> https://pypi.python.org/pypi/LinkChecker/9.3
>
>
> This is a listed python package.
>
> For perl CPAN we don't use github we still get source from CPAN.
> Being on github doesn't automatically mean github is the method for release.
>
> Is there a standard way of dealing with python packages from pypi?
> Haven't done much python myself.

These days it's MODPY_PI=Yes, and I think that is a much better distfile
source than github.

Reply | Threaded
Open this post in threaded view
|

Re: Small tweak for WRKDIST handling in GH_* case

Vadim Zhukov
In reply to this post by Nigel Taylor-2
15 авг. 2015 г. 14:57 пользователь "Nigel Taylor"
<[hidden email]> написал:

>
> On 08/15/15 11:03, Vadim Zhukov wrote:
> > Hello all, especially those who worked on GH_* stuff already. :)
> >
> > This small tweak for bsd.port.mk makes WRKDIST handling more close
> > to upstream (i.e., Github) handling. It allows to shave a line in
> > existing port (www/linkchecker) and also helps in my ongoing work
> > on devel/intellij port. I see no other GH_TAGNAME with slash
> > mentions in tree.
> >
> > Unfortunately, this won't help another port I've sent recently
> > (adobe-fonts reimport proposal), as the situation is much more
> > complex there.
> >
> > Okay?
> > --
> > WBR,
> >   Vadim Zhulkov
> >
> >
> > Index: infrastructure/mk/bsd.port.mk
> > ===================================================================
> > RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> > retrieving revision 1.1297
> > diff -u -p -r1.1297 bsd.port.mk
> > --- infrastructure/mk/bsd.port.mk     11 Jun 2015 09:26:01 -0000      1.1297
> > +++ infrastructure/mk/bsd.port.mk     15 Aug 2015 09:55:49 -0000
> > @@ -777,7 +777,7 @@ GH_ACCOUNT ?=
> >  GH_PROJECT ?=
> >
> >  .if !empty(GH_TAGNAME)
> > -WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
> > +WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C,^v,,:C,/,-,g}
> >  .elif !empty(GH_COMMIT)
> >  WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
> >  .else
> > Index: www/linkchecker/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/linkchecker/Makefile,v
> > retrieving revision 1.44
> > diff -u -p -r1.44 Makefile
> > --- www/linkchecker/Makefile  8 Apr 2015 07:51:54 -0000       1.44
> > +++ www/linkchecker/Makefile  15 Aug 2015 09:55:49 -0000
> > @@ -37,7 +37,6 @@ RUN_DEPENDS-x11=    devel/desktop-file-util
> >  SEPARATE_BUILD=              Yes
> >  MULTI_PACKAGES=              -main -x11
> >
> > -WRKDIST=     ${WRKDIR}/${GH_PROJECT}-upstream-${V}
> >  NO_TEST=     Yes
> >
> >  post-extract:
> >
> >
>
> This is to cope with a github project using bad tag names. The
> recommendation is a version number like v1.25 adding special one off
> cases is not a good idea, get upstream to fix their tagging.

I'm afraid that's not in option for wide-spread projects, that already
rely on done or other tag naming scheme, like the Intellij IDEA I've
mentioned already. Those do Github releases like crazy, and that's the
way they're. But since the issue itself is minor, I won't insist on
this patch hard.

> https://help.github.com/articles/creating-releases/
>
> You can fix the tagging by forking the github project, and tagging yourself.

That's more work than just specifying GH_COMMIT instead of GH_TAGNAME
in a port. ;)

> The download for source is here, not github
> https://pypi.python.org/packages/source/L/LinkChecker/LinkChecker-9.3.tar.gz
> The source includes signature files found here.
>
> https://pypi.python.org/pypi/LinkChecker/9.3
>
>
> This is a listed python package.
>
> For perl CPAN we don't use github we still get source from CPAN.
> Being on github doesn't automatically mean github is the method for release.

I agree. So, please, disregard the proposed patch; and I'll look into
linkchecker's MASTER_SITES while I'm here now.

--
Vadim Zhukov

Reply | Threaded
Open this post in threaded view
|

Re: Small tweak for WRKDIST handling in GH_* case

Amit Kulkarni-5
> > This is to cope with a github project using bad tag names. The
> > recommendation is a version number like v1.25 adding special one off
> > cases is not a good idea, get upstream to fix their tagging.
>
> I'm afraid that's not in option for wide-spread projects, that already
> rely on done or other tag naming scheme, like the Intellij IDEA I've
> mentioned already. Those do Github releases like crazy, and that's the
> way they're. But since the issue itself is minor, I won't insist on
> this patch hard.
>
> > https://help.github.com/articles/creating-releases/
> >
> > You can fix the tagging by forking the github project, and tagging
> yourself.
>
> That's more work than just specifying GH_COMMIT instead of GH_TAGNAME
> in a port. ;)
>
>
This was my first conversion to GH_ tags and it was messy. I didn't realize
something is broken upstream. kirby@ helped me to get it right.

On another note, will somebody please remove me as maintainer?

thanks