pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg pkgtools/url2pkg: determine the depen...
details: https://anonhg.NetBSD.org/pkgsrc/rev/887c43fbb054
branches: trunk
changeset: 399890:887c43fbb054
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Aug 18 11:26:33 2019 +0000
description:
pkgtools/url2pkg: determine the dependencies of Python modules
diffstat:
pkgtools/url2pkg/Makefile | 13 +-
pkgtools/url2pkg/PLIST | 3 +-
pkgtools/url2pkg/files/MakeMaker.pm | 2 +-
pkgtools/url2pkg/files/setuptools.py | 15 +++
pkgtools/url2pkg/files/url2pkg.pl | 156 ++++++++++++++++++++++++----------
5 files changed, 136 insertions(+), 53 deletions(-)
diffs (truncated from 402 to 300 lines):
diff -r d718d0c7bb0c -r 887c43fbb054 pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Sun Aug 18 09:19:07 2019 +0000
+++ b/pkgtools/url2pkg/Makefile Sun Aug 18 11:26:33 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2019/08/18 06:23:19 maya Exp $
+# $NetBSD: Makefile,v 1.94 2019/08/18 11:26:33 rillig Exp $
-PKGNAME= url2pkg-2.31
+PKGNAME= url2pkg-2.32
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -16,7 +16,7 @@
AUTO_MKDIRS= yes
do-extract:
- cd ${FILESDIR} && cp *.pl *.pm ${WRKSRC}/
+ cd ${FILESDIR} && cp *.pl *.pm *.py ${WRKSRC}/
.include "../../mk/bsd.prefs.mk"
@@ -24,9 +24,8 @@
SUBST_STAGE.up= do-configure
SUBST_MESSAGE.up= Replacing variable placeholders
SUBST_FILES.up= url2pkg.pl MakeMaker.pm
-SUBST_VARS.up= MAKE
-SUBST_SED.up+= -e 's,@PERL@,${PERL5},g'
-SUBST_SED.up+= -e 's,@PERLLIBDIR@,${PREFIX}/lib/url2pkg,g'
+SUBST_VARS.up= MAKE PERL5 PYTHONBIN
+SUBST_SED.up+= -e 's,@LIBDIR@,${PREFIX}/lib/url2pkg,g'
.if defined(BATCH)
SUBST_SED.up+= -e 's,@PKGSRCDIR@,/usr/pkgsrc,g'
.else
@@ -37,5 +36,7 @@
${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.pl ${DESTDIR}${PREFIX}/bin/url2pkg
${INSTALL_MAN} ${FILESDIR}/url2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
${INSTALL_DATA} ${WRKSRC}/MakeMaker.pm ${DESTDIR}${PREFIX}/lib/url2pkg/ExtUtils/
+ ${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/
+.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d718d0c7bb0c -r 887c43fbb054 pkgtools/url2pkg/PLIST
--- a/pkgtools/url2pkg/PLIST Sun Aug 18 09:19:07 2019 +0000
+++ b/pkgtools/url2pkg/PLIST Sun Aug 18 11:26:33 2019 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:11:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/18 11:26:33 rillig Exp $
bin/url2pkg
lib/url2pkg/ExtUtils/MakeMaker.pm
+lib/url2pkg/setuptools.py
man/man8/url2pkg.8
diff -r d718d0c7bb0c -r 887c43fbb054 pkgtools/url2pkg/files/MakeMaker.pm
--- a/pkgtools/url2pkg/files/MakeMaker.pm Sun Aug 18 09:19:07 2019 +0000
+++ b/pkgtools/url2pkg/files/MakeMaker.pm Sun Aug 18 11:26:33 2019 +0000
@@ -81,7 +81,7 @@
my $category = find_category($pkgbase);
if (defined($category)) {
- printf("%s>=%s:../../%s/%s\n", $pkgbase, $ver, $category, $pkgbase);
+ printf("DEPENDS\t%s>=%s:../../%s/%s\n", $pkgbase, $ver, $category, $pkgbase);
return;
}
diff -r d718d0c7bb0c -r 887c43fbb054 pkgtools/url2pkg/files/setuptools.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/url2pkg/files/setuptools.py Sun Aug 18 11:26:33 2019 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: setuptools.py,v 1.1 2019/08/18 11:26:33 rillig Exp $
+
+def url2pkg_print_depends(keyword, depends):
+ for dep in depends:
+ if '>' not in dep:
+ dep = dep + '>=0'
+ print('%s\t%s' % (keyword, dep))
+
+def setup(**kwargs):
+
+ if 'install_requires' in kwargs:
+ url2pkg_print_depends('DEPENDS', kwargs['install_requires'])
+
+ if 'tests_require' in kwargs:
+ url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
diff -r d718d0c7bb0c -r 887c43fbb054 pkgtools/url2pkg/files/url2pkg.pl
--- a/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 09:19:07 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 11:26:33 2019 +0000
@@ -1,5 +1,5 @@
-#! @PERL@
-# $NetBSD: url2pkg.pl,v 1.55 2019/08/18 07:51:40 rillig Exp $
+#! @PERL5@
+# $NetBSD: url2pkg.pl,v 1.56 2019/08/18 11:26:33 rillig Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -38,7 +38,8 @@
#
my $make = '@MAKE@';
-my $perllibdir = '@PERLLIBDIR@';
+my $libdir = '@LIBDIR@';
+my $pythonbin = '@PYTHONBIN@';
use constant true => 1;
use constant false => 0;
@@ -103,6 +104,13 @@
close(F) or die;
}
+sub find_package($) {
+ my ($pkgbase) = @_;
+
+ my @candidates = <../../*/$pkgbase>;
+ return scalar(@candidates) == 1 ? $candidates[0] : "";
+}
+
# The following adjust_* subroutines are called after the distfiles have
# been downloaded and extracted. They inspect the extracted files
# and adjust the variable definitions in the package Makefile.
@@ -135,6 +143,11 @@
# "package>=version:../../category/package".
my @depends;
my @build_depends;
+my @test_depends;
+
+# .include, interleaved with BUILDLINK3_API_DEPENDS.
+# These lines are added at the bottom of the Makefile.
+my @bl3_lines;
# a list of pathnames relative to the package path.
# All these files will be included at the bottom of the Makefile.
@@ -155,10 +168,35 @@
# the package name, in case it differs from $distname.
my $pkgname = "";
+sub add_dependency($$$$) {
+ my ($type, $pkgbase, $constraint, $dep_dir) = @_;
+
+ if ($dep_dir ne "" && -f "$dep_dir/buildlink3.mk") {
+ # TODO: add type to bl3_lines (BUILDLINK_DEPENDS)
+ # TODO: add constraint to bl3_lines (BUILDLINK_API_DEPENDS)
+ push(@bl3_lines, ".include \"$dep_dir/buildlink3.mk\"");
+ return;
+ }
+
+ my $value = $dep_dir ne "" && -f "$dep_dir/Makefile"
+ ? "$pkgbase$constraint:$dep_dir"
+ : "# TODO: $pkgbase$constraint";
+
+ if ($type eq "DEPENDS") {
+ push(@depends, $value);
+ } elsif ($type eq "BUILD_DEPENDS") {
+ push(@build_depends, $value);
+ } elsif ($type eq "TEST_DEPENDS") {
+ push(@test_depends, $value);
+ } else {
+ push(@todos, "dependency $type $value");
+ }
+}
+
sub adjust_configure() {
my $gnu_configure = false;
- open(CONF, "<", "${abs_wrksrc}/configure") or return;
+ open(CONF, "<", "$abs_wrksrc/configure") or return;
while (defined(my $line = <CONF>)) {
if ($line =~ qr"autoconf|Free Software Foundation"i) {
$gnu_configure = true;
@@ -196,16 +234,17 @@
}
sub adjust_libtool() {
- if (-f "${abs_wrksrc}/ltconfig" || -f "${abs_wrksrc}/ltmain.sh") {
+ if (-f "$abs_wrksrc/ltconfig" || -f "$abs_wrksrc/ltmain.sh") {
push(@build_vars, var("USE_LIBTOOL", "=", "yes"));
}
- if (-d "${abs_wrksrc}/libltdl") {
+ if (-d "$abs_wrksrc/libltdl") {
push(@includes, "../../devel/libltdl/convenience.mk");
}
}
-sub adjust_perlmod() {
- if (-f "${abs_wrksrc}/Build.PL") {
+sub adjust_perl_module() {
+
+ if (-f "$abs_wrksrc/Build.PL") {
# It's a Module::Build module. Dependencies cannot yet be
# extracted automatically.
@@ -213,18 +252,17 @@
push(@build_vars, var("PERL5_MODULE_TYPE", "=", "Module::Build"));
- } elsif (-f "${abs_wrksrc}/Makefile.PL") {
+ } elsif (-f "$abs_wrksrc/Makefile.PL") {
# To avoid fix_up_makefile error for p5-HTML-Quoted, generate Makefile first.
- system("cd ${abs_wrksrc} && perl -I. Makefile.PL < /dev/null") or do {};
+ system("cd '$abs_wrksrc' && perl -I. Makefile.PL < /dev/null") or do {};
- open(DEPS, "cd ${abs_wrksrc} && perl -I${perllibdir} -I. Makefile.PL |") or die;
+ open(DEPS, "cd '$abs_wrksrc' && perl -I$libdir -I. Makefile.PL |") or die;
while (defined(my $dep = <DEPS>)) {
chomp($dep);
- if ($dep =~ qr"\.\./\.\./") {
- # Many Perl modules write other things to
- # stdout, so filter them out.
- push(@depends, $dep);
+
+ if ($dep =~ qr"^(\w+)\t(\S+)(>\S+|):(\.\./\.\./\S+)$") {
+ add_dependency($1, $2, $3, $4);
}
}
close(DEPS) or die;
@@ -233,16 +271,47 @@
return;
}
- my $packlist = $distname;
- $packlist =~ s/-[0-9].*//;
- $packlist =~ s/-/\//g;
- push(@build_vars, var("PERL5_PACKLIST", "=", "auto/${packlist}/.packlist"));
+ my $packlist = $distname =~ s/-[0-9].*//r =~ s/-/\//gr;
+ push(@build_vars, var("PERL5_PACKLIST", "=", "auto/$packlist/.packlist"));
push(@includes, "../../lang/perl5/module.mk");
$pkgname = "p5-\${DISTNAME}";
}
+sub adjust_python_module() {
+
+ return unless -f "$abs_wrksrc/setup.py";
+
+ my %old_env = %ENV;
+ $ENV{'PYTHONDONTWRITEBYTECODE'} = 'x';
+ $ENV{'PYTHONPATH'} = $libdir;
+
+ my @dep_lines;
+ open(DEPS, "cd '$abs_wrksrc' && $pythonbin setup.py build |") or die;
+ %ENV = %old_env;
+ while (defined(my $line = <DEPS>)) {
+ chomp($line);
+ if ($line =~ qr"^(\w+)\t(\S+?)(>=.*|)$") {
+ push(@dep_lines, [$1, $2, $3]);
+ }
+ }
+ close(DEPS) or die;
+
+ foreach my $dep_line (@dep_lines) {
+ my ($type, $pkgbase, $constraint) = @$dep_line;
+ my $dep_dir = find_package("py-$pkgbase");
+ if ($dep_dir ne "") {
+ $pkgbase = "py-$pkgbase";
+ } else {
+ $dep_dir = find_package($pkgbase);
+ }
+
+ add_dependency($type, $pkgbase, $constraint, $dep_dir);
+
+ }
+}
+
sub adjust_cargo() {
- open(CONF, "<", "${abs_wrksrc}/Cargo.lock") or return;
+ open(CONF, "<", "$abs_wrksrc/Cargo.lock") or return;
while (defined(my $line = <CONF>)) {
# "checksum cargo-package-name cargo-package-version
@@ -317,20 +386,20 @@
my ($site) = ($1);
if (index($url, $site) == 0) {
- if ($url =~ qr"^\Q${site}\E(.+)/([^/]+)$") {
+ if ($url =~ qr"^\Q$site\E(.+)/([^/]+)$") {
my $subdir = $1;
$distfile = $2;
- $master_sites = "\${${master_site}:=${subdir}/}";
+ $master_sites = "\${$master_site:=$subdir/}";
if ($master_site eq "MASTER_SITE_SOURCEFORGE") {
- $homepage = "http://${subdir}.sourceforge.net/";;
+ $homepage = "http://$subdir.sourceforge.net/";;
} elsif ($master_site eq "MASTER_SITE_GNU") {
- $homepage = "http://www.gnu.org/software/${subdir}/";;
+ $homepage = "http://www.gnu.org/software/$subdir/";;
} else {
$homepage = substr($url, 0, -length($distfile));
}
} else {
- $master_sites = "\${${master_site}}";
+ $master_sites = "\${$master_site}";
}
}
}
@@ -340,8 +409,8 @@
if ($url =~ qr"^https://downloads\.sourceforge\.net/project/([^/?]+)/[^?]+/([^/?]+)(?:[?].*)?$") {
my ($project, $filename) = ($1, $2);
- $master_sites = "\${MASTER_SITE_SOURCEFORGE:=${project}/}";
- $homepage = "https://${project}.sourceforge.net/";;
+ $master_sites = "\${MASTER_SITE_SOURCEFORGE:=$project/}";
+ $homepage = "https://$project.sourceforge.net/";;
Home |
Main Index |
Thread Index |
Old Index