Merge branch 'nom' into newio

rakudo · Nov 21, 2014 · 42c7c32 · 42c7c32
2 parents e90a169 + 113ede5
commit 42c7c32
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/src/core/IOU.pm b/src/core/IOU.pm
@@ -0,0 +1,3 @@
+# placeholder file to facilitate switching between nom and newio branches
+
+# vim: ft=perl6 expandtab sw=4
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -123,6 +123,7 @@ J_CORE_SOURCES = \
   src/core/IO/Local.pm \
   src/core/IO/Dir.pm \
   src/core/IO/File.pm \
+  src/core/IOU.pm \
   src/core/IO/Spec.pm \
   src/core/IO/Spec/Unix.pm \
   src/core/IO/Spec/Win32.pm \

diff --git a/tools/build/Makefile-Parrot.in b/tools/build/Makefile-Parrot.in
@@ -206,6 +206,7 @@ P_CORE_SOURCES = \
   src/core/IO/Local.pm \
   src/core/IO/Dir.pm \
   src/core/IO/File.pm \
+  src/core/IO/IOU.pm \
   src/core/IO/Spec.pm \
   src/core/IO/Spec/Unix.pm \
   src/core/IO/Spec/Win32.pm \

diff --git a/tools/build/moar_core_sources b/tools/build/moar_core_sources
@@ -71,6 +71,7 @@ src/core/IO.pm
 src/core/IO/Local.pm
 src/core/IO/Dir.pm
 src/core/IO/File.pm
+src/core/IOU.pm
 src/core/IO/Spec.pm
 src/core/IO/Spec/Unix.pm
 src/core/IO/Spec/Win32.pm