[LON-CAPA-cvs] cvs: modules /sharrison/autocpan install_RPM-Tools.sh make_build_cpan_rpms.pl make_cpanauto.pl make_source_cpan_rpms.pl

[harris41]

harris41		Wed Sep 11 12:29:00 2002 EDT

  Modified files:              
    /modules/sharrison/autocpan	install_RPM-Tools.sh 
                               	make_build_cpan_rpms.pl 
                               	make_cpanauto.pl 
                               	make_source_cpan_rpms.pl 
  Log:
  supporting dashes in file names (in order to be equivalent with the CPAN names)
  
  
Index: modules/sharrison/autocpan/install_RPM-Tools.sh
diff -u modules/sharrison/autocpan/install_RPM-Tools.sh:1.1 modules/sharrison/autocpan/install_RPM-Tools.sh:1.2
--- modules/sharrison/autocpan/install_RPM-Tools.sh:1.1	Sun Aug 11 19:08:02 2002
+++ modules/sharrison/autocpan/install_RPM-Tools.sh	Wed Sep 11 12:29:00 2002
@@ -11,7 +11,7 @@
 [ $STATUS == "1" ] && echo "**** ERROR **** You need to install wget" && exit
 wget http://www.cpan.org/ -O - > /dev/null || STATUS=1
 [ $STATUS == "1" ] && echo "**** ERROR **** Unable to connect to CPAN" && exit
-VERSION=0.5
+VERSION=0.6
 rm -f RPM-Tools-$VERSION.tar.gz
 rm -Rf RPM-Tools-$VERSION
 wget http://www.cpan.org/authors/id/S/SH/SHARRISON/RPM-Tools-$VERSION.tar.gz
Index: modules/sharrison/autocpan/make_build_cpan_rpms.pl
diff -u modules/sharrison/autocpan/make_build_cpan_rpms.pl:1.2 modules/sharrison/autocpan/make_build_cpan_rpms.pl:1.3
--- modules/sharrison/autocpan/make_build_cpan_rpms.pl:1.2	Tue Aug 20 13:59:27 2002
+++ modules/sharrison/autocpan/make_build_cpan_rpms.pl	Wed Sep 11 12:29:00 2002
@@ -1,7 +1,7 @@
 # make_build_cpan_rpms.pl - compiles cpan source contents as RPMs
 
 # Scott Harrison, sharrison@users.sourceforge.net, 2002
-# $Id: make_build_cpan_rpms.pl,v 1.2 2002/08/20 17:59:27 harris41 Exp $
+# $Id: make_build_cpan_rpms.pl,v 1.3 2002/09/11 16:29:00 harris41 Exp $
 
 # I am not using the CPAN.pm module because I do not want to introduce
 # a software dependency.  There would also be the multiple versions of
@@ -29,9 +29,9 @@
     next unless /\S/;
     my ($dname,$dversion) = split(/\s+/);
     my $tag = "cpanbuild-$dname";
-    $tag =~ s/\-/\_/g;
+#    $tag =~ s/\-/\_/g;
     $sdname = $dname;
-    $sdname =~ s/\-/\_/g;
+#    $sdname =~ s/\-/\_/g;
     unless 
      (-e "../../../loncom/build/system_dependencies/cpanbuild/$dname.commands")
       {
Index: modules/sharrison/autocpan/make_cpanauto.pl
diff -u modules/sharrison/autocpan/make_cpanauto.pl:1.2 modules/sharrison/autocpan/make_cpanauto.pl:1.3
--- modules/sharrison/autocpan/make_cpanauto.pl:1.2	Tue Aug 20 14:00:07 2002
+++ modules/sharrison/autocpan/make_cpanauto.pl	Wed Sep 11 12:29:00 2002
@@ -1,7 +1,7 @@
 # make_cpanauto.pl - compiles self-extracting binaries
 
 # Scott Harrison, sharrison@users.sourceforge.net, 2002
-# $Id: make_cpanauto.pl,v 1.2 2002/08/20 18:00:07 harris41 Exp $
+# $Id: make_cpanauto.pl,v 1.3 2002/09/11 16:29:00 harris41 Exp $
 
 # This currently is a placeholder that will eventually implement the
 # new CPAN RPM distribution strategy.
@@ -29,7 +29,7 @@
     next unless /\S/;
     my ($dist_name)=split(/\s+/);
     my $sdist_name=$dist_name;
-    $sdist_name=~s/\-/\_/g;
+#    $sdist_name=~s/\-/\_/g;
     my $cpansrc=`ls cpansrc_${sdist_name}-*`; chomp($cpansrc);
     my $cpanbuild=`ls cpanbuild_${sdist_name}-*`; chomp($cpanbuild);
     `shar -s sharrison\@users.sourceforge.net $cpansrc $cpanbuild > $sdir/${dist_name}.bintmp`;
Index: modules/sharrison/autocpan/make_source_cpan_rpms.pl
diff -u modules/sharrison/autocpan/make_source_cpan_rpms.pl:1.2 modules/sharrison/autocpan/make_source_cpan_rpms.pl:1.3
--- modules/sharrison/autocpan/make_source_cpan_rpms.pl:1.2	Tue Aug 20 14:01:34 2002
+++ modules/sharrison/autocpan/make_source_cpan_rpms.pl	Wed Sep 11 12:29:00 2002
@@ -1,7 +1,7 @@
 # make_source_cpan_rpms.pl - compiles cpan source contents as RPMs
 
 # Scott Harrison, sharrison@users.sourceforge.net, 2002
-# $Id: make_source_cpan_rpms.pl,v 1.2 2002/08/20 18:01:34 harris41 Exp $
+# $Id: make_source_cpan_rpms.pl,v 1.3 2002/09/11 16:29:00 harris41 Exp $
 
 # I am not using the CPAN.pm module because I do not want to introduce
 # a software dependency.  There would also be the multiple versions of
@@ -23,7 +23,7 @@
     next unless /\S/;
     my ($dname,$dversion)=split(/\s+/);
     my $tag="cpansrc-$dname";
-    $tag=~s/\-/\_/g;
+#    $tag=~s/\-/\_/g;
     next if -e "$tag-$dversion-1.i386.rpm";
     `rm -f cpanpage.html`;
     `wget -nc -O cpanpage.html http://search.cpan.org/dist/$dname 2>\&1 > /dev/null`;