Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-29 17:50:35 +00:00
Code Issues Projects Releases Wiki Activity

* fix #54 / step 3: avoid some (= not all) complaints re the .binary filename 64tass still had/has.

Browse Source 
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:
meisl 2021-07-17 12:40:50 +02:00
parent 402884b5ce
commit b2c6274f74
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
View File

@ -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" -> {

2
compiler/test/TestCompilerOnImportsAndIncludes.kt
View File

@ -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")