mirror of
https://github.com/irmen/prog8.git
synced 2024-08-20 05:29:02 +00:00
* fix #54 / step 3: avoid some (= not all) complaints re the .binary filename 64tass still had/has.
Actually, I don't quite understand why it still says "not the real name of the file". The 64tass docs say: > -Wno-portable > Don't warn about source portability problems. > These cross platform development annoyances are checked for: > * Case insensitive use of file names or use of short names. > * Use of backslashes for path separation instead of forward slashes. > * Use of reserved characters in file names. > * Absolute paths
This commit is contained in:
parent
402884b5ce
commit
b2c6274f74
@ -1327,9 +1327,11 @@ $repeatLabel lda $counterVar
|
|||||||
val sourcePath = stmt.definingModule().source // FIXME: %asmbinary inside non-library, non-filesystem module
|
val sourcePath = stmt.definingModule().source // FIXME: %asmbinary inside non-library, non-filesystem module
|
||||||
val includedPath = sourcePath.resolveSibling(includedName)
|
val includedPath = sourcePath.resolveSibling(includedName)
|
||||||
|
|
||||||
val pathForAssembler = outputDir // 64tass needs the path *relative to the .asm file*
|
val pathForAssembler = outputDir // #54: 64tass needs the path *relative to the .asm file*
|
||||||
.absolute() // avoid IllegalArgumentExc due to non-absolute path .relativize(absolute path)
|
.absolute() // avoid IllegalArgumentExc due to non-absolute path .relativize(absolute path)
|
||||||
.relativize(includedPath)
|
.relativize(includedPath)
|
||||||
|
.normalize() // avoid assembler warnings (-Wportable; only some, not all)
|
||||||
|
.toString().replace('\\', '/')
|
||||||
out(" .binary \"$pathForAssembler\" $offset $length")
|
out(" .binary \"$pathForAssembler\" $offset $length")
|
||||||
}
|
}
|
||||||
"%breakpoint" -> {
|
"%breakpoint" -> {
|
||||||
|
@ -117,7 +117,7 @@ class TestCompilerOnImportsAndIncludes {
|
|||||||
dynamicTest(displayName) {
|
dynamicTest(displayName) {
|
||||||
assumeReadableFile(p8Path)
|
assumeReadableFile(p8Path)
|
||||||
assumeReadableFile(binPath)
|
assumeReadableFile(binPath)
|
||||||
assertNotEquals( // the bug we're testing for (#??) was hidden if outputDir == workinDir
|
assertNotEquals( // the bug we're testing for (#54) was hidden if outputDir == workinDir
|
||||||
workingDir.normalize().toAbsolutePath(),
|
workingDir.normalize().toAbsolutePath(),
|
||||||
outputDir.normalize().toAbsolutePath(),
|
outputDir.normalize().toAbsolutePath(),
|
||||||
"sanity check: workingDir and outputDir should not be the same folder")
|
"sanity check: workingDir and outputDir should not be the same folder")
|
||||||
|
Loading…
Reference in New Issue
Block a user