Author: ranger Date: Tue Oct 31 17:41:27 2006 New Revision: 447 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=447&repname=user%3a+ranger> Log: reorder transform_*
Modified: trunk/experimental/generate-infofiles.pl Modified: trunk/experimental/generate-infofiles.pl URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=447&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/generate-infofiles.pl (original) +++ trunk/experimental/generate-infofiles.pl Tue Oct 31 17:41:27 2006 @@ -513,136 +513,8 @@ return $field; } -sub transform_setcflags { - my $tree = shift->{'Tree'}; - my $text = shift; - - if ($tree eq "10.3") { - $text =~ s/\-D_POLL_EMUL_H_//gs; - } - - return $text; -} - -sub transform_setcxxflags { - transform_setcflags(@_); -} - -sub transform_setcppflags { - transform_setcflags(@_); -} - -sub transform_patch { - my $tree = shift; - my $text = shift; - - if ($tree eq "10.4") { - $text =~ s/g(cc|\+\+)-3\.3/g$1-4.0/gi; - $text =~ s/-fno-coalesce//gs; - } - - $text =~ s/(^|[\r\n]+)diff -uN[^\r\n]*//gs; - - return $text; -} - -sub transform_patchscript { - my $tree = shift->{'Tree'}; - my $text = shift; - - if ($tree eq "10.4") { - $text =~ s/g(cc|\+\+)-3\.3/g$1-4.0/gi; - $text =~ s/-fno-coalesce//gs; - } - - return $text; -} - -sub transform_descusage { - my $packagehash = shift; - my $descusage = shift; - - if ($packagehash->{'Package'} =~ /$APPEND_USAGE/i) { - if (open (FILEIN, $path . '/kdedesc.txt')) { - local $/ = undef; - if ($descusage !~ /^[\s\n]*$/gsi) { - warn "descusage is not empty, overwriting:\n$descusage\n"; - } - $descusage = <FILEIN>; - close (FILEIN); - } else { - warn "unable to open kdedesc.txt: $!\n"; - } - } - - return $descusage; -} - -sub transform_files { - my $tree = shift->{'Tree'}; - my $files = shift; - - my @newlines; - - for my $line (split(/\r?\n/, $files)) { - if ($tree eq "10.3") { - next if ($line =~ /libkfontinst/i); - } - push(@newlines, $line); - } - - return join("\n", @newlines); -} - -sub transform_shlibs { - my $tree = shift->{'Tree'}; - my $shlibs = shift; - my @newlines; - - for my $line (split(/\r?\n/, $shlibs)) { - if ($tree eq "10.3") { - next if ($line =~ /libkfontinst/i); - } - - # whoo! crazy lexing! - my $newline; - while ($line =~ /\G(.+?\(\S+\s+\S+\-)([^\-]+)\)/gsi) { - my ($rest, $revision) = ($1, $2); - $newline .= $rest . transform_revision( $tree, $revision ) . ')'; - } - $line =~ /\G\(.*$/; - $newline .= $1; - - push(@newlines, $line); - } - - return join("\n", @newlines); -} - -sub transform_configureparams { - my $tree = shift->{'Tree'}; - my $params = shift; - - if ($tree eq '10.4') { - $params =~ s/--disable-java//gs; - } - - return $params; -} - -sub transform_setcxx { - transform_setcc(@_); -} - -sub transform_setcc { - my $tree = shift->{'Tree'}; - my $setcc = shift; - - if ($tree eq '10.4') { - $setcc =~ s/3\.3/4.0/gs; - } - - return $setcc; +sub transform_builddepends { + return transform_depends(@_); } sub transform_compilescript { @@ -659,61 +531,15 @@ return $compilescript; } -sub transform_gcc { - my $tree = shift->{'Tree'}; - my $gcc = shift; - - if ($tree eq "10.4") { - $gcc = "4.0"; - } else { - $gcc = "3.3"; - } - - return $gcc; -} - -sub transform_type { - my $tree = shift->{'Tree'}; - my $type = shift; - if ($type =~ /^perl\s*\(0\)/i) { - my @versions = qw(5.6.0 5.6.1 5.8.0 5.8.1 5.8.4 5.8.5 5.8.6 5.8.8); - if ($tree =~ /^10.3/) { - @versions = qw(5.6.0 5.8.0 5.8.1 5.8.4 5.8.6); - } elsif ($tree =~ /^10.4/) { - @versions = qw(5.8.1 5.8.4 5.8.6 5.8.8); - } - $type = "perl(@versions)"; - } elsif ($type =~ /^python\s*\(0\)/i) { - my @versions = qw(2.1 2.2 2.3 2.4); - if ($tree =~ /^10.3/) { - @versions = qw(2.2 2.3 2.4); - } elsif ($tree =~ /^10.4/) { - @versions = qw(2.3 2.4); - } - $type = "python(@versions)"; - } - - return $type; -} - -sub transform_enhances { - return transform_depends(@_); -} - -sub transform_recommends { - return transform_depends(@_); -} - -sub transform_suggests { - return transform_depends(@_); -} - -sub transform_runtimedepends { - return transform_depends(@_); -} - -sub transform_builddepends { - return transform_depends(@_); +sub transform_configureparams { + my $tree = shift->{'Tree'}; + my $params = shift; + + if ($tree eq '10.4') { + $params =~ s/--disable-java//gs; + } + + return $params; } sub transform_depends { @@ -811,10 +637,87 @@ return $dep_spec; } -sub transform_version { +sub transform_descusage { my $packagehash = shift; - my $version = shift; - return $version; + my $descusage = shift; + + if ($packagehash->{'Package'} =~ /$APPEND_USAGE/i) { + if (open (FILEIN, $path . '/kdedesc.txt')) { + local $/ = undef; + if ($descusage !~ /^[\s\n]*$/gsi) { + warn "descusage is not empty, overwriting:\n$descusage\n"; + } + $descusage = <FILEIN>; + close (FILEIN); + } else { + warn "unable to open kdedesc.txt: $!\n"; + } + } + + return $descusage; +} + +sub transform_enhances { + return transform_depends(@_); +} + +sub transform_files { + my $tree = shift->{'Tree'}; + my $files = shift; + + my @newlines; + + for my $line (split(/\r?\n/, $files)) { + if ($tree eq "10.3") { + next if ($line =~ /libkfontinst/i); + } + push(@newlines, $line); + } + + return join("\n", @newlines); +} + +sub transform_gcc { + my $tree = shift->{'Tree'}; + my $gcc = shift; + + if ($tree eq "10.4") { + $gcc = "4.0"; + } else { + $gcc = "3.3"; + } + + return $gcc; +} + +sub transform_patch { + my $tree = shift; + my $text = shift; + + if ($tree eq "10.4") { + $text =~ s/g(cc|\+\+)-3\.3/g$1-4.0/gi; + $text =~ s/-fno-coalesce//gs; + } + + $text =~ s/(^|[\r\n]+)diff -uN[^\r\n]*//gs; + + return $text; +} + +sub transform_patchscript { + my $tree = shift->{'Tree'}; + my $text = shift; + + if ($tree eq "10.4") { + $text =~ s/g(cc|\+\+)-3\.3/g$1-4.0/gi; + $text =~ s/-fno-coalesce//gs; + } + + return $text; +} + +sub transform_recommends { + return transform_depends(@_); } sub transform_revision { @@ -830,6 +733,103 @@ warn "unhandled tree '$tree'\n"; } return $revision; +} + +sub transform_runtimedepends { + return transform_depends(@_); +} + +sub transform_setcc { + my $tree = shift->{'Tree'}; + my $setcc = shift; + + if ($tree eq '10.4') { + $setcc =~ s/3\.3/4.0/gs; + } + + return $setcc; +} + +sub transform_setcflags { + my $tree = shift->{'Tree'}; + my $text = shift; + + if ($tree eq "10.3") { + $text =~ s/\-D_POLL_EMUL_H_//gs; + } + + return $text; +} + +sub transform_setcppflags { + transform_setcflags(@_); +} + +sub transform_setcxx { + transform_setcc(@_); +} + +sub transform_setcxxflags { + transform_setcflags(@_); +} + +sub transform_shlibs { + my $tree = shift->{'Tree'}; + my $shlibs = shift; + my @newlines; + + for my $line (split(/\r?\n/, $shlibs)) { + if ($tree eq "10.3") { + next if ($line =~ /libkfontinst/i); + } + + # whoo! crazy lexing! + my $newline; + while ($line =~ /\G(.+?\(\S+\s+\S+\-)([^\-]+)\)/gsi) { + my ($rest, $revision) = ($1, $2); + $newline .= $rest . transform_revision( $tree, $revision ) . ')'; + } + $line =~ /\G\(.*$/; + $newline .= $1; + + push(@newlines, $line); + } + + return join("\n", @newlines); +} + +sub transform_suggests { + return transform_depends(@_); +} + +sub transform_type { + my $tree = shift->{'Tree'}; + my $type = shift; + if ($type =~ /^perl\s*\(0\)/i) { + my @versions = qw(5.6.0 5.6.1 5.8.0 5.8.1 5.8.4 5.8.5 5.8.6 5.8.8); + if ($tree =~ /^10.3/) { + @versions = qw(5.6.0 5.8.0 5.8.1 5.8.4 5.8.6); + } elsif ($tree =~ /^10.4/) { + @versions = qw(5.8.1 5.8.4 5.8.6 5.8.8); + } + $type = "perl(@versions)"; + } elsif ($type =~ /^python\s*\(0\)/i) { + my @versions = qw(2.1 2.2 2.3 2.4); + if ($tree =~ /^10.3/) { + @versions = qw(2.2 2.3 2.4); + } elsif ($tree =~ /^10.4/) { + @versions = qw(2.3 2.4); + } + $type = "python(@versions)"; + } + + return $type; +} + +sub transform_version { + my $packagehash = shift; + my $version = shift; + return $version; } sub revision_add { ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits