Changeset 32a49e in git


Ignore:
Timestamp:
Sep 29, 2005, 9:43:56 AM (19 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
1d03f829a3cbe8d5a713476a09e0a044e8b3e7f4
Parents:
8f42a46ed7062d9c086400ca9ffb00dba6e143d3
Message:
Cygwin - Official


git-svn-id: file:///usr/local/Singular/svn/trunk@8673 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r8f42a46 r32a49e  
    132132# cygwin related stuff
    133133#
    134 CYGWIN_PORT_VER       = @SINGULAR_RPM_VERSION@-1
     134CYGWIN_SING_VER       = @SINGULAR_RPM_VERSION@
     135CYGWIN_PORT_VER       = ${CYGWIN_SING_VER}-1
    135136CYGWIN_SETUP_VER      = 2.457.2.2
    136137CYGWIN_REP_DIR        = cygwin_pkg
    … …  
    142143CYGWIN_SINGULAR_ROOT  = /usr/share/${CYGWIN_SINGULAR_DIR}
    143144CYGWIN_SINGULAR_BIN   = /usr/lib/${CYGWIN_SINGULAR_DIR}
    144 CYGWIN_SINGULAR_DOC   = /usr/share/doc/${CYGWIN_SINGULAR_DIR}-${CYGWIN_PORT_VER}
     145CYGWIN_SINGULAR_DOC   = /usr/share/doc/${CYGWIN_SINGULAR_DIR}-${CYGWIN_SING_VER}
    145146
    146147
    … …  
    254255
    255256cygwin-dist-scripts:
     257        @echo -e  "Writing /etc/postinstall/singular-help.sh"
     258        @echo -e  '#!/bin/sh' > /etc/postinstall/singular-help.sh
     259        @echo -e  '' >> /etc/postinstall/singular-icons.sh
     260        @echo -e  'install-info' >> /etc/postinstall/singular-icons.sh
     261        @echo -e  'mkdir "`cygpath -u -A -P`/Singular CAS"' >> /etc/postinstall/singular-icons.sh
    256262        @echo -e  "Writing /etc/postinstall/singular-icons.sh"
    257263        @echo -e  '#!/bin/sh' > /etc/postinstall/singular-icons.sh
    … …  
    343349        @echo -e  "export SINGULAR_BIN_DIR=${CYGWIN_SINGULAR_BIN}" >> /usr/bin/ESingular
    344350        @echo -e  "export SINGULAR_ROOT_DIR=${CYGWIN_SINGULAR_ROOT}" >> /usr/bin/ESingular
    345         @echo -e  "export SINGULAR_INFO_FILE=${CYGWIN_SINGULAR_DOC}/info/singular.hlp" >> /usr/bin/ESingular
     351        @echo -e  "export SINGULAR_INFO_FILE=/usr/share/info/singular.info" >> /usr/bin/ESingular
    346352        @echo -e  "export SINGULAR_IDX_FILE=${CYGWIN_SINGULAR_DOC}/doc/singular.idx" >> /usr/bin/ESingular
    347353        @echo -e  "export SINGULAR_HTML_DIR=${CYGWIN_SINGULAR_DOC}/html" >> /usr/bin/ESingular
    … …  
    355361        @echo -e  "export SINGULAR_BIN_DIR=${CYGWIN_SINGULAR_BIN}" >> /usr/bin/Singular
    356362        @echo -e  "export SINGULAR_ROOT_DIR=${CYGWIN_SINGULAR_ROOT}" >> /usr/bin/Singular
    357         @echo -e  "export SINGULAR_INFO_FILE=${CYGWIN_SINGULAR_DOC}/info/singular.hlp" >> /usr/bin/Singular
     363        @echo -e  "export SINGULAR_INFO_FILE=/usr/share/info/singular.info" >> /usr/bin/Singular
    358364        @echo -e  "export SINGULAR_IDX_FILE=${CYGWIN_SINGULAR_DOC}/doc/singular.idx" >> /usr/bin/Singular
    359365        @echo -e  "export SINGULAR_HTML_DIR=${CYGWIN_SINGULAR_DOC}/html" >> /usr/bin/Singular
    … …  
    374380        ${MKINSTALLDIRS} ${CYGWIN_SINGULAR_ROOT} ${CYGWIN_SINGULAR_DOC} ${CYGWIN_SINGULAR_BIN}
    375381## Copy documentation files
    376         ${MKINSTALLDIRS} /usr/share/doc/Singular-${CYGWIN_PORT_VER}
    377         cp ${TMPDIR}/Singular/${S_VERSION}/README /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
    378         cp ${TMPDIR}/Singular/${S_VERSION}/INSTALL /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
    379         cp ${TMPDIR}/Singular/${S_VERSION}/COPYING /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
    380         cp ${TMPDIR}/Singular/${S_VERSION}/NEWS /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
    381         cp ${TMPDIR}/Singular/${S_VERSION}/GPL /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     382        cp ${TMPDIR}/Singular/${S_VERSION}/README /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     383        cp ${TMPDIR}/Singular/${S_VERSION}/INSTALL /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     384        cp ${TMPDIR}/Singular/${S_VERSION}/COPYING /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     385        cp ${TMPDIR}/Singular/${S_VERSION}/NEWS /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     386        cp ${TMPDIR}/Singular/${S_VERSION}/GPL /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    382387## Install Cygwin specific structure
    383388        mv ${TMPDIR}/Singular/${S_VERSION}/ix86-Win/* ${CYGWIN_SINGULAR_BIN}/
    … …  
    386391        mv ${TMPDIR}/Singular/${S_VERSION}/emacs ${CYGWIN_SINGULAR_ROOT}/
    387392        mv ${TMPDIR}/Singular/${S_VERSION}/* ${CYGWIN_SINGULAR_DOC}/
     393        mv ${CYGWIN_SINGULAR_DOC}/info/singular.hlp /usr/share/info/singular.info
    388394## Copy auxiliar files
    389395        cp ${CYGWIN_AUX_FILES}/surf.exe ${CYGWIN_SINGULAR_BIN}/
    … …  
    399405##      or copy from local folder
    400406#       cp ${CYGWIN_AUX_FILES}/cygwin-setup.exe ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe
    401         cp ${CYGWIN_AUX_FILES}/singular-base.README /usr/share/doc/Cygwin/singular-base-${CYGWIN_PORT_VER}.README
    402         cp ${CYGWIN_AUX_FILES}/singular-share.README /usr/share/doc/Cygwin/singular-share-${CYGWIN_PORT_VER}.README
    403         cp ${CYGWIN_AUX_FILES}/singular-help.README /usr/share/doc/Cygwin/singular-help-${CYGWIN_PORT_VER}.README
    404         cp ${CYGWIN_AUX_FILES}/singular-surf.README /usr/share/doc/Cygwin/singular-surf-${CYGWIN_PORT_VER}.README
    405         cp ${CYGWIN_AUX_FILES}/singular-icons.README /usr/share/doc/Cygwin/singular-icons-${CYGWIN_PORT_VER}.README
     407        cp ${CYGWIN_AUX_FILES}/singular-base.README /usr/share/doc/Cygwin/singular-base-${CYGWIN_SING_VER}.README
     408        cp ${CYGWIN_AUX_FILES}/singular-share.README /usr/share/doc/Cygwin/singular-share-${CYGWIN_SING_VER}.README
     409        cp ${CYGWIN_AUX_FILES}/singular-help.README /usr/share/doc/Cygwin/singular-help-${CYGWIN_SING_VER}.README
     410        cp ${CYGWIN_AUX_FILES}/singular-surf.README /usr/share/doc/Cygwin/singular-surf-${CYGWIN_SING_VER}.README
     411        cp ${CYGWIN_AUX_FILES}/singular-icons.README /usr/share/doc/Cygwin/singular-icons-${CYGWIN_SING_VER}.README
    406412
    407413cygwin-dist-pack: ## singular-base-${CYGWIN_PORT_VER}-src.tar.bz2
    … …  
    416422        mkdir ${CYGWIN_REP_DIR}/release/singular-helper
    417423        tar cjf ${CYGWIN_REP_DIR}/release/singular-base/singular-base-${CYGWIN_PORT_VER}.tar.bz2 \
    418               /usr/share/doc/Cygwin/singular-base-${CYGWIN_PORT_VER}.README \
    419               /usr/share/doc/Singular-${CYGWIN_PORT_VER}/COPYING  \
    420               /usr/share/doc/Singular-${CYGWIN_PORT_VER}/INSTALL  \
    421               /usr/share/doc/Singular-${CYGWIN_PORT_VER}/NEWS     \
    422               /usr/share/doc/Singular-${CYGWIN_PORT_VER}/README   \
    423               /usr/share/doc/Singular-${CYGWIN_PORT_VER}/GPL   \
     424              /usr/share/doc/Cygwin/singular-base-${CYGWIN_SING_VER}.README \
     425              /usr/share/doc/Singular-${CYGWIN_SING_VER}/COPYING  \
     426              /usr/share/doc/Singular-${CYGWIN_SING_VER}/INSTALL  \
     427              /usr/share/doc/Singular-${CYGWIN_SING_VER}/NEWS     \
     428              /usr/share/doc/Singular-${CYGWIN_SING_VER}/README   \
     429              /usr/share/doc/Singular-${CYGWIN_SING_VER}/GPL   \
    424430              /usr/bin/Singular                  \
    425431              /usr/bin/ESingular                 \
    … …  
    432438              ${CYGWIN_SINGULAR_BIN}/gen_test.exe
    433439        tar cjf ${CYGWIN_REP_DIR}/release/singular-share/singular-share-${CYGWIN_PORT_VER}.tar.bz2 \
    434               /usr/share/doc/Cygwin/singular-share-${CYGWIN_PORT_VER}.README \
     440              /usr/share/doc/Cygwin/singular-share-${CYGWIN_SING_VER}.README \
    435441              ${CYGWIN_SINGULAR_ROOT}/*
    436442        tar cjf ${CYGWIN_REP_DIR}/release/singular-help/singular-help-${CYGWIN_PORT_VER}.tar.bz2 \
    437               /usr/share/doc/Cygwin/singular-help-${CYGWIN_PORT_VER}.README \
     443              /usr/share/doc/Cygwin/singular-help-${CYGWIN_SING_VER}.README \
     444              /usr/share/info/singular.info                                 \
    438445              ${CYGWIN_SINGULAR_DOC}/*
    439446        tar cjf ${CYGWIN_REP_DIR}/release/singular-surf/singular-surf-${CYGWIN_PORT_VER}.tar.bz2 \
    440               /usr/share/doc/Cygwin/singular-surf-${CYGWIN_PORT_VER}.README \
     447              /usr/share/doc/Cygwin/singular-surf-${CYGWIN_SING_VER}.README \
    441448              ${CYGWIN_SINGULAR_BIN}/surf.exe       \
    442449              ${CYGWIN_SINGULAR_BIN}/SURF_AUTHORS   \
    … …  
    444451              ${CYGWIN_SINGULAR_BIN}/SURF_COPYING
    445452        tar cjf ${CYGWIN_REP_DIR}/release/singular-icons/singular-icons-${CYGWIN_PORT_VER}.tar.bz2  \
    446               /usr/share/doc/Cygwin/singular-icons-${CYGWIN_PORT_VER}.README \
     453              /usr/share/doc/Cygwin/singular-icons-${CYGWIN_SING_VER}.README \
    447454              ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe                \
    448455              ${CYGWIN_SINGULAR_BIN}/startxserver.bat                \
    … …  
    458465        cp ${CYGWIN_AUX_FILES}/setup-helper.hint ${CYGWIN_REP_DIR}/release/singular-helper/setup.hint
    459466
    460 cygwin-dist: cygwin-dist-install cygwin-dist-pack cygwin-setup
     467cygwin-helper: cygwin-setup-init cygwin-setup-helper
     468        mkinstalldirs ${CYGWIN_REP_DIR}/release/singular-helper
     469        touch ${CYGWIN_REP_DIR}/release/singular-helper/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
     470        cp ${CYGWIN_AUX_FILES}/setup-helper.hint ${CYGWIN_REP_DIR}/release/singular-helper/setup.hint
     471
     472cygwin-dist: cygwin-dist-install cygwin-dist-pack cygwin-helper
    461473
    462474cygwin-setup-init:
     475        mkinstalldirs ${CYGWIN_REP_DIR}
    463476        @echo "Writing ${CYGWIN_REP_DIR}/setup.ini"
    464477        @echo "# This file is automatically generated by Makefile." > ${CYGWIN_REP_DIR}/setup.ini
    … …  
    495508          echo -n " " >> ${CYGWIN_REP_DIR}/setup.ini; \
    496509          echo `md5sum ${CYGWIN_REP_DIR}/release/singular-$*/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2 | sed -e 's/\([a-zA-Z0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini; \
    497         else \
    498           echo -n "source: release/singular-base/singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 "  >> ${CYGWIN_REP_DIR}/setup.ini; \
    499           echo -n `du -b ${CYGWIN_REP_DIR}/release/singular-base/singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 | sed -e 's/\([0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini; \
    500           echo -n " " >> ${CYGWIN_REP_DIR}/setup.ini; \
    501           echo `md5sum ${CYGWIN_REP_DIR}/release/singular-base/singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 | sed -e 's/\([a-zA-Z0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini; \
    502510        fi;
    503511        @echo >> ${CYGWIN_REP_DIR}/setup.ini
    … …  
    509517        ${MKINSTALLDIRS} ${TMPDIR}/Files
    510518        cp -r ${CYGWIN_ORIG}/$*/* ${TMPDIR}/Files/
    511         @if test "$*" = "Full"; then \
    512           echo "Create Full distribution"; \
    513           cp -r ${CYGWIN_REP_DIR}/release/singular* ${TMPDIR}/Files/release/; \
    514         else \
    515           echo "Create Small distribution"; \
    516           cp -r ${CYGWIN_REP_DIR}/release/singular-base ${TMPDIR}/Files/release/; \
    517           cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/; \
    518           cp -r ${CYGWIN_REP_DIR}/release/singular-help ${TMPDIR}/Files/release/; \
    519           cp -r ${CYGWIN_REP_DIR}/release/singular-icons ${TMPDIR}/Files/release/; \
    520           cp -r ${CYGWIN_REP_DIR}/release/singular-share ${TMPDIR}/Files/release/; \
    521         fi;
    522         -rm -f  ${TMPDIR}/Files/release/singular-base/*src.tar.bz2
    523         -rm -f  ${TMPDIR}/Files/release/singular-surf/*src.tar.bz2
     519        cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/
     520        @echo "Creating $* distribution ..."
     521#       @if test "$*" = "Full"; then \
     522#         echo "Create Full distribution"; \
     523#         cp -r ${CYGWIN_REP_DIR}/release/singular* ${TMPDIR}/Files/release/; \
     524#       else \
     525#         echo "Create Small distribution"; \
     526#         cp -r ${CYGWIN_REP_DIR}/release/singular-base ${TMPDIR}/Files/release/; \
     527#         cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/; \
     528#         cp -r ${CYGWIN_REP_DIR}/release/singular-help ${TMPDIR}/Files/release/; \
     529#         cp -r ${CYGWIN_REP_DIR}/release/singular-icons ${TMPDIR}/Files/release/; \
     530#         cp -r ${CYGWIN_REP_DIR}/release/singular-share ${TMPDIR}/Files/release/; \
     531#       fi;
     532#       -rm -f  ${TMPDIR}/Files/release/singular-base/*src.tar.bz2
     533#       -rm -f  ${TMPDIR}/Files/release/singular-surf/*src.tar.bz2
    524534        -rm -f  ${TMPDIR}/Files/setup.exe
    525535        cp ${CYGWIN_AUX_FILES}/setup-pfw.exe ${TMPDIR}/Files/setup.exe
    … …  
    575585        ${CYGWIN_PFW_EXEC} -a -s "`cygpath -a -w ${TMPDIR}/Singular.pfw`"
    576586
    577 cygwin-cd-repository:
    578         ${MKINSTALLDIRS} Repository
    579         cp -r ${CYGWIN_ORIG}/cd-repository/* Repository/
    580         cp -r ${CYGWIN_REP_DIR}/release/singular* Repository/release/; \
    581         cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> Repository/setup.ini
     587#cygwin-cd-repository:
     588#       ${MKINSTALLDIRS} Repository
     589#       cp -r ${CYGWIN_ORIG}/cd-repository/* Repository/
     590#       cp -r ${CYGWIN_REP_DIR}/release/singular-helper Repository/release/
     591#       cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> Repository/setup.ini
    582592
    583593singular-cd-windows:
    584594        @echo Building cd directories and web interface
    585595        ${MKINSTALLDIRS} singular-cd/WINDOWS/Files/Repository
    586         echo WEBPAGE FEATURE NOT INTRODUCED
     596        @echo WEBPAGE FEATURE NOT INTRODUCED
    587597        @echo Buidling cd autostart
    588         echo AUTOSTART FEATURE NOT INTRODUCED
     598        @echo AUTOSTART FEATURE NOT INTRODUCED
    589599        @echo Copying PackageForTheWeb
    590         cp Singualar-${S_VERSION}-$*.exe singular-cd/WINDOWS/Files/
    591         cp Singualar/singular.ico singular-cd/WINDOWS/Files/
     600        cp Singular-${S_VERSION}-*.exe singular-cd/WINDOWS/Files/
     601        cp Singular/singular.ico singular-cd/WINDOWS/Files/
    592602        @echo Building cygwin-cd-repository
    593603        cp -r ${CYGWIN_ORIG}/cd-repository/* singular-cd/WINDOWS/Files/Repository/
    594         cp -r ${CYGWIN_REP_DIR}/release/singular* singular-cd/WINDOWS/Files/Repository/release/; \
     604        cp -r ${CYGWIN_REP_DIR}/release/singular-helper singular-cd/WINDOWS/Files/Repository/release/
     605        cp ${CYGWIN_AUX_FILES}/setup-cd.exe singular-cd/WINDOWS/Files/Repository/
    595606        cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> singular-cd/WINDOWS/Files/Repository/setup.ini
    596607
Note: See TracChangeset for help on using the changeset viewer.