From 130154007b4317cc5b9511e3c1668896cbab44b6 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 15 May 2016 18:50:06 -0700 Subject: [PATCH] alien.libraries: move finder back to basis. conditionally load in stage2 --- .../alien/libraries/finder/finder-docs.factor | 0 .../alien/libraries/finder/finder-tests.factor | 0 {core => basis}/alien/libraries/finder/finder.factor | 0 .../alien/libraries/finder/linux/linux-tests.factor | 0 .../alien/libraries/finder/linux/linux.factor | 0 .../alien/libraries/finder/linux/platforms.txt | 0 .../alien/libraries/finder/macosx/macosx-tests.factor | 0 .../alien/libraries/finder/macosx/macosx.factor | 0 .../alien/libraries/finder/macosx/platforms.txt | 0 .../alien/libraries/finder/windows/platforms.txt | 0 .../alien/libraries/finder/windows/windows.factor | 0 {core => basis}/alien/libraries/unix/platforms.txt | 0 {core => basis}/alien/libraries/unix/unix.factor | 0 {core => basis}/alien/libraries/windows/platforms.txt | 0 .../alien/libraries/windows/windows.factor | 0 basis/bootstrap/stage2.factor | 11 ++++++++++- core/alien/libraries/libraries.factor | 8 ++++---- 17 files changed, 14 insertions(+), 5 deletions(-) rename {core => basis}/alien/libraries/finder/finder-docs.factor (100%) rename {core => basis}/alien/libraries/finder/finder-tests.factor (100%) rename {core => basis}/alien/libraries/finder/finder.factor (100%) rename {core => basis}/alien/libraries/finder/linux/linux-tests.factor (100%) rename {core => basis}/alien/libraries/finder/linux/linux.factor (100%) rename {core => basis}/alien/libraries/finder/linux/platforms.txt (100%) rename {core => basis}/alien/libraries/finder/macosx/macosx-tests.factor (100%) rename {core => basis}/alien/libraries/finder/macosx/macosx.factor (100%) rename {core => basis}/alien/libraries/finder/macosx/platforms.txt (100%) rename {core => basis}/alien/libraries/finder/windows/platforms.txt (100%) rename {core => basis}/alien/libraries/finder/windows/windows.factor (100%) rename {core => basis}/alien/libraries/unix/platforms.txt (100%) rename {core => basis}/alien/libraries/unix/unix.factor (100%) rename {core => basis}/alien/libraries/windows/platforms.txt (100%) rename {core => basis}/alien/libraries/windows/windows.factor (100%) diff --git a/core/alien/libraries/finder/finder-docs.factor b/basis/alien/libraries/finder/finder-docs.factor similarity index 100% rename from core/alien/libraries/finder/finder-docs.factor rename to basis/alien/libraries/finder/finder-docs.factor diff --git a/core/alien/libraries/finder/finder-tests.factor b/basis/alien/libraries/finder/finder-tests.factor similarity index 100% rename from core/alien/libraries/finder/finder-tests.factor rename to basis/alien/libraries/finder/finder-tests.factor diff --git a/core/alien/libraries/finder/finder.factor b/basis/alien/libraries/finder/finder.factor similarity index 100% rename from core/alien/libraries/finder/finder.factor rename to basis/alien/libraries/finder/finder.factor diff --git a/core/alien/libraries/finder/linux/linux-tests.factor b/basis/alien/libraries/finder/linux/linux-tests.factor similarity index 100% rename from core/alien/libraries/finder/linux/linux-tests.factor rename to basis/alien/libraries/finder/linux/linux-tests.factor diff --git a/core/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor similarity index 100% rename from core/alien/libraries/finder/linux/linux.factor rename to basis/alien/libraries/finder/linux/linux.factor diff --git a/core/alien/libraries/finder/linux/platforms.txt b/basis/alien/libraries/finder/linux/platforms.txt similarity index 100% rename from core/alien/libraries/finder/linux/platforms.txt rename to basis/alien/libraries/finder/linux/platforms.txt diff --git a/core/alien/libraries/finder/macosx/macosx-tests.factor b/basis/alien/libraries/finder/macosx/macosx-tests.factor similarity index 100% rename from core/alien/libraries/finder/macosx/macosx-tests.factor rename to basis/alien/libraries/finder/macosx/macosx-tests.factor diff --git a/core/alien/libraries/finder/macosx/macosx.factor b/basis/alien/libraries/finder/macosx/macosx.factor similarity index 100% rename from core/alien/libraries/finder/macosx/macosx.factor rename to basis/alien/libraries/finder/macosx/macosx.factor diff --git a/core/alien/libraries/finder/macosx/platforms.txt b/basis/alien/libraries/finder/macosx/platforms.txt similarity index 100% rename from core/alien/libraries/finder/macosx/platforms.txt rename to basis/alien/libraries/finder/macosx/platforms.txt diff --git a/core/alien/libraries/finder/windows/platforms.txt b/basis/alien/libraries/finder/windows/platforms.txt similarity index 100% rename from core/alien/libraries/finder/windows/platforms.txt rename to basis/alien/libraries/finder/windows/platforms.txt diff --git a/core/alien/libraries/finder/windows/windows.factor b/basis/alien/libraries/finder/windows/windows.factor similarity index 100% rename from core/alien/libraries/finder/windows/windows.factor rename to basis/alien/libraries/finder/windows/windows.factor diff --git a/core/alien/libraries/unix/platforms.txt b/basis/alien/libraries/unix/platforms.txt similarity index 100% rename from core/alien/libraries/unix/platforms.txt rename to basis/alien/libraries/unix/platforms.txt diff --git a/core/alien/libraries/unix/unix.factor b/basis/alien/libraries/unix/unix.factor similarity index 100% rename from core/alien/libraries/unix/unix.factor rename to basis/alien/libraries/unix/unix.factor diff --git a/core/alien/libraries/windows/platforms.txt b/basis/alien/libraries/windows/platforms.txt similarity index 100% rename from core/alien/libraries/windows/platforms.txt rename to basis/alien/libraries/windows/platforms.txt diff --git a/core/alien/libraries/windows/windows.factor b/basis/alien/libraries/windows/windows.factor similarity index 100% rename from core/alien/libraries/windows/windows.factor rename to basis/alien/libraries/windows/windows.factor diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor index 320d853f1b..7d59403328 100644 --- a/basis/bootstrap/stage2.factor +++ b/basis/bootstrap/stage2.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: command-line compiler.units continuations definitions io io.pathnames kernel math math.parser memory namespaces parser -parser.notes sequences sets splitting system +parser.notes sequences sets splitting system combinators vocabs vocabs.loader ; IN: bootstrap.stage2 @@ -75,6 +75,15 @@ CONSTANT: default-components (command-line) parse-command-line + ! Finish loading alien.libraries + ! We don't want this in core/ because + ! 1) can't have platform-dependent files in core + ! 2) it pulls in so many files + { + { [ os windows? ] [ "alien.libraries.windows" ] } + { [ os unix? ] [ "alien.libraries.unix" ] } + } cond require + ! Set dll paths os windows? [ "windows" require ] when diff --git a/core/alien/libraries/libraries.factor b/core/alien/libraries/libraries.factor index 070aee7092..38dbd79d09 100755 --- a/core/alien/libraries/libraries.factor +++ b/core/alien/libraries/libraries.factor @@ -100,7 +100,7 @@ deploy-libraries [ V{ } clone ] initialize HOOK: >deployed-library-path os ( path -- path' ) -{ - { [ os windows? ] [ "alien.libraries.windows" ] } - { [ os unix? ] [ "alien.libraries.unix" ] } -} cond require +! { + ! { [ os windows? ] [ "alien.libraries.windows" ] } + ! { [ os unix? ] [ "alien.libraries.unix" ] } +! } cond require