Ticket #631: 0003-Remove-version.scm-and-references-to-C_BRANCH_NAME-a.patch

File 0003-Remove-version.scm-and-references-to-C_BRANCH_NAME-a.patch, 5.3 KB (added by Jim Ursetto, 13 years ago)

  • Makefile.cygwin 

    From de899d2137b4f55688e993f908481daf95e1ea1f Mon Sep 17 00:00:00 2001
From: Jim Ursetto <zbigniewsz@gmail.com>
Date: Fri, 1 Jul 2011 18:16:02 -0500
Subject: [PATCH 3/3] Remove version.scm and references to C_BRANCH_NAME and C_BUILD_TAG

---
 Makefile.cygwin       |    4 ----
 Makefile.mingw        |    4 ----
 defaults.make         |    4 ----
 distribution/manifest |    1 -
 library.scm           |   12 ------------
 rules.make            |    2 +-
 scripts/setversion    |    7 +------
 version.scm           |    1 -
 8 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 version.scm

diff --git a/Makefile.cygwin b/Makefile.cygwin
index 4863975..6f8d09f 100644
    a b endif 
    128128
    129129chicken-defaults.h:
    130130        echo "/* generated */" >$@
    131         echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
    132131        echo "#define C_CHICKEN_PROGRAM \"$(CHICKEN_PROGRAM)$(EXE)\"" >>$@
    133132        echo "#ifndef C_INSTALL_CC" >>$@
    134133        echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
    … … chicken-defaults.h: 
    259258        echo "#ifndef C_BINARY_VERSION" >>$@
    260259        echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
    261260        echo "#endif" >>$@
    262         echo "#ifndef C_BRANCH_NAME" >>$@
    263         echo "# define C_BRANCH_NAME \"$(BRANCHNAME)\"" >>$@
    264         echo "#endif" >>$@
    265261        echo "/* END OF FILE */" >>$@
    266262
    267263include $(SRCDIR)/rules.make

  • Makefile.mingw 

    diff --git a/Makefile.mingw b/Makefile.mingw
index b153b58..56a159a 100644
    a b chicken-defaults.h: 
    133133ifdef OPTIMIZE_FOR_SPEED
    134134        echo /* (this build was optimized for speed) */ >>$@
    135135endif
    136         echo #define C_BUILD_TAG "$(BUILD_TAG)" >>$@
    137136        echo #define C_CHICKEN_PROGRAM "$(CHICKEN_PROGRAM)$(EXE)" >>$@
    138137        echo #define C_WINDOWS_SHELL 1 >>$@
    139138        echo #ifndef C_INSTALL_CC >>$@
    … … endif 
    262261        echo #ifndef C_BINARY_VERSION >>$@
    263262        echo # define C_BINARY_VERSION $(BINARYVERSION) >>$@
    264263        echo #endif >>$@
    265         echo #ifndef C_BRANCH_NAME >>$@
    266         echo # define C_BRANCH_NAME "" >>$@
    267         echo #endif >>$@
    268264        echo /* END OF FILE */ >>$@
    269265
    270266chicken-install.rc:

  • defaults.make 

    diff --git a/defaults.make b/defaults.make
index 01f7c16..9b3e0ef 100644
    a b chicken-defaults.h: 
    351351ifdef OPTIMIZE_FOR_SPEED
    352352        echo "/* (this build was optimized for speed) */" >$@
    353353endif
    354         echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
    355354        echo "#define C_CHICKEN_PROGRAM \"$(CHICKEN_PROGRAM)$(EXE)\"" >>$@
    356355        echo "#ifndef C_INSTALL_CC" >>$@
    357356        echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
    … … endif 
    489488        echo "#ifndef C_BINARY_VERSION" >>$@
    490489        echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
    491490        echo "#endif" >>$@
    492         echo "#ifndef C_BRANCH_NAME" >>$@
    493         echo "# define C_BRANCH_NAME \"$(BRANCHNAME)\"" >>$@
    494         echo "#endif" >>$@
    495491        echo "/* END OF FILE */" >>$@
    496492endif
    497493

  • distribution/manifest 

    diff --git a/distribution/manifest b/distribution/manifest
index 0d48b71..32a2054 100644
    a b support.c 
    4545tcp.c
    4646utils.c
    4747build.scm
    48 version.scm
    4948buildversion
    5049c-backend.scm
    5150c-platform.scm

  • library.scm 

    diff --git a/library.scm b/library.scm
index b930433..0d5811c 100644
    a b  
    5454# define EX_SOFTWARE    70
    5555#endif
    5656
    57 #ifndef C_BUILD_TAG
    58 # define C_BUILD_TAG    ""
    59 #endif
    60 
    61 #ifndef C_BRANCH_NAME
    62 # define C_BRANCH_NAME   ""
    63 #endif
    64 
    6557#define C_close_file(p)       (C_fclose((C_FILEPTR)(C_port_file(p))), C_SCHEME_UNDEFINED)
    6658#define C_a_f64peek(ptr, c, b, i)  C_flonum(ptr, ((double *)C_data_pointer(b))[ C_unfix(i) ])
    6759#define C_fetch_c_strlen(b, i) C_fix(strlen((C_char *)C_block_item(b, C_unfix(i))))
    … … EOF 
    140132
    141133
    142134(include "common-declarations.scm")
    143 (include "version.scm")
    144135(include "banner.scm")
    145136
    146137
    … … EOF 
    151142(define-constant default-parameter-vector-size 16)
    152143(define-constant maximal-string-length #x00ffffff)
    153144
    154 (define-foreign-variable +build-tag+ c-string "C_BUILD_TAG")
    155 (define-foreign-variable +branch-name+ c-string "C_BRANCH_NAME")
    156 
    157145
    158146;;; System routines:
    159147

  • rules.make 

    diff --git a/rules.make b/rules.make
index bca0358..8ba36a6 100644
    a b $(foreach lib, $(SETUP_API_OBJECTS_1),\ 
    493493
    494494bootstrap-lib = $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
    495495
    496 library.c: $(SRCDIR)library.scm $(SRCDIR)version.scm $(SRCDIR)banner.scm $(SRCDIR)common-declarations.scm
     496library.c: $(SRCDIR)library.scm $(SRCDIR)banner.scm $(SRCDIR)common-declarations.scm
    497497        $(bootstrap-lib)
    498498eval.c: $(SRCDIR)eval.scm $(SRCDIR)common-declarations.scm
    499499        $(bootstrap-lib)

  • scripts/setversion 

    diff --git a/scripts/setversion b/scripts/setversion
index 6102377..c292c3c 100644
    a b exec csi -s "$0" "$@" 
    5858             (set! buildversion
    5959               (conc maj "." min "." (add1 (string->number pl)) huh)) ) ) )
    6060    (with-output-to-file "buildversion" (cut display buildversion) binary:)
    61     (with-output-to-file "version.scm"
    62       (lambda ()
    63         (write `(define-constant +build-version+ ,buildversion))
    64         (newline) )
    65       binary:)
    66     (system* "cat version.scm")
     61    (system* "cat buildversion")
    6762    (let ([vstr (sprintf "version ~A" buildversion)])
    6863      (for-each (cut patch <> (irregex "version [0-9][-.0-9a-zA-Z]+") vstr) files) )
    6964    (patch

  • deleted file version.scm 

    diff --git a/version.scm b/version.scm
deleted file mode 100644
index a3442cc..0000000
    + -  
    1 (define-constant +build-version+ "4.7.3")