diff --git a/Makefile b/Makefile index 4656e07..5dba2b2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # # Makefile -# Apple //GS Build Engine for ORCA +# Apple //GS Build Engine for ORCA and Merlin # include make/head.mk diff --git a/Makefile.merlin b/Makefile.merlin index 2bd733d..765915a 100644 --- a/Makefile.merlin +++ b/Makefile.merlin @@ -1,6 +1,6 @@ # # Makefile -# Apple //GS Build Engine for ORCA +# Apple //GS Build Engine for ORCA and Merlin # include make/head.mk diff --git a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist index 5db2a67..133d13e 100644 --- a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist @@ -147,6 +147,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist index b58c84d..9e2f590 100644 --- a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist @@ -153,6 +153,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist index 5313c01..6982eb2 100644 --- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist @@ -171,6 +171,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.rez b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.rez index 899d4c2..67fdd94 100644 --- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.rez @@ -233,8 +233,8 @@ resource rAlertString (aboutAlertString) { "\n" "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___\n" "\n" - "Contains libraries from ORCAC,\n" - "Copyright \$A9 1991, Byte Works Inc." + "\n" + "" "/^#0\$00"; }; diff --git a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist index b5b1fe2..12a4311 100644 --- a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist @@ -153,6 +153,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist index d613753..a7f10aa 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist @@ -149,6 +149,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist index 9976b34..456e6f0 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist @@ -161,6 +161,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist index 7ea22e2..7bf40c4 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist @@ -191,6 +191,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist index e1c6d8b..5285f2a 100644 --- a/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist @@ -117,6 +117,19 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist index 167feba..cecfebc 100644 --- a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist @@ -161,6 +161,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist index c746c43..1738419 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist @@ -117,6 +117,19 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist index 253b22f..0e3a5ea 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist @@ -149,6 +149,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist index d19171b..9427d5a 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist @@ -155,6 +155,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist index 4e5663f..fc484a9 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist @@ -173,6 +173,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez index 899d4c2..5a1f241 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez @@ -233,7 +233,7 @@ resource rAlertString (aboutAlertString) { "\n" "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___\n" "\n" - "Contains libraries from ORCAC,\n" + "Contains libraries from ORCAM,\n" "Copyright \$A9 1991, Byte Works Inc." "/^#0\$00"; }; diff --git a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist index f01ab60..93535f7 100644 --- a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist @@ -155,6 +155,32 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + DiskImage + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___.2mg + + ProductType com.apple.product-type.tool diff --git a/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist index 3168e0f..97ac661 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist +++ b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist @@ -117,6 +117,19 @@ + + ProductType + com.apple.product-type.tool + TargetIdentifier + com.apple.dt.commandLineToolTarget + Name + Binary + SharedSettings + + PRODUCT_NAME + ___PACKAGENAME___ + + ProductType com.apple.product-type.tool