Diff for /gforth/libcc.fs between versions 1.41 and 1.48

version 1.41, 2008/07/10 19:59:41 version 1.48, 2008/07/15 09:30:12
Line 158  variable lib-handle-addr \ points to the Line 158  variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works    here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 2variable lib-filename   \ filename without extension  2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension  2variable lib-modulename \ basename of the file without extension
   2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
   0 value libcc-path       \ pointer to path of library directories
   
 : delete-file 2drop 0 ;  : delete-file 2drop 0 ;
   
Line 441  create gen-wrapped-types Line 443  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
 : open-wrappers ( -- addr )  
     lib-filename 2@ s" .la" s+  
     \ 2dup cr type  
     2dup open-lib >r  
     drop free throw r> ;  
   
 : scan-back { c-addr u1 c -- c-addr u2 }  : scan-back { c-addr u1 c -- c-addr u2 }
     \ the last occurence of c in c-addr u1 is at u2-1; if it does not      \ the last occurence of c in c-addr u1 is at u2-1; if it does not
     \ occur, u2=0.      \ occur, u2=0.
Line 470  create gen-wrapped-types Line 466  create gen-wrapped-types
     s" gforth_c_" 2swap s+ #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
 : libcc-named-dir ( -- c-addr u )  : libcc-named-dir ( -- c-addr u )
     s" ~/.gforth/libcc-named/" ;      libcc-named-dir-v 2@ ;
   
 : libcc-tmp-dir ( -- c-addr u )  : libcc-tmp-dir ( -- c-addr u )
     s" ~/.gforth/libcc-tmp/" ;      s" ~/.gforth/libcc-tmp/" ;
Line 478  create gen-wrapped-types Line 474  create gen-wrapped-types
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )  : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
     2over s+ 2swap drop free throw ;      2over s+ 2swap drop free throw ;
   
   : open-wrappers ( -- addr|0 )
       lib-filename 2@ s" .la" s+
       2dup libcc-named-dir string-prefix? if ( c-addr u )
           \ see if we can open it in the path
           libcc-named-dir nip /string
           libcc-path open-path-file if
               0 exit endif
           ( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
       endif
       \ 2dup cr type
       2dup open-lib >r
       drop free throw r> ;
   
 : c-library-name-setup ( c-addr u -- )  : c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )      assert( c-source-file-id @ 0= )
     { d: filename }      { d: filename }
Line 545  DEFER compile-wrapper-function ( -- ) Line 554  DEFER compile-wrapper-function ( -- )
     lib-handle 0= if      lib-handle 0= if
         c-source-file close-file throw          c-source-file close-file throw
         0 c-source-file-id !          0 c-source-file-id !
         [ libtool-command s"  --silent --mode=compile gcc -I " s+          [ libtool-command s"  --silent --mode=compile --tag=CC " s+
         s" includedir" getenv append ] sliteral            libtool-cc append s"  -I " append
             s" includedir" getenv append ] sliteral
         s"  -O -c " s+ lib-filename 2@ append s" .c -o " append          s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
         lib-filename 2@ append s" .lo" append ( c-addr u )          lib-filename 2@ append s" .lo" append ( c-addr u )
         \    cr 2dup type          \    cr 2dup type
         2dup system drop free throw $? abort" libtool compile failed"          2dup system drop free throw $? abort" libtool compile failed"
         [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral          [ libtool-command s"  --silent --mode=link --tag=CC " s+
             libtool-cc append s"  -module -rpath " s+ ] sliteral
         lib-filename 2@ dirname s+ s"  " append          lib-filename 2@ dirname s+ s"  " append
         lib-filename 2@ append s" .lo -o " append          lib-filename 2@ append s" .lo -o " append
         lib-filename 2@ append s" .la" append ( c-addr u )          lib-filename 2@ append s" .la" append ( c-addr u )
Line 629  clear-libs Line 640  clear-libs
 \G Finish and (if necessary) build the latest C library interface.  \G Finish and (if necessary) build the latest C library interface.
     ['] compile-wrapper-function1 is compile-wrapper-function      ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;      compile-wrapper-function1 ;
   
   : init-libcc ( -- )
       s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
   [IFDEF] make-path
       make-path to libcc-path
       libcc-named-dir libcc-path also-path
       [ s" libccdir" getenv ] sliteral libcc-path also-path
   [THEN]
   ;
   
   init-libcc
   
   :noname ( -- )
       defers 'cold
       init-libcc ;
   is 'cold

Removed from v.1.41  
changed lines
  Added in v.1.48


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>