Index: generators/library/FuncArrayGenerator.m
==================================================================
--- generators/library/FuncArrayGenerator.m
+++ generators/library/FuncArrayGenerator.m
@@ -65,14 +65,14 @@
- (void)generate
{
[_include writeString: COPYRIGHT];
[_include writeString:
- @"/* This file is automatically generated from library.xml */\n"
- @"\n"];
+ @"/* This file is automatically generated from "
+ @"amiga-library.xml */\n\n"];
for (OFXMLElement *function in [_library elementsForName: @"function"])
[_include writeFormat:
@"(CONST_APTR)glue_%@,\n",
[function attributeForName: @"name"].stringValue];
}
@end
Index: generators/library/GlueGenerator.m
==================================================================
--- generators/library/GlueGenerator.m
+++ generators/library/GlueGenerator.m
@@ -70,15 +70,16 @@
{
[_header writeString: COPYRIGHT];
[_impl writeString: COPYRIGHT];
[_header writeString:
- @"/* This file is automatically generated from library.xml */\n"
- @"\n"];
+ @"/* This file is automatically generated from "
+ @"amiga-library.xml */\n\n"];
[_impl writeString:
- @"/* This file is automatically generated from library.xml */\n"
+ @"/* This file is automatically generated from "
+ @"amiga-library.xml */\n"
@"\n"
@"#include \"config.h\"\n"
@"\n"
@"#import \"amiga-glue.h\"\n"
@"\n"];
Index: generators/library/LibraryGenerator.m
==================================================================
--- generators/library/LibraryGenerator.m
+++ generators/library/LibraryGenerator.m
@@ -34,11 +34,11 @@
- (void)generateInDirectory: (OFString *)directory
{
OFURL *sourcesURL = [[OFFileManager defaultManager].currentDirectoryURL
URLByAppendingPathComponent: directory];
OFURL *libraryURL = [sourcesURL
- URLByAppendingPathComponent: @"library.xml"];
+ URLByAppendingPathComponent: @"amiga-library.xml"];
OFURL *linkLibURL = [sourcesURL
URLByAppendingPathComponent: @"linklib/linklib.m"];
OFURL *glueHeaderURL = [sourcesURL
URLByAppendingPathComponent: @"amiga-glue.h"];
OFURL *glueURL = [sourcesURL
Index: generators/library/LinkLibGenerator.m
==================================================================
--- generators/library/LinkLibGenerator.m
+++ generators/library/LinkLibGenerator.m
@@ -69,11 +69,12 @@
OFArray OF_GENERIC(OFXMLElement *) *functions;
size_t funcIndex = 0;
[_impl writeString: COPYRIGHT];
[_impl writeString:
- @"/* This file is automatically generated from library.xml */\n"
+ @"/* This file is automatically generated from "
+ @"amiga-library.xml */\n"
@"\n"
@"#include \"config.h\"\n"
@"\n"];
for (OFXMLElement *include in [_library elementsForName: @"include"])
@@ -145,12 +146,11 @@
[_impl writeString: @", "];
[_impl writeString: argType];
if (![argType hasSuffix: @"*"])
[_impl writeString: @" "];
- [_impl writeFormat: @"__asm__(\"%@\")",
- m68kReg];
+ [_impl writeFormat: @"__asm__(\"%@\")", m68kReg];
}
[_impl writeFormat: @"))(((uintptr_t)%@) - %zu))(",
libBase, 30 + funcIndex * 6];
Index: src/amiga-funcarray.inc
==================================================================
--- src/amiga-funcarray.inc
+++ src/amiga-funcarray.inc
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
(CONST_APTR)glue_OFInit,
(CONST_APTR)glue_OFAllocMemory,
(CONST_APTR)glue_OFAllocZeroedMemory,
(CONST_APTR)glue_OFResizeMemory,
Index: src/amiga-glue.h
==================================================================
--- src/amiga-glue.h
+++ src/amiga-glue.h
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#import "amiga-library.h"
#import "OFObject.h"
#import "OFStdIOStream.h"
#import "OFApplication.h"
Index: src/amiga-glue.m
==================================================================
--- src/amiga-glue.m
+++ src/amiga-glue.m
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#include "config.h"
#import "amiga-glue.h"
ADDED src/amiga-library.xml
Index: src/amiga-library.xml
==================================================================
--- src/amiga-library.xml
+++ src/amiga-library.xml
@@ -0,0 +1,222 @@
+
+ amiga-library.h
+
+
+
+
+
+
+ OFObject.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OFStdIOStream.h
+
+
+
+
+
+
+
+ OFApplication.h
+
+
+
+
+
+ OFBlock.h
+
+
+
+
+
+
+ OFDNSResourceRecord.h
+
+
+
+
+
+
+
+
+
+
+
+
+ OFHTTPRequest.h
+
+
+
+
+
+
+ OFHTTPResponse.h
+
+
+
+ OFList.h
+
+
+
+
+
+
+
+
+
+ OFMethodSignature.h
+
+
+
+
+
+
+ OFOnce.h
+
+
+
+
+ OFPBKDF2.h
+
+
+
+ OFScrypt.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OFSocket.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OFStrPTime.h
+
+
+
+
+
+
+ OFString.h
+
+
+
+
+
+
+
+
+
+
+
+
+ OFZIPArchiveEntry.h
+
+
+
+
+
+
+
+
+
+
+
+
DELETED src/library.xml
Index: src/library.xml
==================================================================
--- src/library.xml
+++ src/library.xml
@@ -1,222 +0,0 @@
-
- amiga-library.h
-
-
-
-
-
-
- OFObject.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OFStdIOStream.h
-
-
-
-
-
-
-
- OFApplication.h
-
-
-
-
-
- OFBlock.h
-
-
-
-
-
-
- OFDNSResourceRecord.h
-
-
-
-
-
-
-
-
-
-
-
-
- OFHTTPRequest.h
-
-
-
-
-
-
- OFHTTPResponse.h
-
-
-
- OFList.h
-
-
-
-
-
-
-
-
-
- OFMethodSignature.h
-
-
-
-
-
-
- OFOnce.h
-
-
-
-
- OFPBKDF2.h
-
-
-
- OFScrypt.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OFSocket.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OFStrPTime.h
-
-
-
-
-
-
- OFString.h
-
-
-
-
-
-
-
-
-
-
-
-
- OFZIPArchiveEntry.h
-
-
-
-
-
-
-
-
-
-
-
-
Index: src/linklib/linklib.m
==================================================================
--- src/linklib/linklib.m
+++ src/linklib/linklib.m
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#include "config.h"
#import "amiga-library.h"
#import "OFObject.h"
Index: src/runtime/amiga-funcarray.inc
==================================================================
--- src/runtime/amiga-funcarray.inc
+++ src/runtime/amiga-funcarray.inc
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
(CONST_APTR)glue_objc_init,
(CONST_APTR)glue___objc_exec_class,
(CONST_APTR)glue_objc_msg_lookup,
(CONST_APTR)glue_objc_msg_lookup_stret,
Index: src/runtime/amiga-glue.h
==================================================================
--- src/runtime/amiga-glue.h
+++ src/runtime/amiga-glue.h
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#import "ObjFWRT.h"
#import "private.h"
#ifdef OF_AMIGAOS_M68K
Index: src/runtime/amiga-glue.m
==================================================================
--- src/runtime/amiga-glue.m
+++ src/runtime/amiga-glue.m
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#include "config.h"
#import "amiga-glue.h"
ADDED src/runtime/amiga-library.xml
Index: src/runtime/amiga-library.xml
==================================================================
--- src/runtime/amiga-library.xml
+++ src/runtime/amiga-library.xml
@@ -0,0 +1,345 @@
+
+ ObjFWRT.h
+ private.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
DELETED src/runtime/library.xml
Index: src/runtime/library.xml
==================================================================
--- src/runtime/library.xml
+++ src/runtime/library.xml
@@ -1,345 +0,0 @@
-
- ObjFWRT.h
- private.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: src/runtime/linklib/linklib.m
==================================================================
--- src/runtime/linklib/linklib.m
+++ src/runtime/linklib/linklib.m
@@ -11,11 +11,11 @@
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
#include "config.h"
#import "ObjFWRT.h"
#import "private.h"