Changeset 684be2d in git


Ignore:
Timestamp:
Jan 15, 2009, 2:14:27 PM (14 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
4820e6031f295812abcdff3a062f9f1b9334cbec
Parents:
36657ff13a0d1380f433bdf205bebd1fc29e0667
Message:
Fehler in Cygwin-Skripten und Anpassungen wg. Upgrade auf Cygwin 1.7


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

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r36657ff r684be2d  
    196196
    197197BINDIST_DIRS        = kernel Singular doc IntegerProgramming modules
     198
    198199SHAREDIST_DIRS      = Singular doc emacs
     200
    199201TMPDIR              = ${TMP_DIR}/singdist
    200202
    … …  
    296298        ${MKINSTALLDIRS} ${TMPDIR}/singular-${CYGWIN_PORT_VER}
    297299        export CVS_RSH=ssh; export CVSROOT=:ext:monty.mathematik.uni-kl.de:/usr/local/Singular/cvsroot; \
    298         cd ${TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs export All;
     300        cd ${TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs co All;
    299301        cd  ${TMPDIR}; \
    300302        tar cjf singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 singular-${CYGWIN_PORT_VER};
    … …  
    333335        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    334336        @echo -e  '# xterm' >> /etc/postinstall/singular-icons.sh
    335         @echo -e  'if test -f /usr/bin/XWin.exe; then' >> /etc/postinstall/singular-icons.sh
     337        @echo -e  'if test -f /usr/X11R6/bin/xwin.exe; then' >> /etc/postinstall/singular-icons.sh
    336338        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    337         @echo -e  '       -i /usr/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    338         @echo -e  '       -P /usr/bin/startxwin.bat -n "Singular CAS\\Cygwin\\XTerm" \' >> /etc/postinstall/singular-icons.sh
     339        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
     340        @echo -e  '       -P /usr/X11R6/bin/startxwin.bat -n "Singular CAS\\Cygwin\\XTerm" \' >> /etc/postinstall/singular-icons.sh
    339341        @echo -e  '       -d "This starts the Cygwin X-Server and launches one XTerm"' >> /etc/postinstall/singular-icons.sh
    340342        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    341343        @echo -e  '# XServer + xterm' >> /etc/postinstall/singular-icons.sh
    342344        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    343         @echo -e  '       -i /usr/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    344         @echo -e  '       -P /usr/bin/startxwin.bat -n "Singular CAS\\Cygwin\\Start X - Server (+ XTerm)" \' >> /etc/postinstall/singular-icons.sh
     345        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
     346        @echo -e  '       -P /usr/X11R6/bin/startxwin.bat -n "Singular CAS\\Cygwin\\Start X - Server (+ XTerm)" \' >> /etc/postinstall/singular-icons.sh
    345347        @echo -e  '       -d "This starts the Cygwin X-Server and launches one XTerm"' >> /etc/postinstall/singular-icons.sh
    346348        @echo -e  'fi' >> /etc/postinstall/singular-icons.sh
    … …  
    348350        @echo -e  '##################### Singular CAS' >> /etc/postinstall/singular-icons.sh
    349351        @echo -e  '# Emacs + Singular EXP' >> /etc/postinstall/singular-icons.sh
    350         @echo -e  'if test -f /usr/bin/XWin.exe; then' >> /etc/postinstall/singular-icons.sh
     352        @echo -e  'if test -f /usr/X11R6/bin/xwin.exe; then' >> /etc/postinstall/singular-icons.sh
    351353        @echo -e  'mkshortcut -A -a \047bash -l -c "${CYGWIN_SINGULAR_BIN}/startxserver.bat && sleep 1 &&  ESingular"\047 \' >> /etc/postinstall/singular-icons.sh
    352354        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular CAS\\Singular (Emacs and X-Server) (experimental)" \' >> /etc/postinstall/singular-icons.sh
    353355        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
    354         @echo -e  '       -P /usr/bin/run.exe -d "Start Singular in Emacs after starting the X - Server"' >> /etc/postinstall/singular-icons.sh
     356        @echo -e  '       -P /usr/X11R6/bin/run.exe -d "Start Singular in Emacs after starting the X - Server"' >> /etc/postinstall/singular-icons.sh
    355357        @echo -e  'fi' >> /etc/postinstall/singular-icons.sh
    356358        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    … …  
    366368        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    367369        @echo -e  '# Singular in Emacs' >> /etc/postinstall/singular-icons.sh
    368         @echo -e  'if test -f usr/bin/XWin.exe; then' >> /etc/postinstall/singular-icons.sh
     370        @echo -e  'if test -f /usr/X11R6/bin/xwin.exe; then' >> /etc/postinstall/singular-icons.sh
    369371        @echo -e  'mkshortcut -A -a \047bash -l ESingular\047 \' >> /etc/postinstall/singular-icons.sh
    370372        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular CAS\\Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
    371373        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
    372         @echo -e  '       -P /usr/bin/run.exe \' >> /etc/postinstall/singular-icons.sh
     374        @echo -e  '       -P /usr/X11R6/bin/run.exe \' >> /etc/postinstall/singular-icons.sh
    373375        @echo -e  '       -d "Start Singular in Emacs"' >> /etc/postinstall/singular-icons.sh
    374376        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    375377        @echo -e  '# Only XServer' >> /etc/postinstall/singular-icons.sh
    376378        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    377         @echo -e  '       -i /usr/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    378         @echo -e  '       -w /usr/bin \' >> /etc/postinstall/singular-icons.sh
     379        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
     380        @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    379381        @echo -e  '       -P ${CYGWIN_SINGULAR_BIN}/startxserver.bat -n "Singular CAS\\Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
    380382        @echo -e  '       -d "This starts the Cygwin X-Server. Without XServer Emacs and Surf do not work."' >> /etc/postinstall/singular-icons.sh
    … …  
    383385        @echo -e  '##################### Desktop' >> /etc/postinstall/singular-icons.sh
    384386        @echo -e  '# Only XServer' >> /etc/postinstall/singular-icons.sh
    385         @echo -e  'if test -f /usr/bin/XWin.exe; then' >> /etc/postinstall/singular-icons.sh
     387        @echo -e  'if test -f /usr/X11R6/bin/xwin.exe; then' >> /etc/postinstall/singular-icons.sh
    386388        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    387         @echo -e  '       -i /usr/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    388         @echo -e  '       -w /usr/bin \' >> /etc/postinstall/singular-icons.sh
     389        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
     390        @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    389391        @echo -e  '       -D ${CYGWIN_SINGULAR_BIN}/startxserver.bat -n "Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
    390392        @echo -e  '       -d "This starts the Cygwin X-Server. Without XServer Emacs and Surf do not work."' >> /etc/postinstall/singular-icons.sh
    … …  
    393395        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
    394396        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
    395         @echo -e  '       -D /usr/bin/run.exe \'  >> /etc/postinstall/singular-icons.sh
     397        @echo -e  '       -D /usr/X11R6/bin/run.exe \'  >> /etc/postinstall/singular-icons.sh
    396398        @echo -e  '       -d "Start Singular in Emacs"' >> /etc/postinstall/singular-icons.sh
    397399        @echo -e  'fi' >> /etc/postinstall/singular-icons.sh
    … …  
    410412        @echo -e  "export SINGULAR_CHM_FILE=${CYGWIN_SINGULAR_DOC}/doc/Manual.chm" >> /usr/bin/ESingular
    411413        @echo -e  "export SINGULAR_EXAMPLES_DIR=${CYGWIN_SINGULAR_DOC}/examples" >> /usr/bin/ESingular
    412         @echo -e  'export PATH="${CYGWIN_SINGULAR_BIN}:/usr/bin:$$PATH"' >> /usr/bin/ESingular
     414        @echo -e  'export PATH="${CYGWIN_SINGULAR_BIN}:/usr/X11R6/bin:$$PATH"' >> /usr/bin/ESingular
    413415        @echo -e  'if [ -z $$DISPLAY ]; then export DISPLAY=:0.0; fi' >> /usr/bin/ESingular
    414416        @echo -e  "exec ${CYGWIN_SINGULAR_BIN}/ESingular.exe \$$*" >> /usr/bin/ESingular
    … …  
    570572        cp -r ${CYGWIN_REP_DIR}/release/* ${CYGWIN_ORIG}/Small/release
    571573        rm -rf ${CYGWIN_ORIG}/Small/release/Singular/singular-base-*-src.tar.bz2
    572         rm -rf ${CYGWIN_ORIG}/Small/release/Singular
    573574
    574575cygwin-setup: cygwin-setup-init cygwin-setup-helper
Note: See TracChangeset for help on using the changeset viewer.