On 2018/03/01 21:06, Grégoire Jadi wrote:
> Grégoire Jadi <[email protected]> writes:
>
> > Stuart Henderson <[email protected]> writes:
> >
> >> On 2018/03/01 17:36, Grégoire Jadi wrote:
> >>
> >>> I tried your port but the "-gui" SUBPACKAGE didn't work. "make plist"
> >>> includes the wrong stuff in for both SUBPACKAGE. -main had
> >>> onionshare-gui/*.py stuff and -gui didn't have onionshare/*.py.
> >>
> >> That was better before, you have duplicates between the two
> >> subpackages now.
> >
> > Ok. I guess I don't understand how PLIST works with MULTI_PACKAGES. I'll
> > check the doc again.
> >
> >>> One caveat (that I know of, there is probably more :p): I hardcoded the
> >>> name of the package in PLIST-main and PLIST-gui and used only the
> >>> version to locate the .egg-info file.
> >>>
> >>> lib/python${MODPY_VERSION}/site-packages/onionshare-${V}-py${MODPY_VERSION}.egg-info
> >>> ^^^^^^^^^^^^^^^^^
> >>
> >> Standard is to put the version number in MODPY_EGG_VERSION.
> >
> > Ok, I'll look at this.
> >
> > Thanks for the feedbacks.
>
> And here is another version in which I moved all the onionshare-gui/
> stuff from PLIST-main to PLIST-gui. I've tested both versions. Which one
> is prefered?
So that looks more like attila's which is a good thing. You lost the
update-desktop-database lines which should be present at the bottom of
the plist though.
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
Bit of a mixture of " \" and " <lots of whitespace>\" continuation
lines in the DEPENDS sections, stick to one of the other.
"MODPY_SETUPTOOLS = No" is the default so that line can be removed.
It would be simpler to change
GH_TAGNAME = v1.3
MODPY_EGG_VERSION = ${GH_TAGNAME:C/^v//}
to
GH_TAGNAME = v${MODPY_EGG_VERSION}
MODPY_EGG_VERSION = 1.3
