Move Perl6 runtime library code to lib/

sorear · Aug 19, 2010 · b82b1c8 · b82b1c8
1 parent f71920f
commit b82b1c8
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/Niecza.proj b/Niecza.proj
@@ -31,7 +31,7 @@
         <Csc Sources="obj\MAIN.cs" TargetType="exe" AdditionalLibPaths="obj"
             OutputAssembly="obj\MAIN.exe"
             References="Test.dll;SAFE.dll;CORE.dll;Kernel.dll"/>
-        <Exec Command="prove -e mono obj\MAIN.exe"/>
+        <Exec Command="prove -e mono obj/MAIN.exe"/>
     </Target>
 
     <Target Name="WriteVersion">
@@ -41,26 +41,26 @@
     <!-- Libraries -->
     <Target Name="Kernel.dll" Inputs="Kernel.cs;Cursor.cs"
         Outputs="obj\Kernel.dll">
-        <Csc Sources="Kernel.cs;Cursor.cs" TargetType="library"
+        <Csc Sources="lib\Kernel.cs;lib\Cursor.cs" TargetType="library"
             OutputAssembly="obj\Kernel.dll"/>
         <Exec Condition="$(UseAOT) == 'Y'"
             Command="mono --aot obj\Kernel.dll"/>
     </Target>
 
-    <Target Name="CORE.cs" Inputs="@(CompilerPerl);obj\SAFE.store;CORE.setting" Outputs="obj\CORE.cs;obj\CORE.store" DependsOnTargets="BuildSTD;SAFE.cs;Grammar;PerlTask">
-        <Perl Code="compile(stopafter => 'writecs', lang => 'SAFE', file => 'CORE.setting');"/>
+    <Target Name="CORE.cs" Inputs="@(CompilerPerl);obj\SAFE.store;lib\CORE.setting" Outputs="obj\CORE.cs;obj\CORE.store" DependsOnTargets="BuildSTD;SAFE.cs;Grammar;PerlTask">
+        <Perl Code="compile(stopafter => 'writecs', lang => 'SAFE', file => 'lib/CORE.setting');"/>
     </Target>
 
-    <Target Name="SAFE.cs" Inputs="@(CompilerPerl);SAFE.setting"
+    <Target Name="SAFE.cs" Inputs="@(CompilerPerl);lib\SAFE.setting"
         Outputs="obj\SAFE.cs;obj\SAFE.store"
         DependsOnTargets="BuildSTD;Grammar;PerlTask">
-        <Perl Code="compile(stopafter => 'writecs', lang => 'NULL', file => 'SAFE.setting');"/>
+        <Perl Code="compile(stopafter => 'writecs', lang => 'NULL', file => 'lib/SAFE.setting');"/>
     </Target>
 
-    <Target Name="Test.cs" Inputs="@(CompilerPerl);obj\CORE.store;Test.pm6"
+    <Target Name="Test.cs" Inputs="@(CompilerPerl);obj\CORE.store;lib\Test.pm6"
         Outputs="obj\Test.cs;obj\Test.store"
         DependsOnTargets="CORE.cs;BuildSTD;Grammar;PerlTask">
-        <Perl Code="compile(stopafter => 'writecs', lang => 'CORE', file => 'Test.pm6');"/>
+        <Perl Code="compile(stopafter => 'writecs', lang => 'CORE', file => 'lib/Test.pm6');"/>
     </Target>
 
     <Target Name="CORE.dll" Inputs="obj\CORE.cs;obj\SAFE.dll;obj\Kernel.dll" Outputs="obj\CORE.dll" DependsOnTargets="CORE.cs;SAFE.dll;Kernel.dll">

diff --git a/CORE.setting → lib/CORE.setting b/CORE.setting → lib/CORE.setting
diff --git a/Cursor.cs → lib/Cursor.cs b/Cursor.cs → lib/Cursor.cs
diff --git a/Kernel.cs → lib/Kernel.cs b/Kernel.cs → lib/Kernel.cs
diff --git a/MONKEY_TYPING.pm6 → lib/MONKEY_TYPING.pm6 b/MONKEY_TYPING.pm6 → lib/MONKEY_TYPING.pm6
diff --git a/SAFE.setting → lib/SAFE.setting b/SAFE.setting → lib/SAFE.setting
diff --git a/Test.pm6 → lib/Test.pm6 b/Test.pm6 → lib/Test.pm6
diff --git a/Threads.pm6 → lib/Threads.pm6 b/Threads.pm6 → lib/Threads.pm6
diff --git a/src/CompilerDriver.pm b/src/CompilerDriver.pm
@@ -30,10 +30,12 @@ use Storable;
 use Niecza::Grammar ();
 use Niecza::Actions ();
 
-my $builddir;
+my ($srcdir, $rootdir, $builddir, $libdir);
 {
-    my $libdir = dirname($INC{'CompilerDriver.pm'});
-    $builddir = File::Spec->catdir($libdir, "../obj");
+    $srcdir   = dirname($INC{'CompilerDriver.pm'});
+    $rootdir  = dirname($srcdir);
+    $builddir = File::Spec->catdir($rootdir, "obj");
+    $libdir   = File::Spec->catdir($rootdir, "lib");
 }
 File::Path::make_path($builddir);
 
@@ -57,7 +59,7 @@ sub metadata_for {
     }
 
     sub sys_get_perl6lib {
-        File::Spec->curdir
+        $libdir, File::Spec->curdir
     }
 
     sub sys_load_modinfo {