Changeset 11149 in project


Ignore:
Timestamp:
07/03/08 14:54:02 (12 years ago)
Author:
felix winkelmann
Message:

merged trunk rev. 11148; started with split up setup api modules

Location:
chicken/branches/hygienic
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed
  • chicken/branches/hygienic/Makefile.linux

    r10973 r11149  
    3232# options
    3333
    34 LIBCHICKEN_SO_LINKER_OPTIONS =
    35 LIBUCHICKEN_SO_LINKER_OPTIONS =
     34SONAME_VERSION = .$(BINARYVERSION)
     35LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
     36LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
    3637C_COMPILER_OPTIONS = -fno-strict-aliasing -DHAVE_CHICKEN_CONFIG_H
    3738ifdef DEBUGBUILD
     
    4546LIBRARIES = -lm -ldl
    4647NEEDS_RELINKING = yes
    47 SONAME_LINK = 1
    4848
    4949# special files
  • chicken/branches/hygienic/NEWS

    r11053 r11149  
    2929    use
    3030    define-extension
     31
     323.2.7
     33
     34- a different approach to creating a versioned shared library
     35
     363.2.6
     37
     38- bug fixes for tickets  393, 430, 436
     39- bug fix pointer->address
    3140
    32413.2.5
  • chicken/branches/hygienic/TODO

    r11126 r11149  
    11TODO for macro/module system                                    -*- Outline -*-
    2 
    3 * merge changes from trunk
    4 ** -r10950:HEAD
    52
    63* bugs
     
    5047** simple-macros
    5148** alexpander
    52 
    53 * chicken-setup
    54 ** remove local documentation-index stuff
  • chicken/branches/hygienic/chicken-setup.1

    r10952 r11149  
    250250
    251251.TP
    252 .BI \-download\-dir \ PATH
     252.BI \-download\-path \ PATH
    253253Specifies the location where chicken-setup will save downloaded files
    254254The default is
    255255.I {BUILD-PREFIX}/downloads)
    256 
     256.
    257257
    258258.TP
  • chicken/branches/hygienic/chicken-setup.scm

    r11109 r11149  
    15191519                 (loop (cdr args)))
    15201520                ((member arg '("-run" "-script" "-proxy" "-host" "-csc-option" "-ls" "-install-prefix"
    1521                                "-tree" "-local" "-svn" "-svn-trunk" "-eval" "-create-tree" "-build-prefix" "-download-dir"))
     1521                               "-tree" "-local" "-svn" "-svn-trunk" "-eval" "-create-tree" "-build-prefix"
     1522                               "-download-path"))
    15221523                 (error "missing option argument" arg))
    15231524                (else
  • chicken/branches/hygienic/chicken.h

    r10716 r11149  
    157157
    158158#ifndef C_SIXTY_FOUR
    159 # if defined (__alpha__) || defined (__sparc_v9__) || defined (__sparcv9) || defined(__ia64__) || defined(__x86_64__) || defined(__LP64__)
     159# if defined (__alpha__) || defined (__sparc_v9__) || defined (__sparcv9) || defined(__ia64__) || defined(__x86_64__) || defined(__LP64__) || defined(__powerpc64__)
    160160#   define C_SIXTY_FOUR
    161161# elif defined(__mips64) && (!defined(__GNUC__) || _MIPS_SZPTR == 64)
  • chicken/branches/hygienic/chicken.import.scm

    r11133 r11149  
    171171         warning
    172172         expand
     173         extension-information
     174         repository-path
    173175         with-exception-handler)
    174176 ##sys#chicken-macro-environment)       ;*** incorrect - won't work in compiled executable
  • chicken/branches/hygienic/chicken.texi

    r10953 r11149  
    1377113771
    1377213772
    13773 @code{case} expands into a cascaded @code{if} expression, where the first item in each arm is treated as a quoted list. So the @code{case} macro can not infer wether a symbol is to be treated as a constant-name (defined via @code{define-constant}) or a literal symbol.
     13773@code{case} expands into a cascaded @code{if} expression, where the first item in each arm is treated as a quoted list. So the @code{case} macro can not infer whether a symbol is to be treated as a constant-name (defined via @code{define-constant}) or a literal symbol.
    1377413774
    1377513775@node FAQ - General - How can I enable case sensitive reading/writing in user code?, FAQ - General - How can I change match-error-control during compilation?, FAQ - General - Why are constants defined by define-constant not honoured in case constructs?, FAQ - General
  • chicken/branches/hygienic/debian/chicken-bin.install

    r10952 r11149  
    11usr/bin
    2 
     2usr/share/chicken/*.scm
     3usr/share/chicken/*.exports
  • chicken/branches/hygienic/debian/control

    r10954 r11149  
    2121
    2222
    23 Package: libchicken0
     23Package: libchicken3
    2424Architecture: any
    2525Section: libs
     
    4242Priority: optional
    4343Conflicts: chicken, chicken-dev
    44 Depends: libchicken0 (= ${binary:Version}), libpcre3-dev
     44Depends: libchicken3 (= ${binary:Version}), libpcre3-dev
    4545Replaces: chicken, chicken-dev
    4646Description: A practical and portable Scheme system - development
  • chicken/branches/hygienic/debian/libchicken-dev.install

    r10952 r11149  
    11usr/include/*
    22usr/lib/lib*.a
    3 
     3usr/lib/lib*.so
  • chicken/branches/hygienic/debian/libchicken0.dirs

    r2616 r11149  
    1 usr/share/chicken
    2 usr/lib
  • chicken/branches/hygienic/debian/rules

    r10954 r11149  
    88     CFLAGS += -O2 -fno-strict-aliasing
    99endif
    10 
    11 version=3.2
    1210
    1311MAKE:=$(MAKE) PLATFORM=linux
     
    7977        dh_makeshlibs -V
    8078        dh_installdeb
    81         dh_shlibdeps -l debian/libchicken0/usr/lib
     79        dh_shlibdeps -l debian/libchicken3/usr/lib
    8280        dh_gencontrol
    8381        dh_md5sums
  • chicken/branches/hygienic/defaults.make

    r11066 r11149  
    222222LIBCHICKENGUI_SO_FILE ?=
    223223else
    224 PRIMARY_LIBCHICKEN ?= libchicken$(SO)
    225 LIBCHICKEN_SO_FILE ?= libchicken$(SO)
    226 LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)
     224PRIMARY_LIBCHICKEN ?= libchicken$(SO)$(SONAME_VERSION)
     225LIBCHICKEN_SO_FILE ?= libchicken$(SO)$(SONAME_VERSION)
     226LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)$(SONAME_VERSION)
    227227LIBCHICKENGUI_SO_FILE ?=
    228228endif
  • chicken/branches/hygienic/eval.scm

    r11118 r11149  
    727727        (if (null? alst)
    728728            (list alst)
    729             (do ([n n (fx- n 1)]
    730                  [args alst (##sys#slot args 1)]
    731                  [last #f args] )
     729            (do ((n n (fx- n 1))
     730                 (c 0 (fx+ c 1))
     731                 (args alst
     732                       (if (eq? '() args)
     733                           (##sys#error "bad argument count" n c)
     734                           (##sys#slot args 1)))
     735                 (last #f args) )
    732736                ((fx= n 0)
    733737                 (##sys#setslot last 1 (list args))
  • chicken/branches/hygienic/expand.scm

    r11133 r11149  
    14721472     (lambda (x)
    14731473       (unless (assq (car x) dlist)
    1474          (##sys#warn "exported identifier has not been defined" (car x) name)))
     1474         (##sys#warn
     1475          "exported identifier for module `" (->string name)
     1476          "' has not been defined" (car x))))
    14751477     vexports)
    14761478    (for-each
  • chicken/branches/hygienic/library.scm

    r10952 r11149  
    911911(define (angle n)
    912912  (##sys#check-number n 'angle)
    913   0)
     913  (if (< n 0) (fp* 2.0 (acos 0.0)) 0.0) )
    914914
    915915(define (real-part n)
     
    38333833(define (##sys#pointer->address ptr)
    38343834  ;; *** '4' is platform dependent!
    3835   (##core#inline_allocate ("C_a_int_to_num" 4) (##sys#slot ptr 0)) )
     3835  (##core#inline_allocate ("C_a_unsigned_int_to_num" 4) (##sys#slot ptr 0)) )
    38363836
    38373837(define ##sys#make-c-string
  • chicken/branches/hygienic/manual/Locations

    r9419 r11149  
    7171</enscript>
    7272
    73 See [[http://chicken.wiki.br/location-and-c-string-star|location and c-string*]] for a tip on returning a {{c-string*}} type.
     73See [[http://chicken.wiki.br/location-and-c-string-star|location and
     74c-string*]] for a tip on returning a {{c-string*}} type.
    7475
    7576{{location}} returns a value of type {{c-pointer}}, when given
  • chicken/branches/hygienic/manual/faq

    r10952 r11149  
    6262
    6363{{case}} expands into a cascaded {{if}} expression, where the first item in each arm
    64 is treated as a quoted list. So the {{case}} macro can not infer wether
     64is treated as a quoted list. So the {{case}} macro can not infer whether
    6565a symbol is to be treated as a constant-name (defined via {{define-constant}}) or
    6666a literal symbol.
  • chicken/branches/hygienic/regex.scm

    r10712 r11149  
    668668                           "cannot select partial anchor for compiled regular expression") )
    669669                (%regexp-options-set! rgxp
    670                                       (bitwise-or (%regexp-options regexp)
     670                                      (bitwise-ior (%regexp-options regexp)
    671671                                                  (pcre-option->number 'anchored)))
    672672                rgxp] ) ) ) ) )
  • chicken/branches/hygienic/rules.make

    r11066 r11149  
    751751libs: $(TARGETLIBS)
    752752
    753 libchicken$(SO): $(LIBCHICKEN_SHARED_OBJECTS) $(PCRE_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     753libchicken$(SO)$(SONAME_VERSION): $(LIBCHICKEN_SHARED_OBJECTS) $(PCRE_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
    754754        $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
    755755          $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
    756 
    757 libuchicken$(SO): $(LIBUCHICKEN_SHARED_OBJECTS) $(PCRE_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     756ifdef SONAME_VERSION
     757        ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
     758endif
     759
     760
     761libuchicken$(SO)$(SONAME_VERSION): $(LIBUCHICKEN_SHARED_OBJECTS) $(PCRE_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
    758762        $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_LINKER_OPTIONS) \
    759763          $(LINKER_OUTPUT) $^ $(LIBUCHICKEN_SO_LIBRARIES)
     764ifdef SONAME_VERSION
     765        ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
     766endif
    760767
    761768cygchicken-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(PCRE_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     
    878885        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
    879886        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
    880 ifdef SONAME_LINK
    881         ln -sf $(DESTDIR)$(ILIBDIR)/$(LIBCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)/$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)
    882 endif
     887endif
     888ifdef SONAME_VERSION
     889        cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
     890        cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
    883891endif
    884892ifdef WINDOWS
  • chicken/branches/hygienic/runtime.c

    r11053 r11149  
    82588258  a = C_alloc(2 + C_bytestowords(5));
    82598259  s = C_string2(&a, "sparc");
     8260#elif defined(__powerpc64__)
     8261  a = C_alloc(2 + C_bytestowords(5));
     8262  s = C_string2(&a, "ppc64");
    82608263#elif defined(__ppc__) || defined(__powerpc__)
    82618264  a = C_alloc(2 + C_bytestowords(3));
  • chicken/branches/hygienic/scripts/enscript-texinfo.scm

    r9088 r11149  
    7373      (if (or (not highlight) (stream-every (disjoin char-alphabetic? char-numeric?) (cdr highlight)))
    7474        (receive (in out pid)
    75                  (process (format #f "enscript~A~A -w texinfo -p- -q"
     75                 (process (format #f "enscript~A~A --language=texinfo -p- -q"
    7676                                  (if highlight " -E" "")
    7777                                  (if highlight (stream->string (cdr highlight)) "")))
Note: See TracChangeset for help on using the changeset viewer.