From 38f585181ef109b9b96ee26f80587f3d6aa6bf7f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 30 Apr 2014 14:36:33 -0600 Subject: [PATCH] raco dist: preserve relative location of runtime files only within a package Previously, relative locations were preserved for all files with the same root, but that tends to keep too much information about the original filesystem layout, especially when runtime files are pulled both from the installation and a user-specific area. Since packages can be installed at different relative locations, it makes sense to preserve relative locations only up to package boundaries. original commit: 5c909cca0ddccb9c79d2a08a5764a7d48e4714d7 --- .../tests/compiler/embed/embed-me1f.rkt | 12 ++++++++++++ .../tests/compiler/embed/embed-me1f1.rktl | 1 + .../tests/compiler/embed/sub/embed-me1f2.rktl | 1 + .../compiler-test/tests/compiler/embed/test.rkt | 1 + 4 files changed, 15 insertions(+) create mode 100644 pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt create mode 100644 pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl create mode 100644 pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt new file mode 100644 index 0000000000..124a44cb48 --- /dev/null +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt @@ -0,0 +1,12 @@ +#lang scheme/base + +(require scheme/runtime-path) + +;; Check that relative paths are preserved: +(define-runtime-path f1 "embed-me1f1.rktl") +(define-runtime-path f2 "sub/embed-me1f2.rktl") + +(with-output-to-file "stdout" + (lambda () (parameterize ([current-namespace (make-base-namespace)]) + (load f1))) + #:exists 'append) diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl new file mode 100644 index 0000000000..5e2940e678 --- /dev/null +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl @@ -0,0 +1 @@ +(load-relative "sub/embed-me1f2.rktl") diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl new file mode 100644 index 0000000000..a70455650f --- /dev/null +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl @@ -0,0 +1 @@ +(printf "This is 1f\n") diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt index 0d13194071..e2609d1f6a 100644 --- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt @@ -236,6 +236,7 @@ (one-mz-test "embed-me1c.rkt" "This is 1c\n" #f) (one-mz-test "embed-me1d.rkt" "This is 1d\n" #f) (one-mz-test "embed-me1e.rkt" "This is 1e\n" #f) + (one-mz-test "embed-me1f.rkt" "This is 1f\n" #f) (one-mz-test "embed-me2.rkt" "This is 1\nThis is 2: #t\n" #t) (one-mz-test "embed-me13.rkt" "This is 14\n" #f) (one-mz-test "embed-me14.rkt" "This is 14\n" #f)