Changeset 7442

Timestamp:

10/08/05 18:56:02 (3 years ago)

Author:

iblech

Message:

* Usual svn props.
* Perl6::Pugs: Added link to GMane's archive of perl.perl6.compiler.
* util/gen_prelude.pl: Remove the tmp-Prelude.pm when it is no longer required.
* PIL2JS: jspugs.pl, runjs.pl, PIL2JS.pm: Support for running from "make

install"'s locations (previously, extra code was not necessary, as the
installed path structure was the same as the sourcedir path structure).
Note: -BJS still can't find jspugs.pl and runjs.
Note: PIL-Run still doesn't work with the new hierarchy.

Files:

• lib/Perl6/Pugs.pm (modified) (1 diff)
• perl5/PIL2JS/jspugs.pl (modified) (2 diffs)
• perl5/PIL2JS/lib/PIL2JS.pm (modified) (3 diffs)
• perl5/PIL2JS/runjs.pl (modified) (3 diffs)
• perl5/Perl6-MetaModel (modified) (1 prop)
• util/gen_prelude.pl (modified) (1 diff)

lib/Perl6/Pugs.pm

@@ -74 +74 @@
 
 You can also read the list via Google Groups at
-L<http://groups-beta.google.com/group/perl.perl6.compiler>.
+L<http://groups-beta.google.com/group/perl.perl6.compiler> or GMane at
+L<http://news.gmane.org/gmane.comp.lang.perl.perl6.compiler>.
 
 Please submit bug reports to C<E<lt>pugsbugs@perl.orgE<gt>>.

perl5/PIL2JS/jspugs.pl

@@ -6 +6 @@
 use FindBin;
 use File::Spec;
-use lib File::Spec->catfile($FindBin::Bin, "lib");
+use lib File::Spec->catdir($FindBin::Bin, "lib");
+use lib File::Spec->catdir($FindBin::Bin);
 use PIL2JS;
 use PIL::Parser;
@@ -175 +176 @@
 sub command_e {
   my $js = eval { jsbin_hack(compile_perl6_to_standalone_js("-e", shift)) };
+  print $OUT $@ and return if $@;
   run_js($js) if $js;
 }

perl5/PIL2JS/lib/PIL2JS.pm

@@ -23 +23 @@
 
 sub pwd { File::Spec->catfile($FindBin::Bin, @_) }
+sub try_files {
+  my @cands = @_;
+  -e $_ and return $_ for @cands;
+  return $cands[0];
+}
+
+sub jsprelude_path { try_files pwd(qw< libjs PIL2JS.js >), pwd(qw< .. .. js lib PIL2JS.js >) }
 
 our %cfg = (
@@ -30 +37 @@
   preludepc => pwd('Prelude.js'),
   testpc    => pwd('Test.js'),
-  prelude   => pwd(qw< lib6 Prelude JS.pm >),
-  metamodel_base => pwd(qw< libjs >) . "/", # hack?
+  prelude   => try_files(pwd(qw< lib6 Prelude JS.pm >), pwd(qw< .. .. perl6 lib Prelude JS.pm>)),
+  metamodel_base => try_files(pwd(qw< libjs >), pwd(qw< .. .. js lib >)) . "/", # hack?
 );
 
@@ -211 +218 @@
 }
 
-sub jsprelude_path { pwd qw< libjs PIL2JS.js > }
-
 1;

perl5/PIL2JS/runjs.pl

@@ -6 +6 @@
 use FindBin;
 use File::Spec;
-use lib File::Spec->catfile($FindBin::Bin, "lib");
+use lib File::Spec->catdir($FindBin::Bin, "lib");
+use lib File::Spec->catdir($FindBin::Bin);
 use PIL2JS;
 use Getopt::Long;
@@ -54 +55 @@
 ) and @pugs_args or usage();
 
-unless(-e $PIL2JS::cfg{preludepc}) {
+unless(-e $PIL2JS::cfg{preludepc} and -s $PIL2JS::cfg{preludepc}) {
   warn "*** Precompiled Prelude doesn't exist yet; precompiling...\n";
   my $js = precomp_module_to_mini_js "-I", PIL2JS::pwd("lib6"), "-MPrelude::JS";
@@ -60 +61 @@
 }
 
-unless(-e $PIL2JS::cfg{testpc}) {
+unless(-e $PIL2JS::cfg{testpc} and -s $PIL2JS::cfg{testpc}) {
   warn "*** Precompiled Test.pm doesn't exist yet; precompiling...\n";
   my $js = precomp_module_to_mini_js "-MTest";

util/gen_prelude.pl

@@ -163 +163 @@
     die "Pugs ".(($?&255)?"killed by signal $?"
          :"exited with error code ".($?>>8)) if $?;
+    unlink $TEMP_PRELUDE;
     print STDERR "done.\n" if $Config{verbose};
 }