Changeset 17870 in project


Ignore:
Timestamp:
04/20/10 08:42:54 (11 years ago)
Author:
Jim Ursetto
Message:

objc: Move objc-base to objc, other cleanups.

Location:
release/4/objc/trunk
Files:
1 deleted
12 edited
1 moved

Legend:

Unmodified
Added
Removed
  • release/4/objc/trunk/LICENSE

    r9966 r17870  
    1 Copyright (c) 2005, J. "Zb" Ursetto.  All rights reserved.
     1Copyright (c) 2005-2010, Jim Ursetto.  All rights reserved.
    22
    33Permission is hereby granted, free of charge, to any person obtaining a
  • release/4/objc/trunk/objc-cocoa.scm

    r17869 r17870  
    99(import foreign)
    1010(require-library srfi-13)
    11 (require-extension extras lolevel objc-base)
     11(require-extension extras lolevel objc)
    1212(import-for-syntax (only srfi-13 string-upcase))
    1313
  • release/4/objc/trunk/objc.meta

    r14899 r17870  
    1010        "classes.scm" "alignment.scm" "array.scm" "convert.scm"
    1111        "objc-runtime.h" "tests" "debug" "doc" "cocoa.scm" "scheme-object.h"
    12         "scheme-object.m" "objc-class-proxies.scm" "objc-class-proxies-bin.scm"
    13         "objc-base.scm"))
     12        "scheme-object.m" "objc-class-proxies.scm" "objc-class-proxies-bin.scm"))
  • release/4/objc/trunk/objc.scm

    r17869 r17870  
    33;(objc:import-classes-at-toplevel!)
    44
    5 (module objc-base
     5(module objc
    66  (
    77   define-objc-class
  • release/4/objc/trunk/objc.setup

    r17869 r17870  
    1212;; Uhh, I guess make body already in quasiquote
    1313
    14 (make (("objc-base.so"
     14(make (("objc.so"
    1515        ("objc-support.scm" "classes.scm" "alignment.scm"
    16          "array.scm" "convert.scm" "objc-base.scm" "objc-runtime.h"
     16         "array.scm" "convert.scm" "objc.scm" "objc-runtime.h"
    1717         "scheme-object.m" "scheme-object.h"
    1818         "objc-class-proxies.scm" "objc-class-proxies-bin.scm")
    19         (compile objc-base.scm scheme-object.m -s -objc -O2 -d1 -j objc-base
     19        (compile objc.scm scheme-object.m -s -objc -O2 -d1 -j objc
    2020                 ,@(if easyffi? '(-extend easyffi) '())
    2121                 -lffi -I/usr/include/ffi -framework Foundation ,dbg)
    22         (compile objc-base.import.scm -s -O2 -d0))
    23        ("cocoa.so" ("objc-cocoa.scm" "objc-base.so")
     22        (compile objc.import.scm -s -O2 -d0))
     23       ("cocoa.so" ("objc-cocoa.scm" "objc.so")
    2424        (compile -s objc-cocoa.scm -o cocoa.so -objc -O2 -d1 -j cocoa
    2525                 ,@(if easyffi? '(-extend easyffi) '())
    2626                 -framework Cocoa ,dbg)
    2727        (compile -s cocoa.import.scm -O2 -d0)))
    28   '#("objc-base.so" "cocoa.so"))
     28  '#("objc.so" "cocoa.so"))
    2929
    3030(install-extension
     
    3434
    3535(install-extension
    36  'objc-base
    37  `("objc-base.so" "objc-base.import.so")
     36 'objc
     37 `("objc.so" "objc.import.so")
    3838 `((version ,version)))
    3939
  • release/4/objc/trunk/tests/Temperature Converter.app/Contents/MacOS/Makefile

    r17869 r17870  
    11TemperatureConverter: temp-converter.scm
    2         csc -O2 -o "TemperatureConverter" temp-converter.scm -X objc-base -kv
     2        csc -O2 -o "TemperatureConverter" temp-converter.scm -X objc -kv
    33
    44clean:
  • release/4/objc/trunk/tests/Temperature Converter.app/Contents/MacOS/temp-converter.scm

    r17869 r17870  
    22;;; Derived from the gauche-objc bridge test application.
    33
    4 ;; `-X objc-base` required at compile time solely to
     4;; `-X objc` required at compile time solely to
    55;; enable @ read syntax.
    66
    7 (use cocoa objc-base)
     7(use cocoa objc)
    88
    99(ns:beep)
  • release/4/objc/trunk/tests/ffi-structs.scm

    r17869 r17870  
    11;;; ffi struct pass-by-valuetests
    22
    3 (use objc-base testeez)
     3(use objc testeez)
    44
    55(define-objc-class FFIStructs NSObject ()
  • release/4/objc/trunk/tests/objc-proxy-test.scm

    r17869 r17870  
    1 (use objc-base)
     1(use objc)
    22(require-library typetest)
    33(define-objc-classes TypeTest)
  • release/4/objc/trunk/tests/proxy.scm

    r17869 r17870  
    11;;; proxy testing
    22
    3 (use objc-base)
     3(use objc)
    44(require-library typetest)
    55
  • release/4/objc/trunk/tests/proxy2.scm

    r17869 r17870  
    1 (use objc-base)
     1(use objc)
    22
    33(define-objc-class MyPoint NSObject ((DBL x) (DBL y))
  • release/4/objc/trunk/tests/typetest.scm

    r17867 r17870  
    1 (use objc-base)
     1(use objc)
    22(define-objc-classes TypeTest)
  • release/4/objc/trunk/tests/unit-test.scm

    r17868 r17870  
    11;;; tests
    22
    3 (use objc-base testeez)
     3(use objc testeez)
    44(require-library typetest)
    55(objc:import-classes-at-toplevel!)
Note: See TracChangeset for help on using the changeset viewer.