Changeset 361b493 in git


Ignore:
Timestamp:
Dec 12, 2008, 12:06:58 PM (14 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
c60d609493bbe4e22ec5f30488dafd91dd33ccbc
Parents:
d184e34eb772a828024cf845505c90a05af2c6b2
Message:
*frank, oliver: Cygwinsetup angepasst und patch file für Cygwins setup.exe erzeugt


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

Legend:

Unmodified
Added
Removed

  • Makefile.in

    rd184e3 r361b493  
    298298        ${MKINSTALLDIRS} ${TMPDIR}/singular-${CYGWIN_PORT_VER}
    299299        export CVS_RSH=ssh; export CVSROOT=:ext:monty.mathematik.uni-kl.de:/usr/local/Singular/cvsroot; \
    300         cd ${TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs co All;
     300        cd ${TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs export All;
    301301        cd  ${TMPDIR}; \
    302302        tar cjf singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 singular-${CYGWIN_PORT_VER};
    … …  
    492492        mkdir ${CYGWIN_REP_DIR}
    493493        mkdir ${CYGWIN_REP_DIR}/release
    494         mkdir ${CYGWIN_REP_DIR}/release/singular-base
    495         mkdir ${CYGWIN_REP_DIR}/release/singular-share
    496         mkdir ${CYGWIN_REP_DIR}/release/singular-help
    497         mkdir ${CYGWIN_REP_DIR}/release/singular-surf
    498         mkdir ${CYGWIN_REP_DIR}/release/singular-icons
    499         mkdir ${CYGWIN_REP_DIR}/release/singular-helper
    500         tar cjf ${CYGWIN_REP_DIR}/release/singular-base/singular-base-${CYGWIN_PORT_VER}.tar.bz2 \
     494        mkdir ${CYGWIN_REP_DIR}/release/Singular
     495        tar cjf ${CYGWIN_REP_DIR}/release/Singular/singular-base-${CYGWIN_PORT_VER}.tar.bz2 \
    501496              /usr/share/doc/Cygwin/singular-base-${CYGWIN_SING_VER}.README \
    502497              /usr/share/doc/Singular-${CYGWIN_SING_VER}/COPYING  \
    … …  
    514509              ${CYGWIN_SINGULAR_BIN}/libparse.exe     \
    515510              ${CYGWIN_SINGULAR_BIN}/gen_test.exe
    516         tar cjf ${CYGWIN_REP_DIR}/release/singular-surf/singular-surf-${CYGWIN_PORT_VER}.tar.bz2 \
     511        tar cjf ${CYGWIN_REP_DIR}/release/Singular/singular-surf-${CYGWIN_PORT_VER}.tar.bz2 \
    517512              /usr/share/doc/Cygwin/singular-surf-${CYGWIN_SING_VER}.README \
    518513              /usr/bin/surf.exe                     \
    … …  
    525520              ${CYGWIN_SINGULAR_ROOT}/LIB/surfex.lib
    526521        tar -cj --exclude='surf*' -f \
    527               ${CYGWIN_REP_DIR}/release/singular-share/singular-share-${CYGWIN_PORT_VER}.tar.bz2 \
     522              ${CYGWIN_REP_DIR}/release/Singular/singular-share-${CYGWIN_PORT_VER}.tar.bz2 \
    528523              /usr/share/doc/Cygwin/singular-share-${CYGWIN_SING_VER}.README \
    529524              ${CYGWIN_SINGULAR_ROOT}/*
    530         tar cjf ${CYGWIN_REP_DIR}/release/singular-help/singular-help-${CYGWIN_PORT_VER}.tar.bz2 \
     525        tar cjf ${CYGWIN_REP_DIR}/release/Singular/singular-help-${CYGWIN_PORT_VER}.tar.bz2 \
    531526              /usr/share/doc/Cygwin/singular-help-${CYGWIN_SING_VER}.README \
    532527              /usr/share/info/singular.info                                 \
    533528              ${CYGWIN_SINGULAR_DOC}/*
    534         tar cjf ${CYGWIN_REP_DIR}/release/singular-icons/singular-icons-${CYGWIN_PORT_VER}.tar.bz2  \
     529        tar cjf ${CYGWIN_REP_DIR}/release/Singular/singular-icons-${CYGWIN_PORT_VER}.tar.bz2  \
    535530              /usr/share/doc/Cygwin/singular-icons-${CYGWIN_SING_VER}.README \
    536531              ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe                \
    537532              ${CYGWIN_SINGULAR_BIN}/startxserver.bat                \
    538533              /etc/postinstall/singular-icons.sh
    539         touch ${CYGWIN_REP_DIR}/release/singular-helper/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
    540         cp singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 ${CYGWIN_REP_DIR}/release/singular-base/
     534        cp singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 ${CYGWIN_REP_DIR}/release/Singular/
    541535        touch ${CYGWIN_AUX_FILES}/singular-surf-${CYGWIN_PORT_VER}-src.tar.bz2
    542         cp ${CYGWIN_AUX_FILES}/singular-surf-${CYGWIN_PORT_VER}-src.tar.bz2 ${CYGWIN_REP_DIR}/release/singular-surf/
    543         cp ${CYGWIN_AUX_FILES}/setup-base.hint ${CYGWIN_REP_DIR}/release/singular-base/setup.hint
    544         cp ${CYGWIN_AUX_FILES}/setup-share.hint ${CYGWIN_REP_DIR}/release/singular-share/setup.hint
    545         cp ${CYGWIN_AUX_FILES}/setup-help.hint ${CYGWIN_REP_DIR}/release/singular-help/setup.hint
    546         cp ${CYGWIN_AUX_FILES}/setup-surf.hint ${CYGWIN_REP_DIR}/release/singular-surf/setup.hint
    547         cp ${CYGWIN_AUX_FILES}/setup-icons.hint ${CYGWIN_REP_DIR}/release/singular-icons/setup.hint
    548         cp ${CYGWIN_AUX_FILES}/setup-helper.hint ${CYGWIN_REP_DIR}/release/singular-helper/setup.hint
     536        cp ${CYGWIN_AUX_FILES}/singular-surf-${CYGWIN_PORT_VER}-src.tar.bz2 ${CYGWIN_REP_DIR}/release/Singular/
    549537
    550538cygwin-helper: cygwin-setup-init cygwin-setup-helper
    551         ${MKINSTALLDIRS} ${CYGWIN_REP_DIR}/release/singular-helper
    552         touch ${CYGWIN_REP_DIR}/release/singular-helper/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
    553         cp ${CYGWIN_AUX_FILES}/setup-helper.hint ${CYGWIN_REP_DIR}/release/singular-helper/setup.hint
    554 
    555 cygwin-dist: cygwin-dist-install cygwin-dist-pack cygwin-helper
     539        ${MKINSTALLDIRS} ${CYGWIN_REP_DIR}/release/Singular
     540        touch ${CYGWIN_REP_DIR}/release/Singular/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
     541
     542cygwin-dist: cygwin-dist-install cygwin-dist-pack
    556543
    557544cygwin-setup-init:
    … …  
    581568        cd ${CYGWIN_REP_DIR} && md5sum setup.* | sed -e 's/*//g' > md5.sum
    582569        cp -r ${CYGWIN_REP_DIR}/release/* ${CYGWIN_ORIG}/Full/release
    583         rm -rf ${CYGWIN_ORIG}/Full/release/singular-base/singular-base-*-src.tar.bz2
    584         rm -rf ${CYGWIN_ORIG}/Full/release/singular-surf/singular-surf-*-src.tar.bz2
     570        rm -rf ${CYGWIN_ORIG}/Full/release/Singular/singular-base-*-src.tar.bz2
     571        rm -rf ${CYGWIN_ORIG}/Full/release/Singular/singular-surf-*-src.tar.bz2
    585572        cp -r ${CYGWIN_REP_DIR}/release/* ${CYGWIN_ORIG}/Small/release
    586         rm -rf ${CYGWIN_ORIG}/Small/release/singular-base/singular-base-*-src.tar.bz2
    587         rm -rf ${CYGWIN_ORIG}/Small/release/singular-surf
     573        rm -rf ${CYGWIN_ORIG}/Small/release/Singular/singular-base-*-src.tar.bz2
     574        rm -rf ${CYGWIN_ORIG}/Small/release/Singular
    588575
    589576cygwin-setup: cygwin-setup-init cygwin-setup-helper
    … …  
    595582        @echo "Writing ${CYGWIN_REP_DIR}/setup.ini ($*)"
    596583        @echo "@ singular-$*" >> ${CYGWIN_REP_DIR}/setup.ini
    597         cat ${CYGWIN_REP_DIR}/release/singular-$*/setup.hint >> ${CYGWIN_REP_DIR}/setup.ini
     584        cat ${CYGWIN_AUX_FILES}/setup-$*.hint >> ${CYGWIN_REP_DIR}/setup.ini
    598585        @echo "version: ${CYGWIN_PORT_VER}" >> ${CYGWIN_REP_DIR}/setup.ini
    599         @echo -n "install: release/singular-$*/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 "  >> ${CYGWIN_REP_DIR}/setup.ini
    600         @echo -n `du -b ${CYGWIN_REP_DIR}/release/singular-$*/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 | sed -e 's/\([0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini
     586        @echo -n "install: release/Singular/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 "  >> ${CYGWIN_REP_DIR}/setup.ini
     587        @echo -n `du -b ${CYGWIN_REP_DIR}/release/Singular/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 | sed -e 's/\([0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini
    601588        @echo -n " " >> ${CYGWIN_REP_DIR}/setup.ini
    602         @echo `md5sum ${CYGWIN_REP_DIR}/release/singular-$*/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 | sed -e 's/\([a-zA-Z0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini
    603         @if test -e ${CYGWIN_REP_DIR}/release/singular-$*/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2; then \
    604           echo -n "source: release/singular-$*/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2 "  >> ${CYGWIN_REP_DIR}/setup.ini; \
    605           echo -n `du -b ${CYGWIN_REP_DIR}/release/singular-$*/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2 | sed -e 's/\([0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini; \
     589        @echo `md5sum ${CYGWIN_REP_DIR}/release/Singular/singular-$*-${CYGWIN_PORT_VER}.tar.bz2 | sed -e 's/\([a-zA-Z0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini
     590        @if test -e ${CYGWIN_REP_DIR}/release/Singular/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2; then \
     591          echo -n "source: release/Singular/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2 "  >> ${CYGWIN_REP_DIR}/setup.ini; \
     592          echo -n `du -b ${CYGWIN_REP_DIR}/release/Singular/singular-$*-${CYGWIN_PORT_VER}-src.tar.bz2 | sed -e 's/\([0-9]*\).*/\1/g'` >> ${CYGWIN_REP_DIR}/setup.ini; \
    606593          echo -n " " >> ${CYGWIN_REP_DIR}/setup.ini; \
    607           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; \
     594          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; \
    608595        fi;
    609596        @echo >> ${CYGWIN_REP_DIR}/setup.ini
    … …  
    615602        ${MKINSTALLDIRS} ${TMPDIR}/Files
    616603        cp -r ${CYGWIN_ORIG}/$*/* ${TMPDIR}/Files/
    617         cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/
     604        touch ${TMPDIR}/Files/release/Singular/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
    618605        @echo "Creating $* distribution ..."
    619 #       @if test "$*" = "Full"; then \
    620 #         echo "Create Full distribution"; \
    621 #         cp -r ${CYGWIN_REP_DIR}/release/singular* ${TMPDIR}/Files/release/; \
    622 #       else \
    623 #         echo "Create Small distribution"; \
    624 #         cp -r ${CYGWIN_REP_DIR}/release/singular-base ${TMPDIR}/Files/release/; \
    625 #         cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/; \
    626 #         cp -r ${CYGWIN_REP_DIR}/release/singular-help ${TMPDIR}/Files/release/; \
    627 #         cp -r ${CYGWIN_REP_DIR}/release/singular-icons ${TMPDIR}/Files/release/; \
    628 #         cp -r ${CYGWIN_REP_DIR}/release/singular-share ${TMPDIR}/Files/release/; \
    629 #       fi;
    630 #       -rm -f  ${TMPDIR}/Files/release/singular-base/*src.tar.bz2
    631 #       -rm -f  ${TMPDIR}/Files/release/singular-surf/*src.tar.bz2
    632606        -rm -f  ${TMPDIR}/Files/setup.exe
    633607        cp ${CYGWIN_AUX_FILES}/setup-pfw.exe ${TMPDIR}/Files/setup.exe
    … …  
    683657        ${CYGWIN_PFW_EXEC} -a -s "`cygpath -a -w ${TMPDIR}/Singular.pfw`"
    684658
    685 #cygwin-cd-repository:
    686 #       ${MKINSTALLDIRS} Repository
    687 #       cp -r ${CYGWIN_ORIG}/cd-repository/* Repository/
    688 #       cp -r ${CYGWIN_REP_DIR}/release/singular-helper Repository/release/
    689 #       cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> Repository/setup.ini
    690 
    691659singular-cd-windows:
    692660        @echo Building cd directories and web interface
    … …  
    700668        @echo Building cygwin-cd-repository
    701669        cp -r ${CYGWIN_ORIG}/cd-repository/* singular-cd/WINDOWS/Files/Repository/
    702         cp -r ${CYGWIN_REP_DIR}/release/singular-helper singular-cd/WINDOWS/Files/Repository/release/
     670        cp -r ${CYGWIN_REP_DIR}/release/Singular singular-cd/WINDOWS/Files/Repository/release/
    703671        cp ${CYGWIN_AUX_FILES}/setup-cd.exe singular-cd/WINDOWS/Files/Repository/
    704672        cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> singular-cd/WINDOWS/Files/Repository/setup.ini
Note: See TracChangeset for help on using the changeset viewer.