From 52aae6114cdae5ccfb82aff448d449bab80c2bfb Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 5 Jan 2005 10:08:34 +0000 Subject: [PATCH] Remove the OS/2 relic lib/configure.cmd. Ensure that Windows knows how to run the /configure script by invoking it as "sh /configure". git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9429 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 4 + lib/configure.cmd | 294 ---------------------------------------------- src/ChangeLog | 8 ++ src/lyx_cb.C | 5 +- src/lyx_main.C | 6 +- 5 files changed, 19 insertions(+), 298 deletions(-) delete mode 100755 lib/configure.cmd diff --git a/lib/ChangeLog b/lib/ChangeLog index 3b83ad81df..9df66e39b0 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-01-04 Angus Leeming + + * configure.cmd. Remove this OS/2 relic. + 2004-12-29 Michael Schmitt * configure.m4: check for notepad editor diff --git a/lib/configure.cmd b/lib/configure.cmd deleted file mode 100755 index ee9c95ad45..0000000000 --- a/lib/configure.cmd +++ /dev/null @@ -1,294 +0,0 @@ -/* OS/2 REXX : The lib/configure.cmd; Don't delete this comment. */ -call RxFuncAdd 'SysLoadFuncs','RexxUtil','SysLoadFuncs' -call SysLoadFuncs -env='OS2ENVIRONMENT' -X11ROOT=value('X11ROOT',,env) -latex_script='chkconfig.ltx' -lyxrc_defaults='lyxrc.defaults' -lyx_check_config='yes' -rc_fontenc='default' - -parse arg option '=' srcdir -select - when option='-h'|option='-help'|option='--help' then do - say 'Usage: configure [options]' - say 'Options:' - say ' --help show this help lines' - say ' --without-latex-config do not run LaTeX to determine configuration' - exit - end - when option='--without-latex-config' then - lyx_check_config='no' - when option='--srcdir' then - srcdir=translate(srcdir,'\','/') - otherwise - nop -end /* select */ -if srcdir='' then do - parse source 'OS/2 COMMAND ' script -say 'script =' script - srcdir=filespec('drive',script)strip(filespec('path',script),'T','\') -end - -rc=SysFileTree(srcdir'\'latex_script,found,'F') -if found.0 = 0 then do - say "configure: error: cannot find "srcdir'\'latex_script" script" - exit 1 -end -curdir=directory() -if \(curdir=srcdir) then do - call SysFileTree 'layouts', 'found', 'D' - if found.0 = 0 then do - call SysMkDir 'bind' - call SysMkDir 'clipart' - call SysMkDir 'doc' - call SysMkDir 'examples' - call SysMkDir 'images' - call SysMkDir 'kbd' - call SysMkDir 'layouts' - call SysMkDir 'reLyX' - call SysMkDir 'scripts' - call SysMkDir 'templates' - call SysMkDir 'ui' - end - 'cmd /c copy /v' srcdir'\layouts\*.layout layouts' - if \(rc=0) then - say 'Error! copying layout files.' -end -curdir=translate(curdir,'/','\') -srcdir=translate(srcdir,'/','\') -A_.0=0 -call SEARCH_PROG 'converter latex dvi%latex $$i|latex2e $$i%"latex"' -call SEARCH_PROG 'converter latex pdf2%pdflatex $$i|pdflatex2e $$i%"latex"' -call SEARCH_PROG 'converter latex html%tth -t -e2 -L$$BaseName < $$i > $$o|latex2html -no_subdir -split 0 -show_section_numbers $$i|hevea -s $$i%"originaldir,needaux"' -call SEARCH_PROG 'converter literate latex%noweave -delay -index $$i > $$o%""' -call SEARCH_PROG 'converter dvi ps%dvips -o $$o $$i%""' -call SEARCH_PROG 'converter ps pdf%ps2pdf $$i%""' -call SEARCH_PROG 'converter ps fax%ksendfax $$i%""' -/* call SEARCH_PROG 'converter ps tiff%gs -sDEVICE=tiffg3 -sOutputFile=$$o -dNOPAUSE $$i -c quit|gsos2 -sDEVICE=tiffg3 -sOutputFile=$$o -dNOPAUSE $$i -c quit%""' */ -call SEARCH_PROG 'converter linuxdoc lyx%sgml2lyx $$i%""' -call SEARCH_PROG 'converter linuxdoc latex%sgml2latex $$i%""' -call SEARCH_PROG 'converter linuxdoc dvi%sgml2latex -o dvi $$i%""' -call SEARCH_PROG 'converter linuxdoc html%sgml2html $$i%""' -call SEARCH_PROG 'converter docbook dvi%sgmltools -b dvi $$i|db2dvi $$i%""' -call SEARCH_PROG 'converter docbook html%sgmltools -b html $$i|db2html $$i%""' -A_.0=A_.0+1;i=A_.0 -A_.i='' -call SEARCH_PROG 'converter latex lyx%reLyX -f $$i%""' -call SEARCH_PROG 'converter literate lyx%noweb2lyx $$i $$o%""' -call SEARCH_PROG 'converter html latex%html2latex $$i%""' -call SEARCH_PROG 'converter word latex%wvCleanLatex $$i $$o|word2x -f latex $$i%""' -A_.0=A_.0+1;i=A_.0 -A_.i='' -call SEARCH_PROG 'converter gif eps%convert $$i $$o%""' -call SEARCH_PROG 'converter png eps%convert $$i $$o%""' -call SEARCH_PROG 'converter jpg eps%convert $$i $$o%""' -call SEARCH_PROG 'converter gif png%convert $$i $$o%""' -A_.0=A_.0+1;i=A_.0 -A_.i='' -call SEARCH_PROG 'viewer dvi%xdvi' -call SEARCH_PROG 'viewer html%netscape' -call SEARCH_PROG 'viewer pdf%xpdf gv ghostview acroread' -call SEARCH_PROG 'viewer ps%gv -swap|ghostview -swap|gvpm -swap' -call SEARCH_PROG 'viewer eps%gv|ghostview|gvpm' -A_.0=A_.0+1;i=A_.0 -A_.i='' -call SEARCH_PROG 'ps_command%gs|gsos2' -call SEARCH_PROG 'ascii_roff_command%groff -t -Tlatin1 $$i' -call SEARCH_PROG 'chktex_command%chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38' -call SEARCH_PROG 'spell_command%ispell' -/* call SEARCH_PROG 'fax_command%fsend -p$$Phone -i$$i -d$$Name -m$$Comment' */ -call SEARCH_PROG 'print_spool_command%lp|lpr' -i=A_.0;A_.0=A_.0+1 -if pos('lpr',A_.i)>0 then - do - i=i+1 - A_.i='print_spool_printerprefix "-P"' - end -else - do - i=i+1 - A_.i='print_spool_printerprefix "-d "' - end -/* call SysFileTree 'reLyX\reLyX.cmd', 'found', 'F' */ -/* $ChkLaTeX -\nonstopmode\makeatletter -\ifx\undefined\documentclass\else - \message{ThisIsLaTeX2e} -\fi -\@@end - EOF */ -call WRITE_FILE 'chklatex.ltx' '$ChkLaTeX' -'cmd /c 'LATEX' chklatex.ltx>nul' -call SysFileSearch 'NotLaTeX2e', 'chklatex.log', chklatex -if chklatex.0 > 0 then LATEX='' - -rc=SysFileDelete('textclass.lst') -rc=SysFileDelete('packages.lst') -rc=SysFileDelete('chkconfig.sed') -if \(lyx_check_config='no') then -do - rc=SysFileTree(srcdir'\layouts\*.layout',found,'FO') - rc=SysFileDelete('chklayouts.tex') - rc=SysFileDelete('chkconfig.vars') - if found.0>0 then - do num=1 to found.0 - parse value filespec('name',found.num) with DocClass '.layout' - parse value DocClass with mainClass '_' subClass - if ''=subClass then - rc=lineout('chklayouts.tex','\TestDocClass{'DocClass'}') - else /* Not used, or must be empty? */ - rc=lineout('chklayouts.tex','\TestDocClass['mainClass'.cls]{'DocClass'}') - end - rc=lineout('chklayouts.tex') - sgmltools_cmd='' - chk_sgmltools='no' - if SGMLTOOLS='sgml2lyx' then - do - chk_sgmltools='yes' - sgmltools_cmd='\def\hassgmltools{}' - end - rc=SysFileDelete('wrap_chkconfig.ltx') - rc=lineout('wrap_chkconfig.ltx','\newcommand\srcdir{'srcdir'}') - rc=lineout('wrap_chkconfig.ltx',sgmltools_cmd) - rc=lineout('wrap_chkconfig.ltx','\input{'srcdir'/chkconfig.ltx}') - rc=lineout('wrap_chkconfig.ltx') - 'cmd /c 'LATEX' wrap_chkconfig.ltx' - size=stream('chkconfig.sed','c','query size') - rc=stream('chkconfig.sed','c','open') - if rxfuncquery(SysAddRexxMacro) then - rc=stream('chkconfig.sed','c','seek +'size) - else - rc=stream('chkconfig.sed','c','seek + 'size' write') - rc=lineout('chkconfig.sed','s/@chk_sgmltools@/'chk_sgmltools'/g') - rc=lineout('chkconfig.sed') - call SysFileSearch 'chk_fontenc=', 'chkconfig.vars', fontenc - if fontenc.0 > 0 then parse var fontenc.1 chk"='"rc_fontenc"'" -end - -call SysFileTree 'textclass.lst', 'file', 'FO' -if file.0=0 then -do -/* $TextClass -# This file declares layouts and their associated definition files -# (include dir. relative to the place where this file is). -# It contains only default values, since chkconfig.ltx could not be run -# for some reason. Run ./configure if you need to update it after a -# configuration change. -"article" "article" "article" -"report" "report" "report" -"book" "book" "book" -"linuxdoc" "linuxdoc" "linuxdoc" -"letter" "letter" "letter" - EOF */ - call WRITE_FILE 'textclass.lst' '$TextClass' - rc=lineout('chkconfig.sed','s/@.*@/???/g') - rc=lineout('chkconfig.sed') - rc_graphics='none' -end - -call SysFileTree 'chkconfig.sed', 'file', 'FO' -if file.0=0 then -do - rc=lineout('chkconfig.sed','s/@.*@/???/g') - rc=lineout('chkconfig.sed') -end - -call SysFileTree 'packages.lst', 'file', 'FO' -if file.0=0 then -do -/* $Packages -# This file should contain the list of LaTeX packages that have been -# recognized by LyX. Unfortunately, since configure could not find -# your LaTeX2e program, the tests have not been run. Run configure -# if you need to update it after a configuration change. - EOF */ - call WRITE_FILE 'packages.lst' '$Packages' -end - -say 'creating doc/LaTeXConfig.lyx' -'sed -f chkconfig.sed 'srcdir'/doc/LaTeXConfig.lyx.in >doc\LaTeXConfig.lyx' -call SysFileDelete 'chkconfig.sed' -call SysFileDelete 'chkconfig.vars' -call SysFileDelete 'wrap_chkconfig.ltx' -call SysFileDelete 'wrap_chkconfig.log' -call SysFileDelete 'chklatex.ltx' -call SysFileDelete 'chklatex.log' -call SysFileDelete 'chklayouts.tex' -call SysFileDelete 'missfont.log' - -say 'creating 'lyxrc_defaults -if rxfuncquery(SysAddRexxMacro) then - rc=stream(lyxrc_defaults,'c','seek =0') -rc=SysFileDelete(X11ROOT'\XFree86\bin\fsend2.cmd') -/* $LyXRC_Default -# This file has been automatically generated by LyX' lib/configure -# script. It contains default settings that have been determined by -# examining your system. PLEASE DO NOT MODIFY ANYTHING HERE! If you -# want to customize LyX, make a copy of the file LYXDIR/lyxrc as -# ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will -# override the values given here. -\Format text txt ASCII A -\Format textparagraph txt ASCII(paragraphs) "" -\Format docbook sgml DocBook B -\Format dvi dvi DVI D -\Format eps eps EPS "" -\Format fax "" Fax "" -\Format gif gif GIF "" -\Format html html HTML H -\Format jpg jpg JPEG "" -\Format latex tex LaTeX L -\Format linuxdoc sgml LinuxDoc x -\Format lyx lyx LyX "" -\Format literate nw NoWeb N -\Format pdf pdf PDF P -\Format pdf2 pdf "PDF (pdflatex)" F -\Format png png PNG "" -\Format ps ps Postscript t -\Format program "" Program "" -\Format word doc Word W - - - EOF */ -call WRITE_FILE lyxrc_defaults '$LyXRC_Default' -A_.0=A_.0+1;i=A_.0 -A_.i='font_encoding "'||rc_fontenc||'"' -do i=1 to A_.0 - if A_.i\='' then A_.i='\'||A_.i - call lineout lyxrc_defaults,A_.i -end -call lineout lyxrc_defaults -call lineout script -exit - -SEARCH_PROG: procedure expose A_. -parse arg LABEL '%' COMMANDS '%' ROUTE - i=A_.0+1 - A_.0=i - A_.i=LABEL||' "none" '||ROUTE - do while COMMANDS\='' - parse value COMMANDS with COMMAND '|' COMMANDS - parse upper value COMMAND with CMD ARGV - if (\(''=SysSearchPath('PATH',CMD||'.EXE'))|\(''=SysSearchPath('PATH',CMD||'.CMD'))) then - do - A_.i=LABEL||' "'||COMMAND||'" '||ROUTE - COMMANDS='' - end - end -return - -WRITE_FILE: procedure expose script -parse arg FILE TAG -call SysFileDelete FILE -C_='' -do while pos(TAG,C_)=0 - C_=linein(script) -end -C_=linein(script) -do while pos('EOF',C_)=0 - call lineout FILE,C_ - C_=linein(script) -end -call lineout FILE -/*call lineout script*/ -return diff --git a/src/ChangeLog b/src/ChangeLog index 6cd7aeb8d0..dd31bd9fa0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-01-04 Angus Leeming + + * lyx_cb.C (Reconfigure): + * lyx_main.C (queryUserLyXDir): + to run the /configure correctly on Windows, prefix + the path to the script with "sh " when generating the string that + is passed to system(). + 2005-01-04 Jürgen Spitzmüller * text3.C: reintroduce LFUN_{SUB|SUPER}SCRIPT. diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 6ed9e15399..211bae8df7 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -445,9 +445,10 @@ void Reconfigure(BufferView * bv) // Run configure in user lyx directory Path p(user_lyxdir()); + string const configure_script = AddName(system_lyxdir(), "configure"); + string const configure_command = "sh " + QuoteName(configure_script); Systemcall one; - one.startscript(Systemcall::Wait, - QuoteName(AddName(system_lyxdir(), "configure"))); + one.startscript(Systemcall::Wait, configure_command); p.pop(); bv->owner()->message(_("Reloading configuration...")); lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); diff --git a/src/lyx_main.C b/src/lyx_main.C index f76a5f4531..15cbee94a5 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -68,6 +68,7 @@ using lyx::support::GetEnv; using lyx::support::i18nLibFileSearch; using lyx::support::LibFileSearch; using lyx::support::Path; +using lyx::support::QuoteName; using lyx::support::rtrim; using lyx::support::setLyxPaths; using lyx::support::system_lyxdir; @@ -528,6 +529,7 @@ void LyX::deadKeyBindings(kb_keymap * kbmap) void LyX::queryUserLyXDir(bool explicit_userdir) { string const configure_script = AddName(system_lyxdir(), "configure"); + string const configure_command = "sh " + QuoteName(configure_script); // Does user directory exist? FileInfo fileInfo(user_lyxdir()); @@ -540,7 +542,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir) lyxerr << _("LyX: reconfiguring user directory") << endl; Path p(user_lyxdir()); - ::system(configure_script.c_str()); + ::system(configure_command.c_str()); lyxerr << "LyX: " << _("Done!") << endl; } return; @@ -561,7 +563,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir) // Run configure in user lyx directory Path p(user_lyxdir()); - ::system(configure_script.c_str()); + ::system(configure_command.c_str()); lyxerr << "LyX: " << _("Done!") << endl; } -- 2.39.2