Changeset 13735 in project for chicken


Ignore:
Timestamp:
03/13/09 14:34:36 (11 years ago)
Author:
felix winkelmann
Message:

makedist.scm fixes; removed texinfo for the time being

Location:
chicken/trunk
Files:
4 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/Makefile.cross-linux-mingw

    r12937 r13735  
    8282TARGETS = libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) \
    8383        chicken-profile$(EXE) csc$(EXE) libchicken$(SO) \
    84         libuchicken$(SO) chicken-setup$(EXE) chicken.info \
     84        libuchicken$(SO) chicken-setup$(EXE) \
    8585        libchickengui$(SO) chicken-bug$(EXE)
    8686else
     
    8888        chicken-profile$(EXE) csc$(EXE) libchicken$(SO) \
    8989        libuchicken$(SO) chicken-install$(EXE) chicken-uninstall$(EXE) \
    90         chicken-status$(EXE) chicken.info \
     90        chicken-status$(EXE) \
    9191        libchickengui$(SO) chicken-bug$(EXE)
    9292endif
  • chicken/trunk/Makefile.mingw

    r13246 r13735  
    8585        csc$(EXE) libchicken$(SO) \
    8686        libuchicken$(SO) libchickengui$(SO) libchickengui$(A) chicken-install$(EXE) \
    87         chicken-status$(EXE) chicken-uninstall$(EXE) chicken.info
     87        chicken-status$(EXE) chicken-uninstall$(EXE)
    8888
    8989chicken-config.h: chicken-defaults.h
  • chicken/trunk/Makefile.mingw-msys

    r13246 r13735  
    7878        csc$(EXE) libchicken$(SO) \
    7979        libuchicken$(SO) libchickengui$(SO) libchickengui$(A) chicken-install$(EXE) \
    80         chicken-uninstall$(EXE) chicken-status$(EXE) chicken.info
     80        chicken-uninstall$(EXE) chicken-status$(EXE)
    8181
    8282chicken-config.h: chicken-defaults.h
  • chicken/trunk/Makefile.msvc

    r13141 r13735  
    183183all: libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) chicken-profile$(EXE) \
    184184        csc$(EXE) libchicken$(SO) \
    185         libuchicken$(SO) libchickengui$(SO) libchickengui$(A) chicken-setup$(EXE) \
    186         chicken.info
     185        libuchicken$(SO) libchickengui$(SO) libchickengui$(A) chicken-setup$(EXE)
    187186
    188187chicken-config.h: chicken-defaults.h
  • chicken/trunk/NEWS

    r13711 r13735  
    114.0.0
    22
     3- removed texinfo documentation - this will be added back later
    34- replaced PCRE regex engine with Alex Shinn's "irregex" regular expression
    45  package
  • chicken/trunk/defaults.make

    r13191 r13735  
    5151TOPMANDIR = $(SHAREDIR)/man
    5252MANDIR = $(TOPMANDIR)/man1
    53 INFODIR = $(SHAREDIR)/info
    5453INCDIR = $(PREFIX)/include
    5554DOCDIR = $(DATADIR)/doc
     
    6564ITOPMANDIR = $(ISHAREDIR)$(SEP)man
    6665IMANDIR = $(ITOPMANDIR)$(SEP)man1
    67 IINFODIR = $(ISHAREDIR)$(SEP)info
    6866IINCDIR = $(SPREFIX)$(SEP)include
    6967IDOCDIR = $(IDATADIR)$(SEP)doc
     
    7876ITOPMANDIR = $(TOPMANDIR)
    7977IMANDIR = $(MANDIR)
    80 IINFODIR = $(INFODIR)
    8178IINCDIR = $(INCDIR)
    8279IDOCDIR = $(DOCDIR)
     
    105102endif
    106103ASSEMBLER ?= $(C_COMPILER)
    107 MAKEINFO_PROGRAM ?= -makeinfo
    108 ifdef WINDOWS_SHELL
    109 INSTALL_PROGRAM ?= copy
     104ifdef WINDOWS_SHELL
     105INSTALL_PROGRAM ?= xcopy
    110106MAKEDIR_COMMAND ?= -mkdir
    111107else
     
    115111POSTINSTALL_STATIC_LIBRARY ?= true
    116112POSTINSTALL_PROGRAM ?= true
    117 INSTALLINFO_PROGRAM ?= -install-info
    118 UNINSTALLINFO_PROGRAM ?= -install-info
    119113
    120114# cross tools
     
    192186MAKE_WRITABLE_COMMAND ?= chmod 0755
    193187endif
    194 MAKEINFO_PROGRAM_OPTIONS ?= --no-split
    195188ifndef WINDOWS_SHELL
    196189INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS ?= -m755
     
    219212endif
    220213endif
    221 UNINSTALLINFO_PROGRAM_OPTIONS ?= --delete
    222214LIBCHICKEN_SO_LIBRARIES ?= $(LIBRARIES)
    223215LIBUCHICKEN_SO_LIBRARIES ?= $(LIBRARIES)
     
    323315        $(CSI_STATIC_EXECUTABLE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
    324316        $(CSC_PROGRAM)$(EXE) \
    325         chicken.info $(CHICKEN_BUG_PROGRAM)$(EXE)
     317        $(CHICKEN_BUG_PROGRAM)$(EXE)
    326318else
    327319CHICKEN_STATIC_EXECUTABLE = $(CHICKEN_PROGRAM)-static$(EXE)
     
    335327        $(CSC_PROGRAM)$(EXE) $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
    336328        $(CHICKEN_STATUS_PROGRAM)$(EXE) setup-download.so setup-api.so \
    337         chicken.info $(CHICKEN_BUG_PROGRAM)$(EXE) \
     329        $(CHICKEN_BUG_PROGRAM)$(EXE) \
    338330        $(IMPORT_LIBRARIES:%=%.import.so)
    339331endif
  • chicken/trunk/distribution/manifest

    r13709 r13735  
    144144html/Foreign type specifiers.html
    145145html/Getting started.html
    146 html/Getting started~.html
    147146html/Interface to external functions and variables.html
    148147html/Locations.html
     
    151150html/Non-standard read syntax.html
    152151html/Other support procedures.html
    153 html/Overview.html
     152html/Getting Started.html
    154153html/Parameters.html
    155154html/Supported language.html
     
    240239apply-hack.ppc.sysv.s
    241240apply-hack.sparc64.s
    242 chicken.texi
    243241chicken.pdf
    244242Makefile
     
    255253defaults.make
    256254private-namespace.scm
    257 scripts/makedist.scm
    258 scripts/makehtml.scm
    259 scripts/maketexi.scm
    260 scripts/enscript-texinfo.scm
    261 scripts/dpkg-eggs.scm
    262255scripts/scheme
    263256svnrevision.sh
  • chicken/trunk/rules.make

    r13709 r13735  
    770770        $(LINKER) $(LINKER_OPTIONS) $(LINKER_STATIC_OPTIONS) $< $(LINKER_OUTPUT) \
    771771          libchicken$(A) $(LIBRARIES)
    772 
    773 # info documentation
    774 
    775 chicken.info: chicken.texi
    776         -$(MAKEINFO_PROGRAM) $(MAKEINFO_PROGRAM_OPTIONS) $<
    777772
    778773# installation
     
    12221217.PHONY: distfiles dist html
    12231218
    1224 distfiles: html buildsvnrevision library.c eval.c expand.c chicken-syntax.c \
     1219distfiles: buildsvnrevision library.c eval.c expand.c chicken-syntax.c \
    12251220        data-structures.c ports.c files.c extras.c lolevel.c utils.c \
    12261221        tcp.c srfi-1.c srfi-4.c srfi-13.c srfi-14.c srfi-18.c srfi-69.c \
  • chicken/trunk/scripts/makedist.scm

    r13709 r13735  
    1212(define *platform*
    1313  (let ((sv (symbol->string (software-version))))
    14     (if (string-match ".*bsd" sv) "bsd" sv)))
     14    (cond ((string-match ".*bsd" sv) "bsd")
     15          (else
     16           (case (build-platform)
     17             ((mingw32)
     18              (if (string=? (getenv "MSYSTEM") "MINGW32")
     19                  "mingw-msys"
     20                  "mingw32"))
     21             ((msvc) "msvc")
     22             (else sv))))))
     23
     24(define *make* "make")
    1525
    1626(define (release full?)
     
    2030         (tgz (conc distname ".tar.gz")))
    2131    (run (rm -fr ,distname ,tgz))
    22     (run (mkdir -p ,distname
    23                 ,@(map (cut path distname <>)
    24                        (delete-duplicates (filter-map prefix files) string=?))))
     32    (create-directory distname)
     33    (for-each
     34     (lambda (d)
     35       (let ((d (path distname d)))
     36         (unless (file-exists? d)
     37           (print "creating " d)
     38           (create-directory d))))
     39     (delete-duplicates (filter-map prefix files) string=?))
    2540    (let ((missing '()))
    2641      (for-each
    2742       (lambda (f)
    2843         (if (-e f)
    29              (run (cp -p ,f ,(path distname f)))
     44             (run (cp -p ,(qs f) ,(qs (path distname f))))
    3045             (set! f (cons f missing))))
    3146       files)
     
    4156   (command-line-arguments)
    4257   (lambda _
    43      (print "usage: makedist [--release] [--test] MAKEOPTION ...")
     58     (print "usage: makedist [--release] [--test] [--make=PROGRAM] [--platform=PLATFORM] MAKEOPTION ...")
    4459     (exit 1))) )
    4560
    46 (run (gmake -f ,(conc "Makefile." *platform*) distfiles ,@*makeargs*))
     61(run (,*make* -f ,(conc "Makefile." *platform*) distfiles ,@*makeargs*))
    4762(release *release*)
  • chicken/trunk/scripts/tools.scm

    r10572 r13735  
    22
    33
    4 (use (srfi 1) posix utils)
     4(use (srfi 1) posix utils files)
    55
    66
     
    1111(define *pseudo-targets* '())
    1212(define *sleep-delay* 2)
     13
     14(define *windows-shell*
     15  (memq (build-platform) '(mingw32 msvc)))
    1316
    1417
Note: See TracChangeset for help on using the changeset viewer.