Track STD 31914 -> 32053

sorear · Aug 18, 2010 · 44a4616 · 44a4616
1 parent 5eb127a
commit 44a4616
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CompilerDriver.pm b/CompilerDriver.pm
@@ -13,9 +13,10 @@ use autodie ':all';
 
 open ::NIECZA_OUT, ">&", \*STDOUT;
 
+use lib 'STD_checkout';
 BEGIN {
-    unshift @INC, 'STD_checkout';
-    $ENV{PERL6LIB} = ".:STD_checkout:STD_checkout/lib";
+    use File::Spec;
+    $CursorBase::SET_PERL6LIB = [ File::Spec->curdir ];
 }
 
 use Body ();

diff --git a/Niecza.proj b/Niecza.proj
@@ -79,7 +79,10 @@
         <CombinePath BasePath="$(MSBuildProjectDirectory)" Paths="STD_checkout">
             <Output TaskParameter="CombinedPaths" PropertyName="STDDir"/>
         </CombinePath>
-        <Exec Command="PERL5LIB=$(STDDir) PERL6LIB=$(STDDir):$(STDDir)/lib STD5PREFIX=$(STDDir)/ $(Perl) $(STDDir)/viv -5 -o Niecza/Grammar.pmc Niecza/Grammar.pm6"/>
+        <CombinePath BasePath="$(STDDir)" Paths="lib">
+            <Output TaskParameter="CombinedPaths" PropertyName="STDDirLib"/>
+        </CombinePath>
+        <Exec Command="$(Perl) $(STDDir)/viv --clear-inc --inc $(STDDirLib) --inc $(STDDir) --symlroot $(STDDir) -5 -o Niecza/Grammar.pmc Niecza/Grammar.pm6"/>
     </Target>
 
     <Target Name="CheckoutSTD" Inputs="STD_REVISION"

diff --git a/Niecza/Actions.pm b/Niecza/Actions.pm
@@ -63,6 +63,7 @@ sub node { my ($M) = @_;
 
 sub ws { }
 sub is_ok { }
+sub dumbsmart { }
 sub normspace { }
 sub vws { }
 sub unv { }

diff --git a/STD_REVISION b/STD_REVISION
@@ -1 +1 @@
-31914
+32053