Fixing relative imports for extopenscad. #487
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for issue: #276
When exteopnscad is called with a source filepath outside of the current directory, relative filepaths such as "../config.scad" would fail to read if no such file relative to the programs directory, not the source file, existed.
This change uses the directory of the initial source file as the location for relative file lookups.
Testing
I couldn't find an example of automated tests for handwritten
scad
files, so I'm putting a test script here.From the root directory of the project, invoke the following commands. This tests relative paths going up and down the filesystem, along with checking the same directory.
cabal run extopenscad -- -O tests/imports/neighbour.scad
cabal run extopenscad -- -O tests/imports/relative/parent.scad
cabal run extopenscad -- -O tests/imports/relative/deep/grandparent.scad
cabal run extopenscad -- -O tests/imports/child.scad
All of these calls should succeed in generating the same shape,
cube(1,2,3)
.cd
intotests/imports
and run the following command to check that relative paths from the invoking directory work.cabal run extopenscad -- -O neighbour.scad
This command should also succeed, producing the same shape.