Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finalize Objective-C support, closing PR 4200 by Peter Simons: 

- add /usr/include/objc to mtree
- set libobjc/Makefile INCSDIR=/usr/include/objc
- put to-be-installed includes to libobjc/Makefile into INCS=
- add the Objective-C source files to the appropriate lists.
- as the objc include files are installed now, no need to patch most
  of the files.
- add /usr/include/obj/* to src/distrib/comp/mi
The changes have been applied to gcc2netbsd, and this script was then used
to create the new version of the files in libobjc/.
This commit is contained in:
is 1997-10-22 12:56:37 +00:00
parent c289655641
commit 560b960e0d
17 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/sets/lists/comp/mi
View File

@ -726,6 +726,16 @@
./usr/include/nfs/xdr_subs.h
./usr/include/nl_types.h
./usr/include/nlist.h
./usr/include/objc/NXConstStr.h
./usr/include/objc/Object.h
./usr/include/objc/Protocol.h
./usr/include/objc/encoding.h
./usr/include/objc/hash.h
./usr/include/objc/list.h
./usr/include/objc/objc.h
./usr/include/objc/objc-api.h
./usr/include/objc/sarray.h
./usr/include/objc/typedstream.h
./usr/include/paths.h
./usr/include/pcap-namedb.h
./usr/include/pcap.h

7
etc/mtree/NetBSD.dist
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist,v 1.52 1997/10/18 21:38:14 thorpej Exp $
# $NetBSD: NetBSD.dist,v 1.53 1997/10/22 12:56:37 is Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
/set type=dir uname=root gname=wheel mode=0755
@ -140,6 +140,11 @@ std uname=bin gname=bin mode=0755
# ./usr/include/g++
..
# ./usr/include/objc
objc uname=bin gname=bin mode=0755
# ./usr/include/objc
..
# ./usr/include/kerberosIV
kerberosIV uname=bin gname=bin mode=0755
# ./usr/include/kerberosIV

36
gnu/usr.bin/gcc/gcc2netbsd
View File

@ -1,6 +1,6 @@
#!/usr/gnu/bin/perl
#
# $NetBSD: gcc2netbsd,v 1.26 1997/10/18 06:21:32 lukem Exp $
# $NetBSD: gcc2netbsd,v 1.27 1997/10/22 12:56:54 is Exp $
#
# Perl script to convert a standard distribution directory for gcc into
# a NetBSD source tree.
@ -20,6 +20,7 @@
# Updated November 29, 1995 for gcc-2.7.2
# Updated May 13, 1997 for gcc-2.7.2.1
# Updated May 14, 1997 for gcc-2.7.2.2
# Updated Oct 21, 1997 to complete objc-support (Ignatios Souvatzis)
#
# This is currently updated for gcc-2.7.2.2. Newer versions of gcc
# should have this script and related files updated.
@ -109,14 +110,14 @@ $version = "2.7.2.2";
@libgccof = ("gbl-ctors.h");
@libobjcf = ("archive.c", "class.c", "encoding.c", "hash.c", "init.c",
@libobjcf = ("NXConstStr.m", "Object.m", "Protocol.m",
"archive.c", "class.c", "encoding.c", "hash.c", "init.c",
"misc.c", "objects.c", "sarray.c", "selector.c",
"sendmsg.c");
@libobjcof = ("NXConstStr.h", "NXConstStr.m", "Object.h", "Object.m",
"Protocol.h", "Protocol.m", "encoding.h", "hash.h",
"list.h", "objc-api.h", "objc.h", "runtime.h",
"sarray.h", "typedstream.h");
@libobjcof = ("NXConstStr.h", "Object.h", "Protocol.h",
"encoding.h", "hash.h", "list.h", "objc-api.h",
"objc.h", "runtime.h", "sarray.h", "typedstream.h");
@genh = ("attr", "flags", "codes", "config");
@ -128,20 +129,7 @@ $gendep = "rtl.o obstack.o";
$bcdep = "bi-parser.o bi-lexer.o bi-reverse.o obstack.o";
%sedlist = ("libobjc/NXConstStr.h","'s/objc\\///g'",
"libobjc/NXConstStr.m","'s/objc\\///g'",
"libobjc/Object.h","'s/objc\\///g'",
"libobjc/Object.m","'s/objc\\///g'",
"libobjc/Protocol.h","'s/objc\\///g'",
"libobjc/Protocol.m","'s/objc\\///g'",
"libobjc/encoding.h","'s/objc\\///g'",
"libobjc/hash.c","'s/objc\\///g'",
"libobjc/objc-api.h","'s/objc\\///g'",
"libobjc/runtime.h","'s/objc\\///g'",
"libobjc/sarray.c","'s/objc\\///g'",
"libobjc/selector.c","'s/objc\\///g'",
"libobjc/typedstream.h","'s/objc\\///g'",
"libobjc/objects.c","'s/\\.\\.\\///g'",
%sedlist = ("libobjc/objects.c","'s/\\.\\.\\///g'",
"libobjc/sendmsg.c","'s/\\.\\.\\///g'");
#
@ -750,12 +738,20 @@ ${LIB2SOBJS}: libgcc2.c
%% NetBSD
LIB= objc
INCSDIR=/usr/include/objc
INCS= NXConstStr.h Object.h Protocol.h \
encoding.h hash.h list.h objc.h objc-api.h sarray.h typedstream.h
NOPROFILE=
NOPIC=
.SUFFIXES: .o .m
.m.o: ; ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
%% srcs objc
.include <bsd.lib.mk>

17
gnu/usr.bin/gcc/libobjc/Makefile
View File

@ -1,13 +1,22 @@
# $NetBSD: Makefile,v 1.2 1997/05/13 21:02:02 phil Exp $
# $NetBSD: Makefile,v 1.3 1997/10/22 12:57:07 is Exp $
LIB= objc
INCSDIR=/usr/include/objc
INCS= NXConstStr.h Object.h Protocol.h \
encoding.h hash.h list.h objc.h objc-api.h sarray.h typedstream.h
NOPROFILE=
NOPIC=
.SUFFIXES: .o .m
.m.o: ; ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
SRCS= archive.c class.c encoding.c hash.c init.c \
misc.c objects.c sarray.c selector.c sendmsg.c \
SRCS= NXConstStr.m Object.m Protocol.m archive.c class.c \
encoding.c hash.c init.c misc.c objects.c \
sarray.c selector.c sendmsg.c
.include <bsd.lib.mk>

2
gnu/usr.bin/gcc/libobjc/NXConstStr.h
View File

@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#ifndef __nxconstantstring_INCLUDE_GNU
#define __nxconstantstring_INCLUDE_GNU
#include "Object.h"
#include "objc/Object.h"
@interface NXConstantString: Object
{

2
gnu/usr.bin/gcc/libobjc/NXConstStr.m
View File

@ -19,7 +19,7 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "NXConstStr.h"
#include "objc/NXConstStr.h"
@implementation NXConstantString

4
gnu/usr.bin/gcc/libobjc/Object.h
View File

@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
#ifndef __object_INCLUDE_GNU
#define __object_INCLUDE_GNU
#include <objc.h>
#include <typedstream.h>
#include <objc/objc.h>
#include <objc/typedstream.h>
/*
* All classes are derived from Object. As such,

6
gnu/usr.bin/gcc/libobjc/Object.m
View File

@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA. */
executable file might be covered by the GNU General Public License. */
#include <stdarg.h>
#include "Object.h"
#include "Protocol.h"
#include "objc-api.h"
#include "objc/Object.h"
#include "objc/Protocol.h"
#include "objc/objc-api.h"
extern void (*_objc_error)(id object, const char *format, va_list);

2
gnu/usr.bin/gcc/libobjc/Protocol.h
View File

@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */
#ifndef __Protocol_INCLUDE_GNU
#define __Protocol_INCLUDE_GNU
#include "Object.h"
#include "objc/Object.h"
@interface Protocol : Object
{

4
gnu/usr.bin/gcc/libobjc/Protocol.m
View File

@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
#include "Protocol.h"
#include "objc-api.h"
#include "objc/Protocol.h"
#include "objc/objc-api.h"
/* Method description list */
struct objc_method_description_list {

2
gnu/usr.bin/gcc/libobjc/encoding.h
View File

@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */
#define __encoding_INCLUDE_GNU
#include <ctype.h>
#include "objc-api.h"
#include "objc/objc-api.h"
#define _C_CONST 'r'
#define _C_IN 'n'

4
gnu/usr.bin/gcc/libobjc/hash.c
View File

@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
#include "assert.h"
#include "hash.h"
#include "objc.h"
#include "objc/hash.h"
#include "objc/objc.h"
#include "runtime.h" /* for DEBUG_PRINTF */

4
gnu/usr.bin/gcc/libobjc/objc-api.h
View File

@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
#ifndef __objc_api_INCLUDE_GNU
#define __objc_api_INCLUDE_GNU
#include "objc.h"
#include "hash.h"
#include "objc/objc.h"
#include "objc/hash.h"
#include <stdio.h>
/* For functions which return Method_t */

8
gnu/usr.bin/gcc/libobjc/runtime.h
View File

@ -34,11 +34,11 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stddef.h> /* so noone else will get system versions */
#include "assert.h"
#include "objc.h" /* core data types */
#include "objc-api.h" /* runtime api functions */
#include "objc/objc.h" /* core data types */
#include "objc/objc-api.h" /* runtime api functions */
#include "hash.h" /* hash structures */
#include "list.h" /* linear lists */
#include "objc/hash.h" /* hash structures */
#include "objc/list.h" /* linear lists */
extern void __objc_add_class_to_hash(Class); /* (objc-class.c) */
extern void __objc_init_selector_tables(); /* (objc-sel.c) */

2
gnu/usr.bin/gcc/libobjc/sarray.c
View File

@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
#include "sarray.h"
#include "objc/sarray.h"
#include <stdio.h>
#include "assert.h"

2
gnu/usr.bin/gcc/libobjc/selector.c
View File

@ -24,7 +24,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
covered by the GNU General Public License. */
#include "runtime.h"
#include "sarray.h"
#include "objc/sarray.h"
#include "encoding.h"
/* Initial selector hash table size. Value doesn't matter much */

4
gnu/usr.bin/gcc/libobjc/typedstream.h
View File

@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
#ifndef __typedstream_INCLUDE_GNU
#define __typedstream_INCLUDE_GNU
#include "objc.h"
#include "hash.h"
#include "objc/objc.h"
#include "objc/hash.h"
#include <stdio.h>
typedef int (*objc_typed_read_func)(void*, char*, int);