Changeset 7764 in project


Ignore:
Timestamp:
01/16/08 20:32:57 (13 years ago)
Author:
felix winkelmann
Message:

applied 3.0.0rc1/repobranches patch; fixed small bug in defaults.make

Location:
chicken/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/README

    r7333 r7764  
    11
    22  README file for the CHICKEN compiler
    3   (c)2000-2007 Felix L. Winkelmann
    4 
    5   version 2.741
     3  (c)2000-2008 Felix L. Winkelmann
     4
     5  version 3.0.0rc1
    66
    77
  • chicken/trunk/chicken-setup.scm

    r7189 r7764  
    147147(define *target-lib-home* (foreign-value "C_TARGET_LIB_HOME" c-string))
    148148
     149(define *major-version* (##sys#fudge 41))
     150(define *default-eggdir* (conc "eggs/" *major-version*))
     151
    149152(define *windows*
    150153  (and (eq? (software-type) 'windows)
     
    188191(define *local-repository* #f)
    189192(define *destdir* #f)
    190 (define *repository-hosts* '(("www.call-with-current-continuation.org" "eggs" 80)))
     193(define *repository-hosts*
     194  (list (list "www.call-with-current-continuation.org" *default-eggdir* 80)))
    191195(define *revision* #f)
    192196(define *run-tests* #f)
     
    11411145    (with-output-to-file (doc-index)
    11421146      (lambda ()
    1143         (printf "<html><head><title>Egg documentation index for ~a</title><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"/></head>~%" hn)
    1144         (printf "<body><a id=\"official-index\" href=\"http://www.call-with-current-continuation.org/eggs/index.html\">Visit the official egg index</a>~%")
    1145         (printf "<h1 id=\"title\">Egg documentation index:</h1>~%")
     1147        (print "<html><head><title>Egg documentation index for " hn
     1148               "</title><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"/></head>")
     1149        (print "<body><a id=\"official-index\" href=\"http://www.call-with-current-continuation.org/"
     1150               *default-eggdir* "/index.html\">Visit the official egg index</a>")
     1151        (print "<h1 id=\"title\">Egg documentation index:</h1>")
    11461152        (printf "<p id=\"install-info\">CHICKEN: ~a<br>Host: ~a<br>Repository path: ~a<br><p>~%"
    11471153                (chicken-version #t)
    11481154                (get-host-name)
    11491155                rpath)
    1150         (printf "<table id=\"egg-index\">~%")
    1151         (printf "<thead><tr><th>Egg name</th><th>Version</th><th>Release</th></tr></thead>~%<tbody>~%")
     1156        (print "<table id=\"egg-index\">")
     1157        (print "<thead><tr><th>Egg name</th><th>Version</th><th>Release</th></tr></thead>\n<tbody>")
    11521158        (let ((c 0))
    11531159          (for-each
     
    12391245    (set! *repository-hosts*
    12401246      (cons (match (string-match "(.+)\\:([0-9]+)" host)
    1241               ((_ host port) (list host (if eggdir "eggs" "") (string->number port)))
    1242               (_ (list host (if eggdir "eggs" "") 80)) )
     1247              ((_ host port) (list host (if eggdir *default-eggdir* "") (string->number port)))
     1248              (_ (list host (if eggdir (conc *default-eggdir* "") 80)) ) )
    12431249            *repository-hosts*) )  )
    12441250  (setup-root-directory *base-directory*)
  • chicken/trunk/chicken.h

    r7338 r7764  
    3939#ifndef ___CHICKEN
    4040#define ___CHICKEN
     41
     42#define C_MAJOR_VERSION       3
    4143
    4244/*
  • chicken/trunk/defaults.make

    r7325 r7764  
    3636# basic parameters
    3737
    38 BINARYVERSION ?= 3
     38BINARYVERSION = 3
    3939NURSERY ?= (128*1024)
    4040STACKDIRECTION ?= 1
     
    232232O ?= .o
    233233A ?= .a
    234 # EXE =
     234# EXE ?=
    235235SO ?= .so
    236236
  • chicken/trunk/misc/setversion.scm

    r7081 r7764  
    11;;;; setversion.scm - Bump version-number
    22
    3 (use utils)
     3(use srfi-1 utils)
    44
    55(define buildversion (->string (car (read-file "buildversion"))))
     
    2626       (system* "mv ~S ~S" tmp both ) ) ) ) )
    2727
     28(define (parse-version v)
     29  (string-match "(\\d+)\\.(\\d+)\\.(\\d+)(.*)" v) )
     30
    2831(define (main args)
    2932  (cond ((member "-set" args) =>
    3033         (lambda (a) (set! buildversion (cadr a))) )
    3134        ((not (member "-noinc" args))
    32          (set! buildversion (number->string (+ (string->number buildversion) 0.001))) ) )
     35         (match (parse-version buildversion)
     36           ((_ maj min pl huh)
     37            (set! buildversion (conc maj "." min "." (add1 (string->number pl)) huh)) ) ) ) )
    3338  (with-output-to-file "buildversion" (cut display buildversion))
    3439  (with-output-to-file "version.scm"
  • chicken/trunk/runtime.c

    r7339 r7764  
    42004200#endif
    42014201
     4202  case C_fix(41):
     4203    return C_fix(C_MAJOR_VERSION);
     4204
    42024205  default: return C_SCHEME_UNDEFINED;
    42034206  }
  • chicken/trunk/version.scm

    r7333 r7764  
    1 (define-constant +build-version+ "2.741")
     1(define-constant +build-version+ "3.0.0rc1")
Note: See TracChangeset for help on using the changeset viewer.