Changeset 4b72f6 in git


Ignore:
Timestamp:
Nov 24, 1999, 7:50:43 PM (24 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
6171f8981338ed758a299513c58c53a874f984ed
Parents:
5d32fdb9ecb9fff4978a30bd8fb80b5e9fcdb7b0
Message:
insatllation proocedure


git-svn-id: file:///usr/local/Singular/svn/trunk@3918 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r5d32fd r4b72f6  
    124124##############################################################
    125125# distribution targets
     126#
     127S_VERSION       = $${SINGULAR_VERSION-@SINGULAR_VERSION@}
     128SINGUNAME       = @SINGUNAME@
     129localdir        = /usr/local
     130install_prefix  = ${localdir}/Singular/${S_VERSION}
     131
     132BINDIST_DIRS    = Singular
     133SHAREDIST_DIRS  = Singular doc emacs
     134TMPDIR          = ${TMP_DIR}/singdist
     135
    126136LN_S            = @LN_S@
    127137MKINSTALLDIRS   = ./mkinstalldirs
    128 TMPDIR          = ${TMP_DIR}/singdist
    129 SINGUNAME       = @SINGUNAME@
    130 S_VERSION       = $${SINGULAR_VERSION-@SINGULAR_VERSION@}
     138
     139
     140install-dist: install-bindist install-sharedist
     141
     142install-bindist:
     143        for DIR in ${BINDIST_DIRS}; \
     144        do \
     145          (cd $${DIR}; ${MAKE} install-bindist install_prefix=${install_prefix});\
     146        done
     147
     148install-sharedist: ${SINGULAR}
     149        for DIR in ${SHAREDIST_DIRS}; \
     150        do \
     151          (cd $${DIR}; ${MAKE} install-sharedist install_prefix=${install_prefix}); \
     152        done
     153
     154install-local-dist: install-dist
     155        ${MKINSTALLDIRS} ${localdir}/bin
     156        ${LN_S} ${install_prefix}/${SINGUNAME}/Singular ${localdir}/bin/Singular-${S_VERSION}
     157
     158sharedist:
     159        if test -e ${TMPDIR}; then rm -f ${TMPDIR}; fi
     160        ${MAKE} install-sharedist localdir=${TMPDIR}
     161        cd ${TMPDIR}; tar czf Singular-${S_VERSION}-share.tgz
     162        mv ${TMPDIR}/Singular-${S_VERSION}-share.tgz .
     163        rm -rf ${TMPDIR}
     164
     165bindist:
     166        if test -e ${TMPDIR}; then rm -r ${TMPDIR}; fi
     167        ${MAKE} install-bindist localdir=${TMPDIR}
     168        cd ${TMPDIR}; tar czf Singular-${S_VERSION}-${SINGUNAME}.tgz
     169        mv ${TMPDIR}/Singular-${S_VERSION}-${SINGUNAME}.tgz .
     170        rm -rf ${TMPDIR}
     171
    131172BINDIR_NAME     = Singular/${S_VERSION}/${SINGUNAME}
    132173LIBDIR_NAME     = Singular/${S_VERSION}/LIB
    … …  
    145186
    146187.PHONY: sharedist bindist static-bindist infodist win-sharedist
    147 sharedist: ${SINGULAR}
     188_sharedist: ${SINGULAR}
    148189        cd doc; ${MAKE} all ps
    149190        cd emacs; ${MAKE} all
    … …  
    173214
    174215
    175 bindist: ${SINGULAR}
     216_bindist: ${SINGULAR}
    176217        cd Singular; ${MAKE} Singular-$@ libparse
    177218        rm -rf ${TMPDIR}

  • Singular/Makefile.in

    r5d32fd r4b72f6  
    2626includedir      = @includedir@
    2727slibdir         = ${prefix}/LIB
    28 
     28install_bindir  = ${install_prefix}/${SINGUNAME}
     29install_slibdir = ${install_prefix}/LIB
    2930
    3031##
    … …  
    3839BISON           = bison
    3940INSTALL         = ./install-sh -c
    40 INSTALL_PROGRAM = ${INSTALL}
     41INSTALL_PROGRAM = ${INSTALL} 
    4142INSTALL_DATA    = ${INSTALL} -m 644
    4243MKINSTALLDIRS   = ./mkinstalldirs
    … …  
    138139ASO_OBJS := $(ASO_SOURCES:.aso.cc=.aso)
    139140
     141#
    140142# Singular libraries which go into distribution
     143# MAKE SURE THAT THIS IS UP_TO_DATE
     144#
    141145SLIBS = algebra.lib        all.lib            classify.lib       deform.lib  \
    142146        elim.lib           factor.lib         finvar.lib         general.lib \
    … …  
    147151        primitiv.lib       random.lib         ring.lib           sing.lib    \
    148152        solve.lib          solver.lib         spcurve.lib        standard.lib\
    149         surf.lib           template.lib
     153        surf.lib           triang.lib         template.lib
     154
     155SLIBS_FILES = $(addprefix LIB/,${SLIBS})
     156
     157GFTABLES = $(wildcard LIB/gftables/[1-9]*)
    150158
    151159##
    … …  
    242250        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o ESingular emacs.cc fegetopt.o ${LDFLAGS} ${LIBS}
    243251
     252ESingular-static: fegetopt.o feResource.cc mod2.h feOpt.cc version.h emacs.cc \
     253           feOptES.inc
     254        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o ESingular emacs.cc fegetopt.o ${LDFLAGS} ${STATIC_LDFLAGS} ${LIBS}
     255
    244256feOpt.h: feOpt.inc feOptES.inc
    245257
    … …  
    338350        echo "#define MAKE_DISTRIBUTION " > distrib.h
    339351        ${MAKE} Singular ESingular
    340         strip Singular ESingular
    341         ${INSTALL} -s Singular Singular-bindist
    342         ${INSTALL} -s ESingular ESingular-bindist
     352        ${INSTALL_PROGRAM} -s Singular Singular-bindist
     353        ${INSTALL_PROGRAM} -s ESingular ESingular-bindist
    343354        echo "#undef MAKE_DISTRIBUTION " > distrib.h
    344355
    345356Singular-static-bindist: ${OBJS} Makefile
    346357        echo "#define MAKE_DISTRIBUTION " > distrib.h
    347         ${MAKE} Singular-static ESingular
    348         strip Singular-static ESingular
    349         mv Singular-static Singular-static-bindist
    350         ${INSTALL} -s ESingular ESingular-bindist
     358        ${MAKE} Singular-static ESingular-static
     359        ${INSTALL_PROGRAM} -s Singular-static Singular-static-bindist
     360        ${INSTALL_PROGRAM} -s ESingular-static ESingular-static-bindist
    351361        echo "#undef MAKE_DISTRIBUTION " > distrib.h
     362
     363install-bindist: Singular-bindist ESingular-bindist libparse
     364        ${MKINSTALLDIRS} ${install_bindir}
     365        ${INSTALL_PROGRAM} Singular-bindist ${install_bindir}/Singular
     366        ${INSTALL_PROGRAM} ESingular-bindist ${install_bindir}/ESingular
     367        ${INSTALL_PROGRAM} libparse ${install_bindir}/libparse
     368
     369install-static-bindist: Singular-static-bindist ESingular-static-bindist libparse
     370        ${MKINSTALLDIRS} ${install_bindir}
     371        ${INSTALL_PROGRAM} Singular-static-bindist ${install_bindir}/Singular
     372        ${INSTALL_PROGRAM} ESingular-static-bindist ${install_bindir}/ESingular
     373        ${INSTALL_PROGRAM} libparse ${install_bindir}/libparse
     374
     375install-sharedist: ${SLIBS_FILES} LIB/gftables
     376        ${MKINSTALLDIRS} ${install_slibdir}
     377        cp ${SLIBS_FILES} ${install_slibdir}
     378        ${MKINSTALLDIRS} ${install_slibdir}/gftables
     379        cp ${GFTABLES} ${install_slibdir}/gftables
     380        chmod -R +rX ${install_slibdir}/*
    352381
    353382tar:
    … …  
    532561        ${LD_DYN_FLAGS} gmalloc.ot
    533562
    534 iparith.ot: iparith.inc iparith.cc
     563iparith.ot: iparith.ic iparith.cc
    535564        $(CXXP)  ${CXXFLAGST} ${CXXTEMPLFLAGSB} ${CPPFLAGS} ${DEFST} -c iparith.cc -o iparith.ot
    536565

  • Singular/extra.cc

    r5d32fd r4b72f6  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.120 1999-11-24 18:13:20 Singular Exp $ */
     4/* $Id: extra.cc,v 1.121 1999-11-24 18:50:36 obachman Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
    … …  
    435435    else
    436436#endif
     437/*==================== pcv ==================================*/
     438#ifndef HAVE_DYNAMIC_LOADING
     439#ifdef HAVE_PCV
     440    if(strcmp(sys_cmd,"pcvLAddL")==0)
     441    {
     442      return pcvLAddL(res,h);
     443    }
     444    else
     445    if(strcmp(sys_cmd,"pcvPMulL")==0)
     446    {
     447      return pcvPMulL(res,h);
     448    }
     449    else
     450    if(strcmp(sys_cmd,"pcvMinDeg")==0)
     451    {
     452      return pcvMinDeg(res,h);
     453    }
     454    else
     455    if(strcmp(sys_cmd,"pcvP2CV")==0)
     456    {
     457      return pcvP2CV(res,h);
     458    }
     459    else
     460    if(strcmp(sys_cmd,"pcvCV2P")==0)
     461    {
     462      return pcvCV2P(res,h);
     463    }
     464    else
     465    if(strcmp(sys_cmd,"pcvDim")==0)
     466    {
     467      return pcvDim(res,h);
     468    }
     469    else
     470    if(strcmp(sys_cmd,"pcvBasis")==0)
     471    {
     472      return pcvBasis(res,h);
     473    }
     474    else
     475#endif
     476#endif /* HAVE_DYNAMIC_LOADING */
    437477/*==================== contributors =============================*/
    438478   if(strcmp(sys_cmd,"contributors") == 0)
    … …  
    555595    }
    556596    else
    557 /*==================== pcv ==================================*/
    558 #ifndef HAVE_DYNAMIC_LOADING
    559 #ifdef HAVE_PCV
    560     if(strcmp(sys_cmd,"pcvLAddL")==0)
    561     {
    562       return pcvLAddL(res,h);
    563     }
    564     else
    565     if(strcmp(sys_cmd,"pcvPMulL")==0)
    566     {
    567       return pcvPMulL(res,h);
    568     }
    569     else
    570     if(strcmp(sys_cmd,"pcvMinDeg")==0)
    571     {
    572       return pcvMinDeg(res,h);
    573     }
    574     else
    575     if(strcmp(sys_cmd,"pcvP2CV")==0)
    576     {
    577       return pcvP2CV(res,h);
    578     }
    579     else
    580     if(strcmp(sys_cmd,"pcvCV2P")==0)
    581     {
    582       return pcvCV2P(res,h);
    583     }
    584     else
    585     if(strcmp(sys_cmd,"pcvDim")==0)
    586     {
    587       return pcvDim(res,h);
    588     }
    589     else
    590     if(strcmp(sys_cmd,"pcvBasis")==0)
    591     {
    592       return pcvBasis(res,h);
    593     }
    594     else
    595 #endif
    596 #endif /* HAVE_DYNAMIC_LOADING */
    597 
    598597/*==================== mtrack ==================================*/
    599598    if(strcmp(sys_cmd,"mtrack")==0)

  • configure.in

    r5d32fd r4b72f6  
    6767AC_PROG_CC
    6868AC_PROG_CPP
     69AC_PROG_INSTALL
    6970AC_AIX
    7071

  • doc/Makefile.in

    r5d32fd r4b72f6  
    22###
    33### Makefile for Singular documentation
    4 ### $Id: Makefile.in,v 1.40 1999-08-16 16:52:29 Singular Exp $
     4### $Id: Makefile.in,v 1.41 1999-11-24 18:50:40 obachman Exp $
    55#####################################################################
    66SHELL=/bin/sh
    … …  
    1616bindir          = @bindir@
    1717htmldir         = ${prefix}/html
     18install_infodir = ${install_prefix}/info
     19install_htmldir = ${install_prefix}/html
     20install_docdir  = ${install_prefix}/doc
    1821
    1922##
    … …  
    210213        - rmdir ${infodir}
    211214
     215install-sharedist: singular.hlp html/index.htm singular.idx
     216        ${MKINSTALLDIRS} ${install_infodir}
     217        ${INSTALL_DATA} singular.hlp ${install_infodir}
     218        ${MKINSTALLDIRS} ${install_htmldir}
     219        cp ${HTML_SUBDIR}/* ${install_htmldir}
     220        chmod 644 ${htmldir}/*
     221        ${MKINSTALLDIRS} ${install_docdir}
     222        ${INSTALL_DATA} singular.idx ${install_docdir}
     223
    212224texi2html = $(TEXI2HTML:%.pl=%)
    213225

  • doc/doc2tex.pl

    r5d32fd r4b72f6  
    11#!/usr/local/bin/perl
    2 # $Id: doc2tex.pl,v 1.18 1999-10-25 12:45:27 obachman Exp $
     2# $Id: doc2tex.pl,v 1.19 1999-11-24 18:50:40 obachman Exp $
    33###################################################################
    44#  Computer Algebra System SINGULAR
    … …  
    77#
    88####
    9 # @c example [error]
     9# @c example [error] [no_comp]
    1010#    -> the text till the next @c example is feed into Singular,
    1111#       the text is then substituted by
    … …  
    2020#       wrap around output lines  longer than $ex_length = 73;
    2121#       Processing is aborted if error occures in Singular run,
    22 #       unless 'error' is specified
     22#       unless 'error' is specified
     23#       if no_comp is given, then computation is not run
     24#       
    2325#
    2426####
    … …  
    186188
    187189######################################################################
    188 # @c example [error]
     190# @c example [error] [no_comp]
    189191#    -> the text till the next @c example is feed into Singular,
    190192#       the text is then substituted by
    … …  
    199201#       wrap around output lines  longer than $ex_length = 73;
    200202#       Processing is aborted if error occures in Singular run,
    201 #       unless 'error' is specified
     203#       unless 'error' is specified
     204#       If [no_comp] is given, actual computation is not run
    202205sub HandleExample
    203206{
    204   my($inc_file, $ex_file, $lline, $thisexample, $error_ok, $cache);
     207  my($inc_file, $ex_file, $lline, $thisexample, $error_ok, $cache, $no_comp);
    205208 
    206209  $lline = $line;
    … …  
    229232  $thisexample = '';
    230233  $error_ok = 1 if /error/;
     234  $no_comp = 1 if /no_comp/;
     235
    231236  # print content in example file till next @c example
    232237  while (<DOC>)
    … …  
    235240    last if (/^\@c\s*example\s*$/);
    236241    s/^\s*//; # remove preceeding white spaces
    237     if ($no_ex)
     242    if ($no_ex || $no_comp)
    238243    {
    239244      &protect_texi;
    … …  
    255260
    256261  # done, if no examples
    257   return if ($no_ex);
     262  return if ($no_ex || $no_comp);
    258263
    259264  # check whether it can be reused

  • emacs/Makefile.in

    r5d32fd r4b72f6  
    77
    88prefix          = @prefix@
    9 PERL5           = @PERL5@
    109docdir          = ${prefix}/doc
    1110SINGULAR        = @SINGULAR@
     11emacsdir        = ${install_prefix}/emacs
     12
     13PERL5           = @PERL5@
     14INSTALL         = ../install-sh -c
     15INSTALL_DATA    = ${INSTALL} -m 644
     16MKINSTALLDIRS   = ../mkinstalldirs
    1217
    1318SINGULAR_HLP    = ${docdir}/singular.hlp
    … …  
    3136        rm cmd-cmpl.el hlp-cmpl.el lib-cmpl.el
    3237
    33 ${SINGULAR_HLP}:
    34         cd ${docdir}; make singular.hlp
     38install-sharedist: all
     39        ${MKINSTALLDIRS} ${emacsdir}
     40        ${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
     41        ${INSTALL_DATA} lib-cmpl.el ${emacsdir}
     42        ${INSTALL_DATA} hlp-cmpl.el ${emacsdir}
     43        ${INSTALL_DATA} singular.el ${emacsdir}
     44        ${INSTALL_DATA} .emacs-singular ${emacsdir}
     45        ${INSTALL_DATA} sing.xpm        ${emacsdir}
    3546

  • install-sh

    r5d32fd r4b72f6  
    116116# if $src (and thus $dsttmp) contains '*'.
    117117
    118         if [ -f $src -o -d $src ]
     118# obachman 6/15/98
     119# Here is an ugly fix for a bug in cygwin
     120# '[ test -f $src ]' evaluates to true, even if only $src.exe exists
     121# However 'cp $src $dst' can  not find $src, if only $src.exe exists
     122        if test -f "$src.exe" && test -x "$src.exe"; then
     123                src="$src.exe"
     124                true
     125        elif [ -f $src -o -d $src ]
    119126        then
    120127                true
    … …  
    194201                dstfile=`basename $dst`
    195202        else
     203                echo "basename $dst $transformbasename | sed $transformarg$transformbasename"
    196204                dstfile=`basename $dst $transformbasename |
    197205                        sed $transformarg`$transformbasename
Note: See TracChangeset for help on using the changeset viewer.