diff --git a/mocklib.xcodeproj/project.pbxproj b/mocklib.xcodeproj/project.pbxproj index b9a1e7c..7570050 100644 --- a/mocklib.xcodeproj/project.pbxproj +++ b/mocklib.xcodeproj/project.pbxproj @@ -3,75 +3,151 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { +/* Begin PBXBuildFile section */ + 9D2D1A3A21795DB7003BCE06 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D2D1A3921795DB7003BCE06 /* main.c */; }; + 9D2D1A3C21795DB7003BCE06 /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D2D1A3B21795DB7003BCE06 /* Makefile */; }; + 9D2D1A3F21795DB7003BCE06 /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D2D1A3E21795DB7003BCE06 /* AppleCommander.jar */; }; + 9D2D1A4121795DB7003BCE06 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D2D1A4021795DB7003BCE06 /* bastokenizer-tools-bt-0.2.0.jar */; }; + 9D2D1A4321795DB7003BCE06 /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4221795DB7003BCE06 /* createDiskImage */; }; + 9D2D1A4521795DB7003BCE06 /* bt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4421795DB7003BCE06 /* bt */; }; + 9D2D1A4721795DB7003BCE06 /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4621795DB7003BCE06 /* DevApple.vii */; }; + 9D2D1A4921795DB7003BCE06 /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4821795DB7003BCE06 /* dos33_template.dsk */; }; + 9D2D1A4B21795DB7003BCE06 /* errorFilter.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4A21795DB7003BCE06 /* errorFilter.sh */; }; + 9D2D1A4D21795DB7003BCE06 /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4C21795DB7003BCE06 /* head.mk */; }; + 9D2D1A4F21795DB7003BCE06 /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A4E21795DB7003BCE06 /* prodos_template.dsk */; }; + 9D2D1A5121795DB7003BCE06 /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A5021795DB7003BCE06 /* tail.mk */; }; + 9D2D1A5321795DB7003BCE06 /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A5221795DB7003BCE06 /* V2Make.scpt */; }; + 9D2D1A5621795DB7003BCE06 /* mocklib.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D2D1A5521795DB7003BCE06 /* mocklib.xcscheme */; }; + 9D2D1A6321795DF3003BCE06 /* mockingboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D2D1A6121795DF3003BCE06 /* mockingboard.c */; }; + 9D2D1A6421795DF3003BCE06 /* mockingboard_speech.s in Sources */ = {isa = PBXBuildFile; fileRef = 9D2D1A6221795DF3003BCE06 /* mockingboard_speech.s */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9D2D1A3421795DB7003BCE06 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + 9D2D1A4F21795DB7003BCE06 /* prodos_template.dsk in CopyFiles */, + 9D2D1A5621795DB7003BCE06 /* mocklib.xcscheme in CopyFiles */, + 9D2D1A4521795DB7003BCE06 /* bt in CopyFiles */, + 9D2D1A4921795DB7003BCE06 /* dos33_template.dsk in CopyFiles */, + 9D2D1A4321795DB7003BCE06 /* createDiskImage in CopyFiles */, + 9D2D1A5321795DB7003BCE06 /* V2Make.scpt in CopyFiles */, + 9D2D1A4D21795DB7003BCE06 /* head.mk in CopyFiles */, + 9D2D1A4721795DB7003BCE06 /* DevApple.vii in CopyFiles */, + 9D2D1A4B21795DB7003BCE06 /* errorFilter.sh in CopyFiles */, + 9D2D1A5121795DB7003BCE06 /* tail.mk in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 9D16BCE21D9E070B005EE214 /* mockingboard_speech.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = mockingboard_speech.s; sourceTree = ""; }; - 9D2D42431E064633005EEBDD /* a2e.stdmou.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = a2e.stdmou.s; sourceTree = ""; }; - 9D49929C1DB5C5F700606789 /* mockingboard_speech.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mockingboard_speech.h; sourceTree = ""; }; - 9DB3C98C1D84A11600395532 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9DB3C98D1D84A11600395532 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9DB3C98F1D84A11600395532 /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9DB3C9901D84A11600395532 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9DB3C9911D84A11600395532 /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9DB3C9921D84A11600395532 /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9DB3C9931D84A11600395532 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9DB3C9941D84A11600395532 /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9DB3C9951D84A11600395532 /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9DB3C9961D84A11600395532 /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9DB3C99C1D84A21E00395532 /* mockingboard.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = mockingboard.c; sourceTree = ""; }; - 9DB3C99D1D84A21E00395532 /* mockingboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mockingboard.h; sourceTree = ""; }; - 9DF03B131E0E5623000016D3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 9D2D1A3621795DB7003BCE06 /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D2D1A3921795DB7003BCE06 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; + 9D2D1A3B21795DB7003BCE06 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D2D1A3E21795DB7003BCE06 /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; + 9D2D1A4021795DB7003BCE06 /* 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 = ""; }; + 9D2D1A4221795DB7003BCE06 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; + 9D2D1A4421795DB7003BCE06 /* bt */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = ""; }; + 9D2D1A4621795DB7003BCE06 /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; + 9D2D1A4821795DB7003BCE06 /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; + 9D2D1A4A21795DB7003BCE06 /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = ""; }; + 9D2D1A4C21795DB7003BCE06 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; + 9D2D1A4E21795DB7003BCE06 /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; + 9D2D1A5021795DB7003BCE06 /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; + 9D2D1A5221795DB7003BCE06 /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; + 9D2D1A5521795DB7003BCE06 /* mocklib.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = mocklib.xcscheme; path = mocklib.xcodeproj/xcshareddata/xcschemes/mocklib.xcscheme; sourceTree = SOURCE_ROOT; }; + 9D2D1A5F21795DF3003BCE06 /* mockingboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard.h; sourceTree = ""; }; + 9D2D1A6021795DF3003BCE06 /* mockingboard_speech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mockingboard_speech.h; sourceTree = ""; }; + 9D2D1A6121795DF3003BCE06 /* mockingboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mockingboard.c; sourceTree = ""; }; + 9D2D1A6221795DF3003BCE06 /* mockingboard_speech.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = mockingboard_speech.s; sourceTree = ""; }; + 9D2D1A6521795F60003BCE06 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFrameworksBuildPhase section */ + 9D2D1A3321795DB7003BCE06 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9D2D1A3F21795DB7003BCE06 /* AppleCommander.jar in Frameworks */, + 9D2D1A4121795DB7003BCE06 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + /* Begin PBXGroup section */ - 9DB3C9851D84A11600395532 = { + 9D2D1A2C21795DB7003BCE06 = { isa = PBXGroup; children = ( - 9DF03B131E0E5623000016D3 /* README.md */, - 9DB3C98B1D84A11600395532 /* mocklib */, + 9D2D1A6521795F60003BCE06 /* README.md */, + 9D2D1A3821795DB7003BCE06 /* mocklib */, + 9D2D1A3721795DB7003BCE06 /* Products */, ); sourceTree = ""; }; - 9DB3C98B1D84A11600395532 /* mocklib */ = { + 9D2D1A3721795DB7003BCE06 /* Products */ = { isa = PBXGroup; children = ( - 9DB3C98C1D84A11600395532 /* main.c */, - 9DB3C99C1D84A21E00395532 /* mockingboard.c */, - 9DB3C99D1D84A21E00395532 /* mockingboard.h */, - 9D16BCE21D9E070B005EE214 /* mockingboard_speech.s */, - 9D49929C1DB5C5F700606789 /* mockingboard_speech.h */, - 9D2D42431E064633005EEBDD /* a2e.stdmou.s */, - 9DB3C98D1D84A11600395532 /* Makefile */, - 9DB3C98E1D84A11600395532 /* make */, + 9D2D1A3621795DB7003BCE06 /* doNotBuild */, ); - name = mocklib; - path = mocktest; + name = Products; sourceTree = ""; }; - 9DB3C98E1D84A11600395532 /* make */ = { + 9D2D1A3821795DB7003BCE06 /* mocklib */ = { isa = PBXGroup; children = ( - 9DB3C98F1D84A11600395532 /* AppleCommander.jar */, - 9DB3C9901D84A11600395532 /* createDiskImage */, - 9DB3C9911D84A11600395532 /* DevApple.vii */, - 9DB3C9921D84A11600395532 /* dos33_template.dsk */, - 9DB3C9931D84A11600395532 /* head.mk */, - 9DB3C9941D84A11600395532 /* prodos_template.dsk */, - 9DB3C9951D84A11600395532 /* tail.mk */, - 9DB3C9961D84A11600395532 /* V2Make.scpt */, + 9D2D1A3921795DB7003BCE06 /* main.c */, + 9D2D1A6021795DF3003BCE06 /* mockingboard_speech.h */, + 9D2D1A6221795DF3003BCE06 /* mockingboard_speech.s */, + 9D2D1A6121795DF3003BCE06 /* mockingboard.c */, + 9D2D1A5F21795DF3003BCE06 /* mockingboard.h */, + 9D2D1A3B21795DB7003BCE06 /* Makefile */, + 9D2D1A3D21795DB7003BCE06 /* make */, + 9D2D1A5421795DB7003BCE06 /* Supporting Files */, + ); + path = mocklib; + sourceTree = ""; + }; + 9D2D1A3D21795DB7003BCE06 /* make */ = { + isa = PBXGroup; + children = ( + 9D2D1A3E21795DB7003BCE06 /* AppleCommander.jar */, + 9D2D1A4021795DB7003BCE06 /* bastokenizer-tools-bt-0.2.0.jar */, + 9D2D1A4221795DB7003BCE06 /* createDiskImage */, + 9D2D1A4421795DB7003BCE06 /* bt */, + 9D2D1A4621795DB7003BCE06 /* DevApple.vii */, + 9D2D1A4821795DB7003BCE06 /* dos33_template.dsk */, + 9D2D1A4A21795DB7003BCE06 /* errorFilter.sh */, + 9D2D1A4C21795DB7003BCE06 /* head.mk */, + 9D2D1A4E21795DB7003BCE06 /* prodos_template.dsk */, + 9D2D1A5021795DB7003BCE06 /* tail.mk */, + 9D2D1A5221795DB7003BCE06 /* V2Make.scpt */, ); name = make; sourceTree = ""; }; + 9D2D1A5421795DB7003BCE06 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 9D2D1A5521795DB7003BCE06 /* mocklib.xcscheme */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 9DB3C98A1D84A11600395532 /* mocklib */ = { + 9D2D1A3121795DB7003BCE06 /* mocklib */ = { isa = PBXLegacyTarget; - buildArgumentsString = "-C mocktest $(ACTION)"; - buildConfigurationList = 9DB3C9991D84A11600395532 /* Build configuration list for PBXLegacyTarget "mocklib" */; + buildArgumentsString = "-C mocklib $(ACTION)"; + buildConfigurationList = 9D2D1A5921795DB7003BCE06 /* Build configuration list for PBXLegacyTarget "mocklib" */; buildPhases = ( ); buildToolPath = /usr/bin/make; @@ -79,66 +155,115 @@ ); name = mocklib; passBuildSettingsInEnvironment = 1; - productName = mocktest; + productName = mocklib; }; /* End PBXLegacyTarget section */ +/* Begin PBXNativeTarget section */ + 9D2D1A3521795DB7003BCE06 /* doNotBuild */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9D2D1A5C21795DB7003BCE06 /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildPhases = ( + 9D2D1A3221795DB7003BCE06 /* Sources */, + 9D2D1A3321795DB7003BCE06 /* Frameworks */, + 9D2D1A3421795DB7003BCE06 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = doNotBuild; + productName = doNotBuild; + productReference = 9D2D1A3621795DB7003BCE06 /* doNotBuild */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + /* Begin PBXProject section */ - 9DB3C9861D84A11600395532 /* Project object */ = { + 9D2D1A2D21795DB7003BCE06 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Jeremy Rand"; TargetAttributes = { - 9DB3C98A1D84A11600395532 = { - CreatedOnToolsVersion = 8.0; - ProvisioningStyle = Automatic; + 9D2D1A3121795DB7003BCE06 = { + CreatedOnToolsVersion = 10.0; + }; + 9D2D1A3521795DB7003BCE06 = { + CreatedOnToolsVersion = 10.0; }; }; }; - buildConfigurationList = 9DB3C9891D84A11600395532 /* Build configuration list for PBXProject "mocklib" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + buildConfigurationList = 9D2D1A3021795DB7003BCE06 /* Build configuration list for PBXProject "mocklib" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 9DB3C9851D84A11600395532; + mainGroup = 9D2D1A2C21795DB7003BCE06; + productRefGroup = 9D2D1A3721795DB7003BCE06 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9DB3C98A1D84A11600395532 /* mocklib */, + 9D2D1A3121795DB7003BCE06 /* mocklib */, + 9D2D1A3521795DB7003BCE06 /* doNotBuild */, ); }; /* End PBXProject section */ +/* Begin PBXSourcesBuildPhase section */ + 9D2D1A3221795DB7003BCE06 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9D2D1A3C21795DB7003BCE06 /* Makefile in Sources */, + 9D2D1A6421795DF3003BCE06 /* mockingboard_speech.s in Sources */, + 9D2D1A6321795DF3003BCE06 /* mockingboard.c in Sources */, + 9D2D1A3A21795DB7003BCE06 /* main.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + /* Begin XCBuildConfiguration section */ - 9DB3C9971D84A11600395532 /* Debug */ = { + 9D2D1A5721795DB7003BCE06 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -152,37 +277,49 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; - 9DB3C9981D84A11600395532 /* Release */ = { + 9D2D1A5821795DB7003BCE06 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -191,14 +328,17 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; }; name = Release; }; - 9DB3C99A1D84A11600395532 /* Debug */ = { + 9D2D1A5A21795DB7003BCE06 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUGGING_SYMBOLS = YES; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = VD9FGCW36C; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; OTHER_CFLAGS = ""; @@ -207,38 +347,71 @@ }; name = Debug; }; - 9DB3C99B1D84A11600395532 /* Release */ = { + 9D2D1A5B21795DB7003BCE06 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = VD9FGCW36C; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; + 9D2D1A5D21795DB7003BCE06 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; + HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + PRODUCT_NAME = doNotBuild; + }; + name = Debug; + }; + 9D2D1A5E21795DB7003BCE06 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; + HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + PRODUCT_NAME = doNotBuild; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9DB3C9891D84A11600395532 /* Build configuration list for PBXProject "mocklib" */ = { + 9D2D1A3021795DB7003BCE06 /* Build configuration list for PBXProject "mocklib" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9DB3C9971D84A11600395532 /* Debug */, - 9DB3C9981D84A11600395532 /* Release */, + 9D2D1A5721795DB7003BCE06 /* Debug */, + 9D2D1A5821795DB7003BCE06 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9DB3C9991D84A11600395532 /* Build configuration list for PBXLegacyTarget "mocklib" */ = { + 9D2D1A5921795DB7003BCE06 /* Build configuration list for PBXLegacyTarget "mocklib" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9DB3C99A1D84A11600395532 /* Debug */, - 9DB3C99B1D84A11600395532 /* Release */, + 9D2D1A5A21795DB7003BCE06 /* Debug */, + 9D2D1A5B21795DB7003BCE06 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9D2D1A5C21795DB7003BCE06 /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D2D1A5D21795DB7003BCE06 /* Debug */, + 9D2D1A5E21795DB7003BCE06 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 9DB3C9861D84A11600395532 /* Project object */; + rootObject = 9D2D1A2D21795DB7003BCE06 /* Project object */; } diff --git a/mocklib.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mocklib.xcodeproj/project.xcworkspace/contents.xcworkspacedata index b65efde..9db35eb 100644 --- a/mocklib.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/mocklib.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:mocklib.xcodeproj"> diff --git a/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/mocktest.xcscheme b/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/mocktest.xcscheme deleted file mode 100644 index f323173..0000000 --- a/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/mocktest.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist b/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist index df8fef6..692000f 100644 --- a/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/mocklib.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,19 +4,16 @@ SchemeUserState - mocktest.xcscheme + doNotBuild.xcscheme + + orderHint + 1 + + mocklib.xcscheme_^#shared#^_ orderHint 0 - SuppressBuildableAutocreation - - 9DB3C98A1D84A11600395532 - - primary - - - diff --git a/mocklib/Makefile b/mocklib/Makefile new file mode 100644 index 0000000..917038f --- /dev/null +++ b/mocklib/Makefile @@ -0,0 +1,250 @@ +# +# Makefile +# Apple2BuildPipelineSample +# +# Part of a sample build pipeline for Apple II software development +# +# Created by Quinn Dunki on 8/15/14. +# One Girl, One Laptop Productions +# http://www.quinndunki.com +# http://www.quinndunki.com/blondihacks +# + +include make/head.mk + +# Customize this file to control what gets built, what machines to +# target, where in memory to put it, etc. + +# The name of your system or binary file to build goes here: +PGM=mocklib + +# Uncomment the one you want below (the first one is the default): +# MACHINE = apple2 +# MACHINE = apple2-dos33 +MACHINE = apple2-system +# MACHINE = apple2-loader +# MACHINE = apple2-reboot +# MACHINE = apple2enh +# MACHINE = apple2enh-dos33 +# MACHINE = apple2enh-system +# MACHINE = apple2enh-loader +# MACHINE = apple2enh-reboot + +# Uncomment the appropriate project type. If your entry point is +# main() in a .c file, then your project type is cc65. If your +# entry point is in an assembly file, then you project type is +# ca65: +PROJECT_TYPE = cc65 +# PROJECT_TYPE = ca65 + +# Uncomment and set this to your starting address in Apple II memory +# if necessary: +# START_ADDR = 6000 + +# Set the default CPU to assemble for. You can change this in the +# body of a .s file using control commands like ".PC02". Uncomment +# the one you want below (the first one is the default): +# CPU = 6502 +# CPU = 65SC02 +# CPU = 65C02 +# CPU = 65816 +# Note: You can assemble for 65816 in 16-bit mode but the C compiler +# will only produce 8-bit code. + +# Add any other directories where you are putting C or assembly source +# files to this list: +SRCDIRS+= + +# If you have a non-standard cc65 install, you may need to change +# some of these. Uncomment the following line and change it to the +# correct path to CC65_HOME if the default is not correct. If you +# are using cc65 v2.13.3, the default is: +# /usr/local/lib/cc65 +# If you are using cc65 v2.17, the default is: +# /usr/local/share/cc65 +# export CC65_HOME := /path/to/your/cc65/directory +# +# If the path to the cc65 binaries is not correct, uncomment this +# line and change it: +# CC65_BIN = /usr/local/bin + +# If you want to add arguments to the compile commandline, add them +# to this variable: +# CFLAGS += -Os + +# If you want to add arguments to the assembly commandline, add them +# to this variable: +# ASMFLAGS += -g + +# If you want to add arguments to the link commandline, add them to +# this variable: +# LDFLAGS += -v + +# If you want to add arguments to the BASIC tokenizer commandline, +# add them to this valiable: +# BASICFLAGS += --optimize + +# If you want to link the lores graphics driver with your executable, +# uncomment the next line. +# DRIVERS += loresgr +# +# To use the lores driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_lores_drv.h" +# int main(void) +# { +# tgi_install(&a2_lores_drv); +# tgi_init(); +# // Use the graphics driver +# tgi_uninstall(); +# } +# +# Read the $CC65_HOME/include/tgi.h file to see what the +# driver interface provides. Also check out +# $CC65_HOME/include/apple2.h to see the colour definitions. + +# If you want to link the hires graphics driver with your executable, +# uncomment the next line. +# DRIVERS += hiresgr +# +# To use the hires driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_hires_drv.h" +# int main(void) +# { +# tgi_install(&a2_hires_drv); +# tgi_init(); +# // Use the graphics driver +# tgi_uninstall(); +# } +# +# Read the $CC65_HOME/cc65/include/tgi.h file to see what the +# driver interface provides. Also check out +# $CC65_HOME/include/apple2.h to see the colour definitions. + +# If you want to link the extended memory driver with your executable, +# uncomment the next line. +# DRIVERS += auxmem +# +# To use the auxmem driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_auxmem_drv.h" +# int main(void) +# { +# em_install(&a2_auxmem_drv); +# // Use the auxmem driver +# em_uninstall(); +# } +# +# Read the $CC65_HOME/include/em.h file to see what the +# driver interface provides. + +# If you want to link the joystick driver with your executable, +# uncomment the next line. +# DRIVERS += joystick +# +# To use the joystick driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_joystick_drv.h" +# int main(void) +# { +# joy_install(&a2_joystick_drv); +# // Use the joystick driver +# joy_uninstall(); +# } +# +# Read the $CC65_HOME/include/joystick.h file to see what the +# driver interface provides. + +# If you want to link the mouse driver with your executable, +# uncomment the next line. +DRIVERS += mouse +# +# To use the mouse driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_mouse_drv.h" +# int main(void) +# { +# mouse_install(&mouse_def_callbacks, &a2_mouse_drv); +# // Use the mouse driver +# mouse_uninstall(); +# } +# +# Read the $CC65_HOME/include/mouse.h file to see what the +# driver interface provides. + +# If you want to link the serial driver with your executable, +# uncomment the next line. +# DRIVERS += serial +# +# To use the serial driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_serial_drv.h" +# int main(void) +# { +# ser_install(&a2_serial_drv); +# // Use the serial driver +# ser_uninstall(); +# } +# +# Read the $CC65_HOME/include/serial.h file to see what the +# driver interface provides. + +# If you have java installed in a non-standard location, you can set +# the path to it by uncommenting the following line: +# export JAVA=/usr/bin/java + +# If you want to copy one or more files or directories to the target disk +# image, add the root directory to this variable. All files will be +# copied from the source to the target using the same path from the source. +# +# For example, if you set COPYDIRS to dir and in your project you have +# the following files: +# dir/mySystemFile +# dir/newDir/anotherFile +# +# Then, during the copy phase, mySystemFile will be copied into the root +# of the disk and anotherFile will be copied into a directory named +# newDir. The newDir directory will be created if it does not already +# exist. +# +# The name of the file to copy is checked and if it ends in: +# .as - It assumes the file is in AppleSingle format. The .as +# suffix is stripped from the name when copied to the +# disk image. +# . - If the file ends with a single character which matches +# a DOS 3.3 file type (A, B, T, etc) it uses that value as +# the file type of the file copied to the disk image. The +# single character is removed from the file name. +# . - If the file ends with a three letter alpha extension, it +# uses that TLA as the file type of the file copied to the +# disk image. The TLA is removed from the file name. +# +# If you do not provide any type information for your filenames, +# it will be copied as a binary. +# +COPYDIRS= + +# Add any rules you want to execute before any compiles or assembly +# commands are called here, if any. You can generate .c, .s or .h +# files for example. You can generate data files. Whatever you +# might need. +# +# 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. +gen: + +# For any files you generated in the gen target above, you should +# add rules in genclean to remove those generated files when you +# clean your build. +genclean: + +# Do not change anything else below here... +include make/tail.mk diff --git a/mocktest/main.c b/mocklib/main.c similarity index 97% rename from mocktest/main.c rename to mocklib/main.c index 5a5b191..696d356 100644 --- a/mocktest/main.c +++ b/mocklib/main.c @@ -15,6 +15,7 @@ #include #include "mockingboard.h" +#include "drivers/a2_mouse_drv.h" tMockingSoundRegisters soundData1 = { @@ -71,9 +72,6 @@ uint8_t mySpeechData[] = { }; -extern char a2e_stdmou_mou; - - void delay(void) { int i; @@ -106,7 +104,7 @@ int main(void) mockingBoardInit(4, true); - if (mouse_install(&mouse_def_callbacks, &a2e_stdmou_mou) == 0) { + if (mouse_install(&mouse_def_callbacks, &a2_mouse_drv) == 0) { mouseInstalled = true; } diff --git a/mocklib/make/AppleCommander.jar b/mocklib/make/AppleCommander.jar new file mode 100644 index 0000000..4d61bfc Binary files /dev/null and b/mocklib/make/AppleCommander.jar differ diff --git a/mocktest/make/DevApple.vii b/mocklib/make/DevApple.vii similarity index 100% rename from mocktest/make/DevApple.vii rename to mocklib/make/DevApple.vii diff --git a/mocktest/make/V2Make.scpt b/mocklib/make/V2Make.scpt similarity index 82% rename from mocktest/make/V2Make.scpt rename to mocklib/make/V2Make.scpt index c679e5e..df3b6f2 100644 Binary files a/mocktest/make/V2Make.scpt and b/mocklib/make/V2Make.scpt differ diff --git a/mocklib/make/bastokenizer-tools-bt-0.2.0.jar b/mocklib/make/bastokenizer-tools-bt-0.2.0.jar new file mode 100644 index 0000000..93aa68f Binary files /dev/null and b/mocklib/make/bastokenizer-tools-bt-0.2.0.jar differ diff --git a/mocklib/make/bt b/mocklib/make/bt new file mode 100755 index 0000000..ca521ba --- /dev/null +++ b/mocklib/make/bt @@ -0,0 +1,34 @@ +#!/bin/sh + +if [ -z "$JAVA" ] +then + for item in "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home" /Library/Java/JavaVirtualMachines/*/Contents/Home /usr + do + if [ -x "$item/bin/java" ] + then + JAVA="$item/bin/java" + break + fi + done +fi + +if [ -z "$JAVA" ] +then + echo Cannot find a path to a Java runtime. + echo Go to https://java.com/download if you do not have Java. + echo If you do have Java, you may need to uncomment the JAVA + echo line in the Makefile and set it to the path for your + echo Java runtime binary. + exit 1 +fi + +INPUTFILE=$1 +shift + +tr -d '©' < "$INPUTFILE" > /tmp/bt_filtered.$$ + +"$JAVA" -jar make/bastokenizer-tools-bt-0.2.0.jar $* /tmp/bt_filtered.$$ +RESULT=$? + +rm /tmp/bt_filtered.$$ +exit $RESULT diff --git a/mocklib/make/createDiskImage b/mocklib/make/createDiskImage new file mode 100755 index 0000000..55e428a --- /dev/null +++ b/mocklib/make/createDiskImage @@ -0,0 +1,373 @@ +#!/bin/sh + +merlinStartAddr() { + awk '$1 ~ /^[oO][rR][gG]$/{print $2}' linkscript.s | sed 's/^[0$]*//' +} + + +if [ $# -lt 5 ] +then + echo USAGE: $0 ' ' + exit 1 +fi + +if [ -z "$JAVA" ] +then + for item in "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home" /Library/Java/JavaVirtualMachines/*/Contents/Home /usr + do + if [ -x "$item/bin/java" ] + then + JAVA="$item/bin/java" + break + fi + done +fi + +if [ -z "$JAVA" ] +then + echo Cannot find a path to a Java runtime. + echo Go to https://java.com/download if you do not have Java. + echo If you do have Java, you may need to uncomment the JAVA + echo line in the Makefile and set it to the path for your + echo Java runtime binary. + exit 1 +fi + +APPLECOMMANDER=$1 +shift + +MACHINE=$1 +shift + +DISKIMAGE=$1 +shift + +PROGRAM=$1 +shift + +STARTADDR=`echo $1 | sed 's/^0*//'` +shift + +SOURCEFILE=$PROGRAM + +case "$MACHINE" in + apple2) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2enh) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2-dos33) + TEMPLATE="make/dos33_template.dsk" + DELETELOADER=0 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="B" + BASICFILETYPE="A" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=30 + ;; + + apple2enh-dos33) + TEMPLATE="make/dos33_template.dsk" + DELETELOADER=0 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="B" + BASICFILETYPE="A" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=30 + ;; + + apple2-system) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=0 + FILETYPE="sys" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM`.system + MAXFILENAMELEN=15 + ;; + + apple2enh-system) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=0 + FILETYPE="sys" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM`.system + MAXFILENAMELEN=15 + ;; + + apple2-loader) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=0 + RENAMELOADER=1 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2-reboot) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=0 + RENAMELOADER=1 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2enh-loader) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=0 + RENAMELOADER=1 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2enh-reboot) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=0 + RENAMELOADER=1 + DELETEBASIC=1 + COPYBINARY=1 + HASHEADER=1 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + ;; + + apple2-basic) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=0 + FILETYPE="bas" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + SOURCEFILE=${PROGRAM}.tok + MAXFILENAMELEN=15 + ;; + + apple2-dos33-basic) + TEMPLATE="make/dos33_template.dsk" + DELETELOADER=0 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=0 + FILETYPE="A" + BASICFILETYPE="A" + TARGETFILE=`basename $PROGRAM` + SOURCEFILE=${PROGRAM}.tok + MAXFILENAMELEN=30 + ;; + + apple2-merlin) + TEMPLATE="make/prodos_template.dsk" + DELETELOADER=1 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=0 + FILETYPE="bin" + BASICFILETYPE="bas" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=15 + + STARTADDR=`merlinStartAddr` + ;; + + apple2-dos33-merlin) + TEMPLATE="make/dos33_template.dsk" + DELETELOADER=0 + RENAMELOADER=0 + DELETEBASIC=0 + COPYBINARY=1 + HASHEADER=0 + FILETYPE="B" + BASICFILETYPE="A" + TARGETFILE=`basename $PROGRAM` + MAXFILENAMELEN=30 + + STARTADDR=`merlinStartAddr` + ;; + + *) + echo "Invalid machine type $MACHINE" + exit 1 + ;; +esac + +STARTARG="" +if [ ! -z "$STARTADDR" ] +then + STARTARG="0x$STARTADDR" +fi + +if [ ! -f "$SOURCEFILE" ] +then + echo "Cannot file executable $SOURCEFILE" + exit 1 +fi + + +if [ ${#TARGETFILE} -gt $MAXFILENAMELEN ] +then + echo "The filename $TARGETFILE exceeds the max name length of the filesystem ($MAXFILENAMELEN)" + exit 1 +fi + +if [ ! -f "$TEMPLATE" ] +then + echo "Cannot file template disk image $TEMPLATE" + exit 1 +fi + +cp "$TEMPLATE" "$DISKIMAGE" + +if [ $DELETELOADER -eq 1 ] +then + "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" LOADER.SYSTEM +fi + +if [ $RENAMELOADER -eq 1 ] +then + LOADERFILE=${TARGETFILE}.system + if [ ${#LOADERFILE} -gt $MAXFILENAMELEN ] + then + echo "The filename $LOADERFILE exceeds the max name length of the filesystem ($MAXFILENAMELEN)" + rm -f "$DISKIMAGE" + exit 1 + fi + "$JAVA" -jar "$APPLECOMMANDER" -g "$DISKIMAGE" LOADER.SYSTEM | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$LOADERFILE" sys + "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" LOADER.SYSTEM +fi + +if [ $DELETEBASIC -eq 1 ] +then + "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" BASIC.SYSTEM +fi + +if [ $COPYBINARY -eq 1 ] +then + if [ "$CC65_SUPPORTS_APPLE_SINGLE" -eq 1 ] + then + "$JAVA" -jar "$APPLECOMMANDER" -as "$DISKIMAGE" "$TARGETFILE" < "$SOURCEFILE" + elif [ $HASHEADER -eq 1 ] + then + HDR_STARTADDR=`od -t x2 -N 2 < "$SOURCEFILE" | head -1 | awk '{print $2}' | sed 's/^0*//'` + if [ "$HDR_STARTADDR" = "$STARTADDR" ] + then + dd if="$SOURCEFILE" bs=4 skip=1 | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE $STARTARG + else + "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE $STARTARG < "$SOURCEFILE" + fi + else + "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE $STARTARG < "$SOURCEFILE" + fi +fi + +for ITEM in $* +do + # If this is a file matching *.tok, then this is an Applesoft BASIC file + # to copy to the disk image. + if [ -f "$ITEM" ] && echo "$ITEM" | grep '\.tok$' > /dev/null + then + DESTFILE=`echo "$ITEM" | sed 's/\.tok$//'` + "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$DESTFILE" "$BASICFILETYPE" 0x801 < "$ITEM" + continue + fi + + if [ ! -d "$ITEM" ] + then + echo Unable to find directory $ITEM + exit 1 + fi + + OLDPWD=`pwd` + cd $ITEM + + find . -type f -print | while read FILE + do + TRANSFERARG=-p + FILETYPE=bin + DESTFILE=`echo $FILE | sed 's/^\.\///'` + + if echo $FILE | egrep '\.as$' > /dev/null + then + # If the file ends with .as, this means the input is AppleSingle format. + # Strip the .as from the end of the file name and set the args to do + # an AppleSingle transfer. + TRANSFERARG=-as + FILETYPE="" + DESTFILE=`echo $DESTFILE | sed 's/\.as$//'` + elif echo $FILE | egrep '\.[ABITSRab]$' > /dev/null + then + # If the file ends with a single character DOS 3.3 file type, then use + # that as the file type. + FILETYPE=`echo $DESTFILE | awk -F. '{print $NF}'` + DESTFILE=`echo $DESTFILE | sed 's/\.[ABITSRab]$//'` + elif echo $FILE | egrep '\.[a-zA-Z][a-zA-Z][a-zA-Z]$' > /dev/null + then + # If the file ends with a three letter extension, use that as + # the file type. + FILETYPE=`echo $DESTFILE | awk -F. '{print $NF}'` + DESTFILE=`echo $DESTFILE | sed 's/\.[a-zA-Z][a-zA-Z][a-zA-Z]$//'` + fi + + # 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 + else + "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE + fi + done + + cd "$OLDPWD" +done diff --git a/mocktest/make/dos33_template.dsk b/mocklib/make/dos33_template.dsk similarity index 100% rename from mocktest/make/dos33_template.dsk rename to mocklib/make/dos33_template.dsk diff --git a/mocklib/make/errorFilter.sh b/mocklib/make/errorFilter.sh new file mode 100755 index 0000000..30259c1 --- /dev/null +++ b/mocklib/make/errorFilter.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +PWD=`pwd` + +$* 2> /tmp/errors.$$ +RESULT=$? + +if [ $RESULT -ne 0 ] +then + exec /usr/bin/perl -x $0 $RESULT /tmp/errors.$$ "$PWD" +fi +exit 0 + +#!/usr/bin/perl + +use strict; + +my $result = $ARGV[0]; +my $filename = $ARGV[1]; +my $pwd = $ARGV[2]; + +open(FILE, "<$filename") || die "$0: Unable to open file, $!"; + +my $unresolvedRefError = undef; + +while () { + chomp; + + if (defined $unresolvedRefError) { + if (m/^ ([^(]+)\(([0-9]+)\)/) { + my $file = $1; + my $lineno = $2; + + if (! -f "$pwd/$file") { + $file =~ s/\.s$/.c/; + } + + $_ = "$pwd/$file:$lineno:0: Error: $unresolvedRefError"; + } else { + $unresolvedRefError = undef; + } + } + + if (m/^(Unresolved external .* referenced) in:/) { + $unresolvedRefError = $1; + $_ = ""; + } elsif (m/^([^(]+)\(([0-9]+)\):(.*)$/) { + my $file = $1; + my $lineno = $2; + my $error = $3; + + $_ = "$pwd/$file:$lineno:0:$error"; + } + print STDERR "$_\n"; +} + +unlink($filename); + +exit($result); diff --git a/mocklib/make/head.mk b/mocklib/make/head.mk new file mode 100644 index 0000000..28ebc58 --- /dev/null +++ b/mocklib/make/head.mk @@ -0,0 +1,56 @@ +# +# head.mk +# Apple2BuildPipelineSample +# +# Part of a sample build pipeline for Apple II software development +# +# Created by Quinn Dunki on 8/15/14. +# One Girl, One Laptop Productions +# http://www.quinndunki.com +# http://www.quinndunki.com/blondihacks +# + +CC65_BIN=/usr/local/bin + +ifneq ($(wildcard /usr/local/lib/cc65),) + export CC65_HOME := /usr/local/lib/cc65 +else + export CC65_HOME := /usr/local/share/cc65 +endif + +CL65=$(CC65_BIN)/cl65 +CA65=$(CC65_BIN)/ca65 +CC65=$(CC65_BIN)/cc65 +CO65=$(CC65_BIN)/co65 + +MERLIN_DIR=/usr/local +MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32 +MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin + +AC=make/AppleCommander.jar + +SRCDIRS=. + +MACHINE=apple2 +CPU=6502 +CFLAGS= +ASMFLAGS= +LDFLAGS= +DRIVERS= +DRVDIR=drivers + +XCODE_PATH=/Applications/Xcode.app +XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist + +CC65_PLUGIN_PATH=$(HOME)/Library/Developer/Xcode/Plug-ins/cc65.ideplugin +CC65_PLUGIN_INFO=$(CC65_PLUGIN_PATH)/Contents/Info.plist + +XCODE_PLUGIN_COMPATIBILITY=DVTPlugInCompatibilityUUID + + +.PHONY: all gen genclean + +all: + @make gen + @make build + diff --git a/mocklib/make/prodos_template.dsk b/mocklib/make/prodos_template.dsk new file mode 100644 index 0000000..c7b2a75 Binary files /dev/null and b/mocklib/make/prodos_template.dsk differ diff --git a/mocklib/make/tail.mk b/mocklib/make/tail.mk new file mode 100644 index 0000000..fd961e5 --- /dev/null +++ b/mocklib/make/tail.mk @@ -0,0 +1,285 @@ +# +# tail.mk +# Apple2BuildPipelineSample +# +# Part of a sample build pipeline for Apple II software development +# +# Created by Quinn Dunki on 8/15/14. +# One Girl, One Laptop Productions +# http://www.quinndunki.com +# http://www.quinndunki.com/blondihacks +# + +BUILD_TYPE := $(shell if echo $(MACHINE) | grep -q -- -basic; then echo basic; elif echo $(MACHINE) | grep -q -- -merlin; then echo merlin; else echo cc65; fi) + +CWD=$(shell pwd) + +DISKIMAGE=$(PGM).dsk + +EXECCMD= + +BASIC_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS)))) +BASIC_OBJS=$(BASIC_SRCS:.bas=.tok) + +ifeq ($(BUILD_TYPE),cc65) + export PATH := $(PATH):$(CC65_BIN) + + # By default, use the a2 drivers. If the machine is one of the enhanced + # targets though, use the a2e drivers. + DRV_BASE_MACHINE=a2 + BASE_MACHINE = apple2 + ifneq ($(filter $(MACHINE), apple2enh apple2enh-dos33 apple2enh-system apple2enh-loader apple2enh-reboot),) + DRV_BASE_MACHINE=a2e + BASE_MACHINE = apple2enh + endif + + CC65_VERSION := $(shell $(CC65) --version 2>&1 | grep '^cc65 V') + + 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 + 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 + else + ifeq ($(PROJECT_TYPE),ca65) + MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg + LDFLAGS += -u __EXEHDR__ + else + MACHCONFIG += -C $(BASE_MACHINE).cfg + endif + endif + endif + + ifneq ($(DRIVERS),) + SRCDIRS+=$(DRVDIR) + endif + + C_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))) + C_OBJS=$(C_SRCS:.c=.o) + C_DEPS=$(C_SRCS:.c=.u) + + ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) + ASM_OBJS=$(ASM_SRCS:.s=.o) + ASM_LSTS=$(ASM_SRCS:.s=.lst) + + MAPFILE=$(PGM).map + + ifneq ($(START_ADDR),) + # If the MACHINE is set to an option which does not support a variable + # start address, then error. + ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) + $(error You cannot change start address with this machine type) + endif + else + # If not set, then use the default for the config as per cc65 + # documentation + ifneq ($(filter $(MACHINE), apple2 apple2-dos33 apple2enh apple2enh-dos33),) + START_ADDR=803 + endif + ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) + START_ADDR=2000 + endif + ifneq ($(filter $(MACHINE), apple2-loader apple2-reboot apple2enh-loader apple2enh-reboot),) + START_ADDR=800 + endif + endif + + LDFLAGS += --start-addr 0x$(START_ADDR) + + ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),) + EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') + endif +else + C_OBJS= + C_DEPS= + + ASM_OBJS= + ASM_LSTS= +endif + +ifeq ($(BUILD_TYPE),merlin) + ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) + MAPFILE=_Output.txt + EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') +endif + +ifeq ($(BUILD_TYPE),basic) + MAPFILE= + EXECCMD=$(shell echo run $(PGM) | tr '[a-z]' '[A-Z]') +endif + +OBJS=$(C_OBJS) $(ASM_OBJS) $(BASIC_OBJS) + +ALLTARGET=$(DISKIMAGE) + + +.PHONY: build execute clean cleandrivers xcodefix + +build: $(ALLTARGET) + +$(DISKIMAGE): $(PGM) + make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS) + +execute: $(DISKIMAGE) + osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" + +%.tok: %.bas + make/bt $< $(BASICFLAGS) -o $@ + +ifneq ($(DRIVERS),) +cleandrivers: + rm -Rf "$(DRVDIR)" + +else +cleandrivers: + +endif + +clean: genclean cleandrivers + rm -f "$(PGM)" $(OBJS) $(C_DEPS) $(MAPFILE) $(ASM_LSTS) "$(DISKIMAGE)" + +cleanMacCruft: + rm -rf pkg + +# Some gen phase stuff... +gen: xcodefix $(DRIVERS) + +xcodefix: + defaults write "$(CC65_PLUGIN_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)s -array `defaults read "$(XCODE_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)` || true + + +ifeq ($(BUILD_TYPE),basic) +# Build rules for BASIC projects + +$(PGM): $(OBJS) + cp $(PGM).tok $(PGM) + +$(OBJS): Makefile + + +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 + +endif + + +ifeq ($(BUILD_TYPE),cc65) +# Build rules for cc65 projects + +$(PGM): $(OBJS) + make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS) + +$(OBJS): Makefile + +%.o: %.c + 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 + make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $< + + +.PHONY: loresgr hiresgr auxmem joystick mouse serial +# Lores driver codegen +loresgr: $(DRVDIR)/a2_lores_drv.s $(DRVDIR)/a2_lores_drv.h + +$(DRVDIR)/a2_lores_drv.s: $(CC65_DRV_DIR)/tgi/$(DRV_BASE_MACHINE).lo.tgi + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_lores_drv -o $@ $(CC65_DRV_DIR)/tgi/$(DRV_BASE_MACHINE).lo.tgi + +$(DRVDIR)/a2_lores_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_lores_drv;' >> $@ + + +# Hires driver codegen +hiresgr: $(DRVDIR)/a2_hires_drv.s $(DRVDIR)/a2_hires_drv.h + +$(DRVDIR)/a2_hires_drv.s: $(CC65_DRV_DIR)/tgi/$(DRV_BASE_MACHINE).hi.tgi + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_hires_drv -o $@ $(CC65_DRV_DIR)/tgi/$(DRV_BASE_MACHINE).hi.tgi + +$(DRVDIR)/a2_hires_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_hires_drv;' >> $@ + + +# Auxmem driver codegen +auxmem: $(DRVDIR)/a2_auxmem_drv.s $(DRVDIR)/a2_auxmem_drv.h + +$(DRVDIR)/a2_auxmem_drv.s: $(CC65_DRV_DIR)/emd/$(DRV_BASE_MACHINE).auxmem.emd + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_auxmem_drv -o $@ $(CC65_DRV_DIR)/emd/$(DRV_BASE_MACHINE).auxmem.emd + +$(DRVDIR)/a2_auxmem_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_auxmem_drv;' >> $@ + + +# Joystick driver codegen +joystick: $(DRVDIR)/a2_joystick_drv.s $(DRVDIR)/a2_joystick_drv.h + +$(DRVDIR)/a2_joystick_drv.s: $(CC65_DRV_DIR)/joy/$(DRV_BASE_MACHINE).stdjoy.joy + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_joystick_drv -o $@ $(CC65_DRV_DIR)/joy/$(DRV_BASE_MACHINE).stdjoy.joy + +$(DRVDIR)/a2_joystick_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_joystick_drv;' >> $@ + + +# Mouse driver codegen +mouse: $(DRVDIR)/a2_mouse_drv.s $(DRVDIR)/a2_mouse_drv.h + +$(DRVDIR)/a2_mouse_drv.s: $(CC65_DRV_DIR)/mou/$(DRV_BASE_MACHINE).stdmou.mou + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_mouse_drv -o $@ $(CC65_DRV_DIR)/mou/$(DRV_BASE_MACHINE).stdmou.mou + +$(DRVDIR)/a2_mouse_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_mouse_drv;' >> $@ + + +# Serial driver codegen +serial: $(DRVDIR)/a2_serial_drv.s $(DRVDIR)/a2_serial_drv.h + +$(DRVDIR)/a2_serial_drv.s: $(CC65_DRV_DIR)/ser/$(DRV_BASE_MACHINE).ssc.ser + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_serial_drv -o $@ $(CC65_DRV_DIR)/ser/$(DRV_BASE_MACHINE).ssc.ser + +$(DRVDIR)/a2_serial_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_serial_drv;' >> $@ + +endif + + +-include $(C_DEPS) diff --git a/mocktest/mockingboard.c b/mocklib/mockingboard.c similarity index 100% rename from mocktest/mockingboard.c rename to mocklib/mockingboard.c diff --git a/mocktest/mockingboard.h b/mocklib/mockingboard.h similarity index 100% rename from mocktest/mockingboard.h rename to mocklib/mockingboard.h diff --git a/mocktest/mockingboard_speech.h b/mocklib/mockingboard_speech.h similarity index 100% rename from mocktest/mockingboard_speech.h rename to mocklib/mockingboard_speech.h diff --git a/mocktest/mockingboard_speech.s b/mocklib/mockingboard_speech.s similarity index 100% rename from mocktest/mockingboard_speech.s rename to mocklib/mockingboard_speech.s diff --git a/mocktest/Makefile b/mocktest/Makefile deleted file mode 100644 index 66d6a46..0000000 --- a/mocktest/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# -# Makefile -# Apple2BuildPipelineSample -# -# Part of a sample build pipeline for Apple II software development -# -# Created by Quinn Dunki on 8/15/14. -# One Girl, One Laptop Productions -# http://www.quinndunki.com -# http://www.quinndunki.com/blondihacks -# - -include make/head.mk - -# Customize this file to control what gets built, what machines to -# target, where in memory to put it, etc. - -# The name of your system or binary file to build goes here: -PGM=mocklib - -# Set the config you are building for. See these pages for details: -# http://cc65.github.io/cc65/doc/apple2.html#s4 -# http://cc65.github.io/cc65/doc/apple2enh.html#s4 -# -# Uncomment the one you want below (the first one is the default): -# MACHINE = apple2 -# MACHINE = apple2-dos33 -MACHINE = apple2-system -# MACHINE = apple2-loader -# MACHINE = apple2-reboot -# MACHINE = apple2enh -# MACHINE = apple2enh-dos33 -# MACHINE = apple2enh-system -# MACHINE = apple2enh-loader -# MACHINE = apple2enh-reboot - -# Uncomment and set this to your starting address in Apple II memory -# if necessary: -# START_ADDR = 6000 - -# Set the default CPU to assemble for. You can change this in the -# body of a .s file using control commands like ".PC02". Uncomment -# the one you want below (the first one is the default): -# CPU = 6502 -# CPU = 65SC02 -# CPU = 65C02 -# CPU = 65816 -# Note: You can assemble for 65816 in 16-bit mode but the C compiler -# will only produce 8-bit code. - -# Any *.c files in your main project directory will automatically be -# built. But, if you have subdirectories with C files in them, you -# should add them to the list of C_SRCS to build. Do that by -# uncommenting the following line and changing "someSubDir" to match -# the subdirectory you have created. Add multiple lines like this -# for each subdirectory: -# C_SRCS += $(wildcard someSubDir/*.c) - -# Any *.s files in your main project directory will automatically be -# built. But, if you have subdirectories with assembly files in them, -# you should add them to the list of ASM_SRCS to build. Do that by -# uncommenting the following line and changing "someSubDir" to match -# the subdirectory you have created. Add multiple lines like this -# for each subdirectory: -# ASM_SRCS += $(wildcard someSubDir/*.s) - -# If you have a non-standard cc65 install, you may need to change -# some of these. Uncomment the following line and change it to the -# correct path to CC65_HOME if the default is not correct: -# export CC65_HOME := /usr/local/lib/cc65 -# -# If the path to the cc65 binaries is not correct, uncomment this -# line and change it: -# CC65_BIN = /usr/local/bin - -# If you want to add arguments to the compile commandline, add them -# to this variable: -# CFLAGS += -Os - -# If you want to add arguments to the assembly commandline, add them -# to this variable: -# ASMFLAGS += -g - -# If you want to add arguments to the link commandline, add them to -# this variable: -# LDFLAGS += -v - -# If you have java installed in a non-standard location, you can set -# the path to it by uncommenting the following line: -# export JAVA=/usr/bin/java - - -# Do not change anything else below here... -include make/tail.mk diff --git a/mocktest/a2e.stdmou.s b/mocktest/a2e.stdmou.s deleted file mode 100644 index 4dfb3b3..0000000 --- a/mocktest/a2e.stdmou.s +++ /dev/null @@ -1,427 +0,0 @@ -; -; File generated by co65 v 2.13.3 using model `cc65-module' -; -.fopt compiler,"co65 v 2.13.3" -.case on -.debuginfo off -.export _a2e_stdmou_mou - -; -; CODE SEGMENT -; -.segment "CODE" -_a2e_stdmou_mou: - .byte $6D - .byte $6F - .byte $75 - .byte $02 - .word _a2e_stdmou_mou+41 - .word _a2e_stdmou_mou+170 - .word _a2e_stdmou_mou+286 - .word _a2e_stdmou_mou+295 - .word _a2e_stdmou_mou+180 - .word _a2e_stdmou_mou+238 - .word _a2e_stdmou_mou+253 - .word _a2e_stdmou_mou+299 - .word _a2e_stdmou_mou+305 - .word _a2e_stdmou_mou+309 - .word _a2e_stdmou_mou+322 - .word _a2e_stdmou_mou+327 - .byte $40 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $A9 - .byte $00 - .byte $85 - .byte <(ZEROPAGE+8) - .byte $A9 - .byte $C0 - .byte $85 - .byte <(ZEROPAGE+9) - .byte $E6 - .byte <(ZEROPAGE+9) - .byte $A5 - .byte <(ZEROPAGE+9) - .byte $C9 - .byte $C8 - .byte $90 - .byte $05 - .byte $A9 - .byte $04 - .byte $A2 - .byte $00 - .byte $60 - .byte $A2 - .byte $03 - .byte $BC - .word _a2e_stdmou_mou+421 - .byte $BD - .word _a2e_stdmou_mou+425 - .byte $D1 - .byte <(ZEROPAGE+8) - .byte $D0 - .byte $E7 - .byte $CA - .byte $10 - .byte $F3 - .byte $A5 - .byte <(ZEROPAGE+9) - .byte $8D - .word DATA+2 - .byte $8D - .word DATA+7 - .byte $8D - .word DATA+12 - .byte $78 - .byte $29 - .byte $0F - .byte $8D - .word BSS+13 - .byte $0A - .byte $0A - .byte $0A - .byte $0A - .byte $8D - .word DATA+9 - .byte $2C - .byte $82 - .byte $C0 - .byte $A2 - .byte $19 - .byte $20 - .word DATA+0 - .byte $2C - .byte $80 - .byte $C0 - .byte $A9 - .byte $01 - .byte $A2 - .byte $12 - .byte $20 - .word DATA+0 - .byte $A9 - .byte <(_a2e_stdmou_mou+173) - .byte $A2 - .byte >(_a2e_stdmou_mou+429) - .byte $20 - .word _a2e_stdmou_mou+180 - .byte $AE - .word BSS+13 - .byte $A9 - .byte $8B - .byte $9D - .byte $78 - .byte $04 - .byte $A9 - .byte $00 - .byte $9D - .byte $78 - .byte $05 - .byte $A9 - .byte $5F - .byte $9D - .byte $F8 - .byte $04 - .byte $A9 - .byte $00 - .byte $9D - .byte $F8 - .byte $05 - .byte $A2 - .byte $16 - .byte $20 - .word DATA+0 - .byte $20 - .word _a2e_stdmou_mou+372 - .byte $A9 - .byte $09 - .byte $A2 - .byte $12 - .byte $20 - .word DATA+0 - .byte $58 - .byte $A9 - .byte $00 - .byte $A2 - .byte $00 - .byte $60 - .byte $78 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $A9 - .byte $00 - .byte $A2 - .byte $12 - .byte $D0 - .byte $ED - .byte $85 - .byte <(ZEROPAGE+8) - .byte $86 - .byte <(ZEROPAGE+9) - .byte $A2 - .byte $00 - .byte $A0 - .byte $00 - .byte $20 - .word _a2e_stdmou_mou+195 - .byte $A2 - .byte $01 - .byte $A0 - .byte $02 - .byte $78 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $78 - .byte $04 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $78 - .byte $05 - .byte $C8 - .byte $C8 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $F8 - .byte $04 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $F8 - .byte $05 - .byte $8A - .byte $A2 - .byte $17 - .byte $D0 - .byte $B3 - .byte $85 - .byte <(ZEROPAGE+8) - .byte $86 - .byte <(ZEROPAGE+9) - .byte $A0 - .byte $07 - .byte $B9 - .word BSS+0 - .byte $91 - .byte <(ZEROPAGE+8) - .byte $88 - .byte $10 - .byte $F8 - .byte $60 - .byte $AC - .word BSS+13 - .byte $78 - .byte $99 - .byte $F8 - .byte $04 - .byte $8A - .byte $99 - .byte $F8 - .byte $05 - .byte $98 - .byte $AA - .byte $A0 - .byte $00 - .byte $B1 - .byte <(ZEROPAGE+0) - .byte $C8 - .byte $9D - .byte $78 - .byte $04 - .byte $B1 - .byte <(ZEROPAGE+0) - .byte $9D - .byte $78 - .byte $05 - .byte $20 - .word _a2e_stdmou_mou+372 - .byte $A2 - .byte $16 - .byte $D0 - .byte $83 - .byte $CE - .word BSS+14 - .byte $78 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $58 - .byte $60 - .byte $EE - .word BSS+14 - .byte $60 - .byte $AD - .word BSS+12 - .byte $A2 - .byte $00 - .byte $60 - .byte $A0 - .byte $03 - .byte $D0 - .byte $02 - .byte $A0 - .byte $04 - .byte $78 - .byte $B9 - .word BSS+8 - .byte $91 - .byte <(ZEROPAGE+8) - .byte $88 - .byte $10 - .byte $F8 - .byte $58 - .byte $60 - .byte $A9 - .byte $05 - .byte $A2 - .byte $00 - .byte $60 - .byte $AD - .word BSS+13 - .byte $F0 - .byte $08 - .byte $A2 - .byte $13 - .byte $20 - .word DATA+0 - .byte $90 - .byte $02 - .byte $18 - .byte $60 - .byte $A2 - .byte $14 - .byte $20 - .word DATA+0 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $78 - .byte $07 - .byte $AA - .byte $0A - .byte $29 - .byte $20 - .byte $F0 - .byte $02 - .byte $A9 - .byte $01 - .byte $90 - .byte $02 - .byte $09 - .byte $10 - .byte $8D - .word BSS+12 - .byte $8A - .byte $29 - .byte $20 - .byte $F0 - .byte $27 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $78 - .byte $04 - .byte $BE - .byte $78 - .byte $05 - .byte $8D - .word BSS+8 - .byte $8E - .word BSS+9 - .byte $20 - .word _a2e_stdmou_mou+35 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $F8 - .byte $04 - .byte $BE - .byte $F8 - .byte $05 - .byte $8D - .word BSS+10 - .byte $8E - .word BSS+11 - .byte $20 - .word _a2e_stdmou_mou+38 - .byte $AD - .word BSS+14 - .byte $F0 - .byte $03 - .byte $20 - .word _a2e_stdmou_mou+32 - .byte $38 - .byte $60 - .byte $05 - .byte $07 - .byte $0B - .byte $0C - .byte $38 - .byte $18 - .byte $01 - .byte $20 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $17 - .byte $01 - .byte $BF - .byte $00 - -; -; DATA SEGMENT -; -.segment "DATA" -DATA: - .byte $BC - .byte $00 - .byte $FF - .byte $8C - .word DATA+11 - .byte $A2 - .byte $FF - .byte $A0 - .byte $FF - .byte $4C - .byte $FF - .byte $FF - -; -; BSS SEGMENT -; -.segment "BSS" -BSS: - .res 15 - -; -; ZEROPAGE SEGMENT -; -.import __ZP_START__ ; Linker generated symbol -ZEROPAGE = __ZP_START__ - -.end diff --git a/mocktest/make/AppleCommander.jar b/mocktest/make/AppleCommander.jar deleted file mode 100644 index f74e7cb..0000000 Binary files a/mocktest/make/AppleCommander.jar and /dev/null differ diff --git a/mocktest/make/createDiskImage b/mocktest/make/createDiskImage deleted file mode 100755 index 276c036..0000000 --- a/mocktest/make/createDiskImage +++ /dev/null @@ -1,208 +0,0 @@ -#!/bin/sh - -if [ $# -lt 5 ] -then - echo USAGE: $0 ' ' - exit 1 -fi - -if [ -z "$JAVA" ] -then - for item in "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home" /Library/Java/JavaVirtualMachines/*/Contents/Home /usr - do - if [ -x "$item/bin/java" ] - then - JAVA="$item/bin/java" - break - fi - done -fi - -if [ -z "$JAVA" ] -then - echo Cannot find a path to a Java runtime. - echo Go to https://java.com/download if you do not have Java. - echo If you do have Java, you may need to uncomment the JAVA - echo line in the Makefile and set it to the path for your - echo Java runtime binary. - exit 1 -fi - -APPLECOMMANDER=$1 -MACHINE=$2 -DISKIMAGE=$3 -PROGRAM=$4 -STARTADDR=`echo $5 | sed 's/^0*//'` - -if [ ! -f "$PROGRAM" ] -then - echo "Cannot file executable $PROGRAM" - exit 1 -fi - -case "$MACHINE" in - apple2) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=1 - RENAMELOADER=0 - DELETEBASIC=0 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=15 - ;; - - apple2enh) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=1 - RENAMELOADER=0 - DELETEBASIC=0 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=15 - ;; - - apple2-dos33) - TEMPLATE="make/dos33_template.dsk" - DELETELOADER=0 - RENAMELOADER=0 - DELETEBASIC=0 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=30 - ;; - - apple2enh-dos33) - TEMPLATE="make/dos33_template.dsk" - DELETELOADER=0 - RENAMELOADER=0 - DELETEBASIC=0 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=30 - ;; - - apple2-system) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=1 - RENAMELOADER=0 - DELETEBASIC=1 - HASHEADER=0 - FILETYPE="sys" - TARGETFILE=`basename $PROGRAM`.system - MAXFILENAMELEN=15 - ;; - - apple2enh-system) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=1 - RENAMELOADER=0 - DELETEBASIC=1 - HASHEADER=0 - FILETYPE="sys" - TARGETFILE=`basename $PROGRAM`.system - MAXFILENAMELEN=15 - ;; - - apple2-loader) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=0 - RENAMELOADER=1 - DELETEBASIC=1 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=15 - ;; - - apple2-reboot) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=0 - RENAMELOADER=1 - DELETEBASIC=1 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=15 - ;; - - apple2enh-loader) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=0 - RENAMELOADER=1 - DELETEBASIC=1 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=15 - ;; - - apple2enh-reboot) - TEMPLATE="make/prodos_template.dsk" - DELETELOADER=0 - RENAMELOADER=1 - DELETEBASIC=1 - HASHEADER=1 - FILETYPE="bin" - TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=8 - ;; - - *) - echo "Invalid machine type $MACHINE" - exit 1 - ;; -esac - -if [ ${#TARGETFILE} -gt $MAXFILENAMELEN ] -then - echo "The filename $TARGETFILE exceeds the max name length of the filesystem ($MAXFILENAMELEN)" - exit 1 -fi - -if [ ! -f "$TEMPLATE" ] -then - echo "Cannot file template disk image $TEMPLATE" - exit 1 -fi - -cp "$TEMPLATE" "$DISKIMAGE" - -if [ $DELETELOADER -eq 1 ] -then - "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" LOADER.SYSTEM -fi - -if [ $RENAMELOADER -eq 1 ] -then - LOADERFILE=${TARGETFILE}.system - if [ ${#LOADERFILE} -gt $MAXFILENAMELEN ] - then - echo "The filename $LOADERFILE exceeds the max name length of the filesystem ($MAXFILENAMELEN)" - rm -f "$DISKIMAGE" - exit 1 - fi - "$JAVA" -jar "$APPLECOMMANDER" -e "$DISKIMAGE" LOADER.SYSTEM | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$LOADERFILE" sys - "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" LOADER.SYSTEM -fi - -if [ $DELETEBASIC -eq 1 ] -then - "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" BASIC.SYSTEM -fi - -if [ $HASHEADER -eq 1 ] -then - HDR_STARTADDR=`od -t x2 -N 2 < "$PROGRAM" | head -1 | awk '{print $2}' | sed 's/^0*//'` - if [ "$HDR_STARTADDR" = "$STARTADDR" ] - then - dd if="$PROGRAM" bs=4 skip=1 | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR - else - "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR < "$PROGRAM" - fi -else - "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE < "$PROGRAM" -fi diff --git a/mocktest/make/head.mk b/mocktest/make/head.mk deleted file mode 100644 index 0710ce8..0000000 --- a/mocktest/make/head.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# head.mk -# Apple2BuildPipelineSample -# -# Part of a sample build pipeline for Apple II software development -# -# Created by Quinn Dunki on 8/15/14. -# One Girl, One Laptop Productions -# http://www.quinndunki.com -# http://www.quinndunki.com/blondihacks -# - -export CC65_HOME := /usr/local/lib/cc65 - -CC65_BIN = /usr/local/bin - -CL65=$(CC65_BIN)/cl65 -CA65=$(CC65_BIN)/ca65 -CC65=$(CC65_BIN)/cc65 - -AC=make/AppleCommander.jar - -C_SRCS=$(wildcard *.c) -ASM_SRCS=$(wildcard *.s) - -MACHINE=apple2 -CPU=6502 -CFLAGS= -ASMFLAGS= -LDFLAGS= diff --git a/mocktest/make/prodos_template.dsk b/mocktest/make/prodos_template.dsk deleted file mode 100644 index 7973ad7..0000000 Binary files a/mocktest/make/prodos_template.dsk and /dev/null differ diff --git a/mocktest/make/tail.mk b/mocktest/make/tail.mk deleted file mode 100644 index 4bca120..0000000 --- a/mocktest/make/tail.mk +++ /dev/null @@ -1,107 +0,0 @@ -# -# tail.mk -# Apple2BuildPipelineSample -# -# Part of a sample build pipeline for Apple II software development -# -# Created by Quinn Dunki on 8/15/14. -# One Girl, One Laptop Productions -# http://www.quinndunki.com -# http://www.quinndunki.com/blondihacks -# - -export PATH := $(PATH):$(CC65_BIN) - -CWD=$(shell pwd) - -C_OBJS=$(C_SRCS:.c=.o) -C_DEPS=$(C_SRCS:.c=.u) -ASM_OBJS=$(ASM_SRCS:.s=.o) -ASM_LSTS=$(ASM_SRCS:.s=.lst) -OBJS=$(C_OBJS) $(ASM_OBJS) - -MAPFILE=$(PGM).map -DISKIMAGE=$(PGM).dsk - -LINK_ARGS= - -EXECCMD= - -ALLTARGET=$(DISKIMAGE) -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) - ALLTARGET=execute -endif - -ifneq ($(START_ADDR),) -# If the MACHINE is set to an option which does not support a variable start -# address, then error. - ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) - $(error You cannot change start address with this machine type) - endif -else - # If not set, then use the default for the config as per cc65 documentation - ifneq ($(filter $(MACHINE), apple2 apple2-dos33 apple2enh apple2enh-dos33),) - START_ADDR=803 - endif - ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) - START_ADDR=2000 - endif - ifneq ($(filter $(MACHINE), apple2-loader apple2-reboot apple2enh-loader apple2enh-reboot),) - START_ADDR=800 - endif -endif -LDFLAGS += --start-addr 0x$(START_ADDR) - -ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),) - EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') -endif - -MACHCONFIG= -t apple2 - -ifneq ($(filter $(MACHINE), apple2enh apple2apple2enh-dos33 apple2enh-system apple2enh-loader apple2enh-reboot),) - MACHCONFIG= -t apple2enh -endif - -ifeq ($(filter $(MACHINE), apple2 apple2enh),) - MACHCONFIG += -C $(MACHINE).cfg -endif - -.PHONY: all execute clean - -all: $(ALLTARGET) - -clean: - rm -f "$(PGM)" - rm -f $(OBJS) - rm -f $(C_DEPS) - rm -f $(MAPFILE) - rm -f $(ASM_LSTS) - rm -f "$(DISKIMAGE)" - -createPackage: - pkg/createPackage - -cleanMacCruft: - rm -rf pkg - -$(PGM): $(OBJS) - $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS) - -$(DISKIMAGE): $(PGM) - make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" - -execute: $(DISKIMAGE) - osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" - -%.o: %.c - $(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $< - sed -i .bak 's/\.s:/.o:/' $(@:.o=.u) - rm -f $(@:.o=.u).bak - -%.o: %.s - $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) -l -c -o $@ $< - -$(OBJS): Makefile - --include $(C_DEPS)