From 5c4c758d29e432a69e7cda08eb81c45ac96ab40f Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 9 Aug 2019 23:30:34 -0400 Subject: [PATCH] Update to the latest build engine. --- LICENSE | 21 + ocanada.xcodeproj/project.pbxproj | 368 +++++++++++------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcschemes/ocanada.xcscheme | 40 +- .../xcschemes/xcschememanagement.plist | 12 +- ocanada/Makefile | 6 +- ocanada/make/V2Make.scpt | Bin 4898 -> 4738 bytes ocanada/make/createDiskImage | 8 +- ocanada/make/errorFilter.sh | 4 +- ocanada/make/head.mk | 33 +- ocanada/make/tail.mk | 110 +++--- 11 files changed, 408 insertions(+), 202 deletions(-) create mode 100644 LICENSE create mode 100644 ocanada.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename ocanada.xcodeproj/{xcuserdata/jrand.xcuserdatad => xcshareddata}/xcschemes/ocanada.xcscheme (65%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..37bcdf1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2019 Jeremy Rand + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ocanada.xcodeproj/project.pbxproj b/ocanada.xcodeproj/project.pbxproj index 63d5413..798d805 100644 --- a/ocanada.xcodeproj/project.pbxproj +++ b/ocanada.xcodeproj/project.pbxproj @@ -7,146 +7,152 @@ objects = { /* Begin PBXBuildFile section */ - 9D413BA7217961E10069AD9D /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BA6217961E10069AD9D /* main.c */; }; - 9D413BA9217961E10069AD9D /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BA8217961E10069AD9D /* Makefile */; }; - 9D413BAC217961E10069AD9D /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D413BAB217961E10069AD9D /* AppleCommander.jar */; }; - 9D413BAE217961E10069AD9D /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D413BAD217961E10069AD9D /* bastokenizer-tools-bt-0.2.0.jar */; }; - 9D413BB0217961E10069AD9D /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BAF217961E10069AD9D /* createDiskImage */; }; - 9D413BB2217961E10069AD9D /* bt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BB1217961E10069AD9D /* bt */; }; - 9D413BB4217961E20069AD9D /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BB3217961E20069AD9D /* DevApple.vii */; }; - 9D413BB6217961E20069AD9D /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BB5217961E20069AD9D /* dos33_template.dsk */; }; - 9D413BB8217961E20069AD9D /* errorFilter.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BB7217961E20069AD9D /* errorFilter.sh */; }; - 9D413BBA217961E20069AD9D /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BB9217961E20069AD9D /* head.mk */; }; - 9D413BBC217961E20069AD9D /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BBB217961E20069AD9D /* prodos_template.dsk */; }; - 9D413BBE217961E20069AD9D /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BBD217961E20069AD9D /* tail.mk */; }; - 9D413BC0217961E20069AD9D /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BBF217961E20069AD9D /* V2Make.scpt */; }; - 9D413BC3217961E20069AD9D /* ocanada.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D413BC2217961E20069AD9D /* ocanada.xcscheme */; }; - 9D413BD42179621D0069AD9D /* mockingboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BCF2179621C0069AD9D /* mockingboard.c */; }; - 9D413BD52179621D0069AD9D /* song.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BD12179621C0069AD9D /* song.c */; }; - 9D413BD62179621D0069AD9D /* mockingboard_speech.s in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BD22179621C0069AD9D /* mockingboard_speech.s */; }; - 9D413BD72179621D0069AD9D /* flag.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D413BD32179621D0069AD9D /* flag.c */; }; + 9D132B7422FE70FB00C5513A /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D132B7322FE70FB00C5513A /* Makefile */; }; + 9D132B7722FE70FB00C5513A /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D132B7622FE70FB00C5513A /* AppleCommander.jar */; }; + 9D132B7922FE70FB00C5513A /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D132B7822FE70FB00C5513A /* bastokenizer-tools-bt-0.2.0.jar */; }; + 9D132B7B22FE70FB00C5513A /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B7A22FE70FB00C5513A /* createDiskImage */; }; + 9D132B7D22FE70FB00C5513A /* bt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B7C22FE70FB00C5513A /* bt */; }; + 9D132B7F22FE70FB00C5513A /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B7E22FE70FB00C5513A /* DevApple.vii */; }; + 9D132B8122FE70FB00C5513A /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8022FE70FB00C5513A /* dos33_template.dsk */; }; + 9D132B8322FE70FB00C5513A /* errorFilter.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8222FE70FB00C5513A /* errorFilter.sh */; }; + 9D132B8522FE70FB00C5513A /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8422FE70FB00C5513A /* head.mk */; }; + 9D132B8722FE70FB00C5513A /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8622FE70FB00C5513A /* prodos_template.dsk */; }; + 9D132B8922FE70FB00C5513A /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8822FE70FB00C5513A /* tail.mk */; }; + 9D132B8B22FE70FB00C5513A /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8A22FE70FB00C5513A /* V2Make.scpt */; }; + 9D132B8E22FE70FB00C5513A /* ocanada.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D132B8D22FE70FB00C5513A /* ocanada.xcscheme */; }; + 9D132BA822FE712700C5513A /* song.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D132B9F22FE712700C5513A /* song.c */; }; + 9D132BA922FE712700C5513A /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D132BA122FE712700C5513A /* main.c */; }; + 9D132BAA22FE712700C5513A /* mockingboard_speech.s in Sources */ = {isa = PBXBuildFile; fileRef = 9D132BA222FE712700C5513A /* mockingboard_speech.s */; }; + 9D132BAB22FE712700C5513A /* flag.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D132BA322FE712700C5513A /* flag.c */; }; + 9D132BAC22FE712700C5513A /* mockingboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D132BA722FE712700C5513A /* mockingboard.c */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 9D413BA1217961E10069AD9D /* CopyFiles */ = { + 9D132B6D22FE70FB00C5513A /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = /usr/share/man/man1/; dstSubfolderSpec = 0; files = ( - 9D413BBC217961E20069AD9D /* prodos_template.dsk in CopyFiles */, - 9D413BB2217961E10069AD9D /* bt in CopyFiles */, - 9D413BB6217961E20069AD9D /* dos33_template.dsk in CopyFiles */, - 9D413BB0217961E10069AD9D /* createDiskImage in CopyFiles */, - 9D413BC0217961E20069AD9D /* V2Make.scpt in CopyFiles */, - 9D413BBA217961E20069AD9D /* head.mk in CopyFiles */, - 9D413BB4217961E20069AD9D /* DevApple.vii in CopyFiles */, - 9D413BB8217961E20069AD9D /* errorFilter.sh in CopyFiles */, - 9D413BBE217961E20069AD9D /* tail.mk in CopyFiles */, - 9D413BC3217961E20069AD9D /* ocanada.xcscheme in CopyFiles */, + 9D132B8722FE70FB00C5513A /* prodos_template.dsk in CopyFiles */, + 9D132B7D22FE70FB00C5513A /* bt in CopyFiles */, + 9D132B8122FE70FB00C5513A /* dos33_template.dsk in CopyFiles */, + 9D132B7B22FE70FB00C5513A /* createDiskImage in CopyFiles */, + 9D132B8B22FE70FB00C5513A /* V2Make.scpt in CopyFiles */, + 9D132B8522FE70FB00C5513A /* head.mk in CopyFiles */, + 9D132B7F22FE70FB00C5513A /* DevApple.vii in CopyFiles */, + 9D132B8322FE70FB00C5513A /* errorFilter.sh in CopyFiles */, + 9D132B8922FE70FB00C5513A /* tail.mk in CopyFiles */, + 9D132B8E22FE70FB00C5513A /* ocanada.xcscheme in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 1; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 9D413BA3217961E10069AD9D /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D413BA6217961E10069AD9D /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9D413BA8217961E10069AD9D /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9D413BAB217961E10069AD9D /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9D413BAD217961E10069AD9D /* bastokenizer-tools-bt-0.2.0.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = "bastokenizer-tools-bt-0.2.0.jar"; path = "make/bastokenizer-tools-bt-0.2.0.jar"; sourceTree = ""; }; - 9D413BAF217961E10069AD9D /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9D413BB1217961E10069AD9D /* bt */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = ""; }; - 9D413BB3217961E20069AD9D /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9D413BB5217961E20069AD9D /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9D413BB7217961E20069AD9D /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = ""; }; - 9D413BB9217961E20069AD9D /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9D413BBB217961E20069AD9D /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9D413BBD217961E20069AD9D /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9D413BBF217961E20069AD9D /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9D413BC2217961E20069AD9D /* ocanada.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = ocanada.xcscheme; path = ocanada.xcodeproj/xcshareddata/xcschemes/ocanada.xcscheme; sourceTree = SOURCE_ROOT; }; - 9D413BCC2179621C0069AD9D /* flag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flag.h; sourceTree = ""; }; - 9D413BCD2179621C0069AD9D /* mockingboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard.h; sourceTree = ""; }; - 9D413BCE2179621C0069AD9D /* mockingboard_speech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard_speech.h; sourceTree = ""; }; - 9D413BCF2179621C0069AD9D /* mockingboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mockingboard.c; sourceTree = ""; }; - 9D413BD02179621C0069AD9D /* song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = song.h; sourceTree = ""; }; - 9D413BD12179621C0069AD9D /* song.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = song.c; sourceTree = ""; }; - 9D413BD22179621C0069AD9D /* mockingboard_speech.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = mockingboard_speech.s; sourceTree = ""; }; - 9D413BD32179621D0069AD9D /* flag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = flag.c; sourceTree = ""; }; - 9D413BD8217962250069AD9D /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 9D132B6722FE70FB00C5513A /* ocanada */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ocanada; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D132B6A22FE70FB00C5513A /* ocanada.dsk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ocanada.dsk; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D132B6F22FE70FB00C5513A /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D132B7322FE70FB00C5513A /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D132B7622FE70FB00C5513A /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; + 9D132B7822FE70FB00C5513A /* bastokenizer-tools-bt-0.2.0.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = "bastokenizer-tools-bt-0.2.0.jar"; path = "make/bastokenizer-tools-bt-0.2.0.jar"; sourceTree = ""; }; + 9D132B7A22FE70FB00C5513A /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; + 9D132B7C22FE70FB00C5513A /* bt */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = ""; }; + 9D132B7E22FE70FB00C5513A /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; + 9D132B8022FE70FB00C5513A /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; + 9D132B8222FE70FB00C5513A /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = ""; }; + 9D132B8422FE70FB00C5513A /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; + 9D132B8622FE70FB00C5513A /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; + 9D132B8822FE70FB00C5513A /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; + 9D132B8A22FE70FB00C5513A /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; + 9D132B8D22FE70FB00C5513A /* ocanada.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = ocanada.xcscheme; path = ocanada.xcodeproj/xcshareddata/xcschemes/ocanada.xcscheme; sourceTree = SOURCE_ROOT; }; + 9D132B9D22FE710B00C5513A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 9D132B9E22FE711300C5513A /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; + 9D132B9F22FE712700C5513A /* song.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = song.c; sourceTree = ""; }; + 9D132BA022FE712700C5513A /* mockingboard_speech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard_speech.h; sourceTree = ""; }; + 9D132BA122FE712700C5513A /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; + 9D132BA222FE712700C5513A /* mockingboard_speech.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = mockingboard_speech.s; sourceTree = ""; }; + 9D132BA322FE712700C5513A /* flag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = flag.c; sourceTree = ""; }; + 9D132BA422FE712700C5513A /* flag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flag.h; sourceTree = ""; }; + 9D132BA522FE712700C5513A /* mockingboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard.h; sourceTree = ""; }; + 9D132BA622FE712700C5513A /* song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = song.h; sourceTree = ""; }; + 9D132BA722FE712700C5513A /* mockingboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mockingboard.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9D413BA0217961E10069AD9D /* Frameworks */ = { + 9D132B6C22FE70FB00C5513A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9D413BAC217961E10069AD9D /* AppleCommander.jar in Frameworks */, - 9D413BAE217961E10069AD9D /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */, + 9D132B7722FE70FB00C5513A /* AppleCommander.jar in Frameworks */, + 9D132B7922FE70FB00C5513A /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 9D413B99217961E10069AD9D = { + 9D132B6022FE70FB00C5513A = { isa = PBXGroup; children = ( - 9D413BD8217962250069AD9D /* README.md */, - 9D413BA5217961E10069AD9D /* ocanada */, - 9D413BA4217961E10069AD9D /* Products */, + 9D132B9D22FE710B00C5513A /* README.md */, + 9D132B9E22FE711300C5513A /* LICENSE */, + 9D132B7022FE70FB00C5513A /* ocanada */, + 9D132B6822FE70FB00C5513A /* Products */, ); sourceTree = ""; }; - 9D413BA4217961E10069AD9D /* Products */ = { + 9D132B6822FE70FB00C5513A /* Products */ = { isa = PBXGroup; children = ( - 9D413BA3217961E10069AD9D /* doNotBuild */, + 9D132B6722FE70FB00C5513A /* ocanada */, + 9D132B6A22FE70FB00C5513A /* ocanada.dsk */, + 9D132B6F22FE70FB00C5513A /* doNotBuild */, ); name = Products; sourceTree = ""; }; - 9D413BA5217961E10069AD9D /* ocanada */ = { + 9D132B7022FE70FB00C5513A /* ocanada */ = { isa = PBXGroup; children = ( - 9D413BA6217961E10069AD9D /* main.c */, - 9D413BD32179621D0069AD9D /* flag.c */, - 9D413BCC2179621C0069AD9D /* flag.h */, - 9D413BCE2179621C0069AD9D /* mockingboard_speech.h */, - 9D413BD22179621C0069AD9D /* mockingboard_speech.s */, - 9D413BCF2179621C0069AD9D /* mockingboard.c */, - 9D413BCD2179621C0069AD9D /* mockingboard.h */, - 9D413BD12179621C0069AD9D /* song.c */, - 9D413BD02179621C0069AD9D /* song.h */, - 9D413BA8217961E10069AD9D /* Makefile */, - 9D413BAA217961E10069AD9D /* make */, - 9D413BC1217961E20069AD9D /* Supporting Files */, + 9D132B7322FE70FB00C5513A /* Makefile */, + 9D132BA322FE712700C5513A /* flag.c */, + 9D132BA422FE712700C5513A /* flag.h */, + 9D132BA122FE712700C5513A /* main.c */, + 9D132BA022FE712700C5513A /* mockingboard_speech.h */, + 9D132BA222FE712700C5513A /* mockingboard_speech.s */, + 9D132BA722FE712700C5513A /* mockingboard.c */, + 9D132BA522FE712700C5513A /* mockingboard.h */, + 9D132B9F22FE712700C5513A /* song.c */, + 9D132BA622FE712700C5513A /* song.h */, + 9D132B7522FE70FB00C5513A /* make */, + 9D132B8C22FE70FB00C5513A /* Supporting Files */, ); path = ocanada; sourceTree = ""; }; - 9D413BAA217961E10069AD9D /* make */ = { + 9D132B7522FE70FB00C5513A /* make */ = { isa = PBXGroup; children = ( - 9D413BAB217961E10069AD9D /* AppleCommander.jar */, - 9D413BAD217961E10069AD9D /* bastokenizer-tools-bt-0.2.0.jar */, - 9D413BAF217961E10069AD9D /* createDiskImage */, - 9D413BB1217961E10069AD9D /* bt */, - 9D413BB3217961E20069AD9D /* DevApple.vii */, - 9D413BB5217961E20069AD9D /* dos33_template.dsk */, - 9D413BB7217961E20069AD9D /* errorFilter.sh */, - 9D413BB9217961E20069AD9D /* head.mk */, - 9D413BBB217961E20069AD9D /* prodos_template.dsk */, - 9D413BBD217961E20069AD9D /* tail.mk */, - 9D413BBF217961E20069AD9D /* V2Make.scpt */, + 9D132B7622FE70FB00C5513A /* AppleCommander.jar */, + 9D132B7822FE70FB00C5513A /* bastokenizer-tools-bt-0.2.0.jar */, + 9D132B7A22FE70FB00C5513A /* createDiskImage */, + 9D132B7C22FE70FB00C5513A /* bt */, + 9D132B7E22FE70FB00C5513A /* DevApple.vii */, + 9D132B8022FE70FB00C5513A /* dos33_template.dsk */, + 9D132B8222FE70FB00C5513A /* errorFilter.sh */, + 9D132B8422FE70FB00C5513A /* head.mk */, + 9D132B8622FE70FB00C5513A /* prodos_template.dsk */, + 9D132B8822FE70FB00C5513A /* tail.mk */, + 9D132B8A22FE70FB00C5513A /* V2Make.scpt */, ); name = make; sourceTree = ""; }; - 9D413BC1217961E20069AD9D /* Supporting Files */ = { + 9D132B8C22FE70FB00C5513A /* Supporting Files */ = { isa = PBXGroup; children = ( - 9D413BC2217961E20069AD9D /* ocanada.xcscheme */, + 9D132B8D22FE70FB00C5513A /* ocanada.xcscheme */, ); name = "Supporting Files"; sourceTree = ""; @@ -154,10 +160,10 @@ /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 9D413B9E217961E10069AD9D /* ocanada */ = { + 9D132B6522FE70FB00C5513A /* ocanada */ = { isa = PBXLegacyTarget; buildArgumentsString = "-C ocanada $(ACTION)"; - buildConfigurationList = 9D413BC6217961E20069AD9D /* Build configuration list for PBXLegacyTarget "ocanada" */; + buildConfigurationList = 9D132B9122FE70FB00C5513A /* Build configuration list for PBXLegacyTarget "ocanada" */; buildPhases = ( ); buildToolPath = /usr/bin/make; @@ -170,13 +176,41 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 9D413BA2217961E10069AD9D /* doNotBuild */ = { + 9D132B6622FE70FB00C5513A /* Binary */ = { isa = PBXNativeTarget; - buildConfigurationList = 9D413BC9217961E20069AD9D /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildConfigurationList = 9D132B9422FE70FB00C5513A /* Build configuration list for PBXNativeTarget "Binary" */; buildPhases = ( - 9D413B9F217961E10069AD9D /* Sources */, - 9D413BA0217961E10069AD9D /* Frameworks */, - 9D413BA1217961E10069AD9D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Binary; + productName = Binary; + productReference = 9D132B6722FE70FB00C5513A /* ocanada */; + productType = "com.apple.product-type.tool"; + }; + 9D132B6922FE70FB00C5513A /* DiskImage */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9D132B9722FE70FB00C5513A /* Build configuration list for PBXNativeTarget "DiskImage" */; + buildPhases = ( + ); + buildRules = ( + ); + dependencies = ( + ); + name = DiskImage; + productName = DiskImage; + productReference = 9D132B6A22FE70FB00C5513A /* ocanada.dsk */; + productType = "com.apple.product-type.tool"; + }; + 9D132B6E22FE70FB00C5513A /* doNotBuild */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9D132B9A22FE70FB00C5513A /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildPhases = ( + 9D132B6B22FE70FB00C5513A /* Sources */, + 9D132B6C22FE70FB00C5513A /* Frameworks */, + 9D132B6D22FE70FB00C5513A /* CopyFiles */, ); buildRules = ( ); @@ -184,62 +218,70 @@ ); name = doNotBuild; productName = doNotBuild; - productReference = 9D413BA3217961E10069AD9D /* doNotBuild */; + productReference = 9D132B6F22FE70FB00C5513A /* doNotBuild */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 9D413B9A217961E10069AD9D /* Project object */ = { + 9D132B6122FE70FB00C5513A /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "Jeremy Rand"; TargetAttributes = { - 9D413B9E217961E10069AD9D = { - CreatedOnToolsVersion = 10.0; + 9D132B6522FE70FB00C5513A = { + CreatedOnToolsVersion = 10.3; }; - 9D413BA2217961E10069AD9D = { - CreatedOnToolsVersion = 10.0; + 9D132B6622FE70FB00C5513A = { + CreatedOnToolsVersion = 10.3; + }; + 9D132B6922FE70FB00C5513A = { + CreatedOnToolsVersion = 10.3; + }; + 9D132B6E22FE70FB00C5513A = { + CreatedOnToolsVersion = 10.3; }; }; }; - buildConfigurationList = 9D413B9D217961E10069AD9D /* Build configuration list for PBXProject "ocanada" */; + buildConfigurationList = 9D132B6422FE70FB00C5513A /* Build configuration list for PBXProject "ocanada" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 9D413B99217961E10069AD9D; - productRefGroup = 9D413BA4217961E10069AD9D /* Products */; + mainGroup = 9D132B6022FE70FB00C5513A; + productRefGroup = 9D132B6822FE70FB00C5513A /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9D413B9E217961E10069AD9D /* ocanada */, - 9D413BA2217961E10069AD9D /* doNotBuild */, + 9D132B6522FE70FB00C5513A /* ocanada */, + 9D132B6622FE70FB00C5513A /* Binary */, + 9D132B6922FE70FB00C5513A /* DiskImage */, + 9D132B6E22FE70FB00C5513A /* doNotBuild */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 9D413B9F217961E10069AD9D /* Sources */ = { + 9D132B6B22FE70FB00C5513A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9D413BD62179621D0069AD9D /* mockingboard_speech.s in Sources */, - 9D413BD72179621D0069AD9D /* flag.c in Sources */, - 9D413BA9217961E10069AD9D /* Makefile in Sources */, - 9D413BD42179621D0069AD9D /* mockingboard.c in Sources */, - 9D413BD52179621D0069AD9D /* song.c in Sources */, - 9D413BA7217961E10069AD9D /* main.c in Sources */, + 9D132BAB22FE712700C5513A /* flag.c in Sources */, + 9D132BAC22FE712700C5513A /* mockingboard.c in Sources */, + 9D132BA822FE712700C5513A /* song.c in Sources */, + 9D132BAA22FE712700C5513A /* mockingboard_speech.s in Sources */, + 9D132B7422FE70FB00C5513A /* Makefile in Sources */, + 9D132BA922FE712700C5513A /* main.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 9D413BC4217961E20069AD9D /* Debug */ = { + 9D132B8F22FE70FB00C5513A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -295,7 +337,7 @@ }; name = Debug; }; - 9D413BC5217961E20069AD9D /* Release */ = { + 9D132B9022FE70FB00C5513A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -344,7 +386,7 @@ }; name = Release; }; - 9D413BC7217961E20069AD9D /* Debug */ = { + 9D132B9222FE70FB00C5513A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -359,7 +401,7 @@ }; name = Debug; }; - 9D413BC8217961E20069AD9D /* Release */ = { + 9D132B9322FE70FB00C5513A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -371,24 +413,66 @@ }; name = Release; }; - 9D413BCA217961E20069AD9D /* Debug */ = { + 9D132B9522FE70FB00C5513A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + PRODUCT_NAME = ocanada; + }; + name = Debug; + }; + 9D132B9622FE70FB00C5513A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + PRODUCT_NAME = ocanada; + }; + name = Release; + }; + 9D132B9822FE70FB00C5513A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + PRODUCT_NAME = ocanada.dsk; + }; + name = Debug; + }; + 9D132B9922FE70FB00C5513A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + PRODUCT_NAME = ocanada.dsk; + }; + name = Release; + }; + 9D132B9B22FE70FB00C5513A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = VD9FGCW36C; GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; - HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + HEADER_SEARCH_PATHS = ( + $TEMP_ROOT/ocanada.build/$CONFIGURATION/ocanada.build/DerivedSources, + /usr/local/share/cc65/include, + ); PRODUCT_NAME = doNotBuild; }; name = Debug; }; - 9D413BCB217961E20069AD9D /* Release */ = { + 9D132B9C22FE70FB00C5513A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = VD9FGCW36C; GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; - HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + HEADER_SEARCH_PATHS = ( + $TEMP_ROOT/ocanada.build/$CONFIGURATION/ocanada.build/DerivedSources, + /usr/local/share/cc65/include, + ); PRODUCT_NAME = doNotBuild; }; name = Release; @@ -396,34 +480,52 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9D413B9D217961E10069AD9D /* Build configuration list for PBXProject "ocanada" */ = { + 9D132B6422FE70FB00C5513A /* Build configuration list for PBXProject "ocanada" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D413BC4217961E20069AD9D /* Debug */, - 9D413BC5217961E20069AD9D /* Release */, + 9D132B8F22FE70FB00C5513A /* Debug */, + 9D132B9022FE70FB00C5513A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9D413BC6217961E20069AD9D /* Build configuration list for PBXLegacyTarget "ocanada" */ = { + 9D132B9122FE70FB00C5513A /* Build configuration list for PBXLegacyTarget "ocanada" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D413BC7217961E20069AD9D /* Debug */, - 9D413BC8217961E20069AD9D /* Release */, + 9D132B9222FE70FB00C5513A /* Debug */, + 9D132B9322FE70FB00C5513A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9D413BC9217961E20069AD9D /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + 9D132B9422FE70FB00C5513A /* Build configuration list for PBXNativeTarget "Binary" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D413BCA217961E20069AD9D /* Debug */, - 9D413BCB217961E20069AD9D /* Release */, + 9D132B9522FE70FB00C5513A /* Debug */, + 9D132B9622FE70FB00C5513A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9D132B9722FE70FB00C5513A /* Build configuration list for PBXNativeTarget "DiskImage" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D132B9822FE70FB00C5513A /* Debug */, + 9D132B9922FE70FB00C5513A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9D132B9A22FE70FB00C5513A /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D132B9B22FE70FB00C5513A /* Debug */, + 9D132B9C22FE70FB00C5513A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 9D413B9A217961E10069AD9D /* Project object */; + rootObject = 9D132B6122FE70FB00C5513A /* Project object */; } diff --git a/ocanada.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ocanada.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ocanada.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/ocanada.xcscheme b/ocanada.xcodeproj/xcshareddata/xcschemes/ocanada.xcscheme similarity index 65% rename from ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/ocanada.xcscheme rename to ocanada.xcodeproj/xcshareddata/xcschemes/ocanada.xcscheme index c14c961..bd8b8db 100644 --- a/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/ocanada.xcscheme +++ b/ocanada.xcodeproj/xcshareddata/xcschemes/ocanada.xcscheme @@ -14,7 +14,7 @@ buildForAnalyzing = "YES"> @@ -34,23 +34,53 @@ + + + + + + + + + + + + + + + + @@ -63,7 +93,7 @@ diff --git a/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist b/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist index f7215a5..89cc29a 100644 --- a/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ocanada.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,11 +4,21 @@ SchemeUserState - doNotBuild.xcscheme + Binary.xcscheme_^#shared#^_ orderHint 1 + DiskImage.xcscheme_^#shared#^_ + + orderHint + 2 + + doNotBuild.xcscheme_^#shared#^_ + + orderHint + 3 + ocanada.xcscheme_^#shared#^_ orderHint diff --git a/ocanada/Makefile b/ocanada/Makefile index bde39b4..1a56705 100644 --- a/ocanada/Makefile +++ b/ocanada/Makefile @@ -52,7 +52,8 @@ PROJECT_TYPE = cc65 # will only produce 8-bit code. # Add any other directories where you are putting C or assembly source -# files to this list: +# files to this list. Note that if you are generating source files into +# $(GENDIR), you should add $(GENDIR) to SRCDIRS here: SRCDIRS+= # If you have a non-standard cc65 install, you may need to change @@ -236,6 +237,9 @@ COPYDIRS= # files for example. You can generate data files. Whatever you # might need. # +# You should generate these files in the $(GENDIR) directory or +# within a subdirectory under $(GENDIR) which you create yourself. +# # All of your commands associated with a rule _must_ start with a tab # character. Xcode makes it a bit tough to type a tab character by # default. Press option-tab within Xcode to insert a tab character. diff --git a/ocanada/make/V2Make.scpt b/ocanada/make/V2Make.scpt index 838068a9e4f27d11d735e4d625956ced02c88ddb..1b24c9cfa1593dc910e3bc6c790fef3d34dece6d 100644 GIT binary patch delta 466 zcmYjL%SyvQ6g{yUv582#b7Md(i0JG@x)9VLMJ?!}MG%o`lG>>;36sR4E(Cuee;|S@ zLGV{ZTowES*RDJXLOU=s_ulik=c)0y^7dJ+7|*l$cl99usm|tW=0e@r#|#X!EnO9+ zQ8KVw4)J;}&5JGD%`koDx=N>+4D9nWidIE)CyoQ<%2Y*R(wu;K%i26#go!pJTquM{ z5h1|LL&h=cFa+LD=3gog9}wu!#E0f9Fyt?3?Xf=Ml3v+s+_HDb zy5SADHZBzcr;HMj?f>JNnu6nzEg4X99+6XcN=_x#i57~K!Lu&QD;m1UxGLo`7uS48 zG?BO~C?%%QXEcFb_KN%>-Z6QFQNc*d@I}BL`^)^kwzRxw^)nsxRp2*;5S_%=i5O}b adcuiDVGv0#$-ipb7G&aT7_ffF5Lp6g@L_QJE>&x)ikdwUKy}IFp&YMIj%A()BPKspXlMi7Dwz%*TL580=rj zKXBtp5d1GL3;qK)g1GXIj!*=9@8;a|&bhqv-o>N$k3W4GZ1vx6cV7ob-M7JZ_hfkM ze*Z4|=-qKWa~!!*WZ0n<7$e^c4Q~=mjp%{h9S`Fb;ucq{r@+2lN7%zI zDVk?h)5?7R`1w;=mcVUj+C(FcMw@7q+GLxv>$1^|{>?_$X4^#j{ATCF*6IR;ISS-x zafSpn&ptAwIOIHpQ&f=9P>e&?#T%VQ^IPko_W-swO{N-()*1q)?$qIRO zzOg2{@4NR7UhFK|Dqm!IB8X^S ' + echo USAGE: $0 ' ' exit 1 fi @@ -318,7 +318,7 @@ do # to copy to the disk image. if [ -f "$ITEM" ] && echo "$ITEM" | grep '\.tok$' > /dev/null then - DESTFILE=`echo "$ITEM" | sed 's/\.tok$//'` + DESTFILE=`basename "$ITEM" | sed 's/\.tok$//'` "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$DESTFILE" "$BASICFILETYPE" 0x801 < "$ITEM" continue fi @@ -363,9 +363,9 @@ do # If the file type is text, convert the line feeds to carriage return if [ $FILETYPE = txt ] || [ $FILETYPE = T ] then - tr '\n' '\r' < $FILE | "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE + tr '\n' '\r' < $FILE | "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$DISKIMAGE" "$DESTFILE" $FILETYPE else - "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE + "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE fi done diff --git a/ocanada/make/errorFilter.sh b/ocanada/make/errorFilter.sh index 30259c1..b041ac2 100755 --- a/ocanada/make/errorFilter.sh +++ b/ocanada/make/errorFilter.sh @@ -35,7 +35,7 @@ while () { $file =~ s/\.s$/.c/; } - $_ = "$pwd/$file:$lineno:0: Error: $unresolvedRefError"; + $_ = "$pwd/$file:$lineno:0: error: $unresolvedRefError"; } else { $unresolvedRefError = undef; } @@ -49,7 +49,7 @@ while () { my $lineno = $2; my $error = $3; - $_ = "$pwd/$file:$lineno:0:$error"; + $_ = "$pwd/$file:$lineno:0: error: $error"; } print STDERR "$_\n"; } diff --git a/ocanada/make/head.mk b/ocanada/make/head.mk index 28ebc58..4fcc688 100644 --- a/ocanada/make/head.mk +++ b/ocanada/make/head.mk @@ -24,20 +24,47 @@ CC65=$(CC65_BIN)/cc65 CO65=$(CC65_BIN)/co65 MERLIN_DIR=/usr/local -MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32 -MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin +export MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32 +export MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin +MERLIN_ASM=make/merlin-asm AC=make/AppleCommander.jar SRCDIRS=. +# Check for Xcode build variables for the locations of build outputs and fall back +# to the current directory if not set. +ifeq ($(OBJECT_FILE_DIR),) + OBJDIR=. +else + export OBJECT_FILE_DIR + OBJDIR=$(OBJECT_FILE_DIR) +endif + +ifeq ($(DERIVED_SOURCES_DIR),) + GENDIR=. +else + export DERIVED_SOURCES_DIR + GENDIR=$(DERIVED_SOURCES_DIR) +endif + +ifeq ($(TARGET_BUILD_DIR),) + TARGETDIR=. +else + export TARGET_BUILD_DIR + TARGETDIR=$(TARGET_BUILD_DIR) +endif + + MACHINE=apple2 CPU=6502 CFLAGS= ASMFLAGS= LDFLAGS= DRIVERS= -DRVDIR=drivers +DRVDIR=$(GENDIR)/drivers + +MKDIR=mkdir -p XCODE_PATH=/Applications/Xcode.app XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist diff --git a/ocanada/make/tail.mk b/ocanada/make/tail.mk index fd961e5..3d6256c 100644 --- a/ocanada/make/tail.mk +++ b/ocanada/make/tail.mk @@ -14,12 +14,14 @@ BUILD_TYPE := $(shell if echo $(MACHINE) | grep -q -- -basic; then echo basic; e CWD=$(shell pwd) -DISKIMAGE=$(PGM).dsk +DISKIMAGE=$(TARGETDIR)/$(PGM).dsk EXECCMD= -BASIC_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS)))) -BASIC_OBJS=$(BASIC_SRCS:.bas=.tok) +vpath $(GENDIR) + +BASIC_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS))))) +BASIC_OBJS=$(patsubst %.bas, $(TARGETDIR)/%.tok, $(BASIC_SRCS)) ifeq ($(BUILD_TYPE),cc65) export PATH := $(PATH):$(CC65_BIN) @@ -33,50 +35,37 @@ ifeq ($(BUILD_TYPE),cc65) BASE_MACHINE = apple2enh endif - CC65_VERSION := $(shell $(CC65) --version 2>&1 | grep '^cc65 V') + export CC65_SUPPORTS_APPLE_SINGLE=1 + CC65_CREATE_DEP_ARG=--create-dep $(@:.o=.u) + CC65_LIST_ARG=-l $(@:.o=.lst) + CC65_DRV_DIR=$(CC65_HOME)/target/$(BASE_MACHINE)/drv - ifeq ($(CC65_VERSION),cc65 V2.13.3) - export CC65_SUPPORTS_APPLE_SINGLE=0 - CC65_CREATE_DEP_ARG=--create-dep - CC65_LIST_ARG=-l - CC65_DRV_DIR=$(CC65_HOME) - - MACHCONFIG= -t $(BASE_MACHINE) - ifeq ($(filter $(MACHINE), apple2 apple2enh),) - MACHCONFIG += -C $(MACHINE).cfg - endif + MACHCONFIG= -t $(BASE_MACHINE) + ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) + MACHCONFIG += -C $(BASE_MACHINE)-system.cfg else - export CC65_SUPPORTS_APPLE_SINGLE=1 - CC65_CREATE_DEP_ARG=--create-dep $(@:.o=.u) - CC65_LIST_ARG=-l $(@:.o=.lst) - CC65_DRV_DIR=$(CC65_HOME)/target/$(BASE_MACHINE)/drv - - MACHCONFIG= -t $(BASE_MACHINE) - ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) - MACHCONFIG += -C $(BASE_MACHINE)-system.cfg + ifeq ($(PROJECT_TYPE),ca65) + MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg + LDFLAGS += -u __EXEHDR__ else - ifeq ($(PROJECT_TYPE),ca65) - MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg - LDFLAGS += -u __EXEHDR__ - else - MACHCONFIG += -C $(BASE_MACHINE).cfg - endif - endif + MACHCONFIG += -C $(BASE_MACHINE).cfg + endif endif + CFLAGS+=-I $(GENDIR) ifneq ($(DRIVERS),) SRCDIRS+=$(DRVDIR) endif - C_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))) - C_OBJS=$(C_SRCS:.c=.o) - C_DEPS=$(C_SRCS:.c=.u) + C_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS))))) + C_OBJS=$(patsubst %.c, $(OBJDIR)/%.o, $(C_SRCS)) + C_DEPS=$(patsubst %.c, $(OBJDIR)/%.u, $(C_SRCS)) - ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) - ASM_OBJS=$(ASM_SRCS:.s=.o) - ASM_LSTS=$(ASM_SRCS:.s=.lst) + ASM_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))) + ASM_OBJS=$(patsubst %.s, $(OBJDIR)/%.o, $(ASM_SRCS)) + ASM_LSTS=$(patsubst %.s, $(OBJDIR)/%.lst, $(ASM_SRCS)) - MAPFILE=$(PGM).map + MAPFILE=$(TARGETDIR)/$(PGM).map ifneq ($(START_ADDR),) # If the MACHINE is set to an option which does not support a variable @@ -113,7 +102,7 @@ endif ifeq ($(BUILD_TYPE),merlin) ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) - MAPFILE=_Output.txt + MAPFILE=$(TARGETDIR)/_Output.txt EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') endif @@ -122,7 +111,7 @@ ifeq ($(BUILD_TYPE),basic) EXECCMD=$(shell echo run $(PGM) | tr '[a-z]' '[A-Z]') endif -OBJS=$(C_OBJS) $(ASM_OBJS) $(BASIC_OBJS) +OBJS=$(C_OBJS) $(ASM_OBJS) ALLTARGET=$(DISKIMAGE) @@ -131,13 +120,14 @@ ALLTARGET=$(DISKIMAGE) build: $(ALLTARGET) -$(DISKIMAGE): $(PGM) - make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS) +$(DISKIMAGE): $(TARGETDIR)/$(PGM) $(BASIC_OBJS) + make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(TARGETDIR)/$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS) execute: $(DISKIMAGE) - osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" + osascript make/V2Make.scpt "$(TARGETDIR)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" -%.tok: %.bas +$(TARGETDIR)/%.tok: %.bas + $(MKDIR) `dirname $@` make/bt $< $(BASICFLAGS) -o $@ ifneq ($(DRIVERS),) @@ -150,7 +140,7 @@ cleandrivers: endif clean: genclean cleandrivers - rm -f "$(PGM)" $(OBJS) $(C_DEPS) $(MAPFILE) $(ASM_LSTS) "$(DISKIMAGE)" + rm -f "$(TARGETDIR)/$(PGM)" $(OBJS) $(BASIC_OBJS) $(C_DEPS) $(MAPFILE) $(ASM_LSTS) "$(DISKIMAGE)" cleanMacCruft: rm -rf pkg @@ -165,10 +155,10 @@ xcodefix: ifeq ($(BUILD_TYPE),basic) # Build rules for BASIC projects -$(PGM): $(OBJS) - cp $(PGM).tok $(PGM) +$(TARGETDIR)/$(PGM): $(BASIC_OBJS) + cp $(TARGETDIR)/$(PGM).tok $(TARGETDIR)/$(PGM) -$(OBJS): Makefile +$(BASIC_OBJS): Makefile endif @@ -177,9 +167,10 @@ endif ifeq ($(BUILD_TYPE),merlin) # Build rules for Merlin projects -$(PGM): $(ASM_SRCS) Makefile - $(MERLIN_BIN) -V $(MERLIN_LIB) linkscript.s - rm -f _FileInformation.txt +$(TARGETDIR)/$(PGM): $(ASM_SRCS) Makefile + $(MKDIR) $(TARGETDIR) + rm -f $(TARGETDIR)/$(PGM) + $(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM) endif @@ -187,17 +178,30 @@ endif ifeq ($(BUILD_TYPE),cc65) # Build rules for cc65 projects -$(PGM): $(OBJS) - make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS) +$(TARGETDIR)/$(PGM): $(OBJS) + $(MKDIR) `dirname $@` + make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(TARGETDIR)/$(PGM)" $(OBJS) $(OBJS): Makefile -%.o: %.c +$(OBJDIR)/%.o: %.c + $(MKDIR) `dirname $@` make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) $(CC65_CREATE_DEP_ARG) -c -o $@ $< sed -i .bak 's/\.s:/.o:/' $(@:.o=.u) rm -f $(@:.o=.u).bak -%.o: %.s +$(OBJDIR)/%.o: $(GENDIR)/%.c + $(MKDIR) `dirname $@` + make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) $(CC65_CREATE_DEP_ARG) -c -o $@ $< + sed -i .bak 's/\.s:/.o:/' $(@:.o=.u) + rm -f $(@:.o=.u).bak + +$(OBJDIR)/%.o: %.s + $(MKDIR) `dirname $@` + make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $< + +$(OBJDIR)/%.o: $(GENDIR)/%.s + $(MKDIR) `dirname $@` make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $<