From: Thomas T. <tr...@us...> - 2007-10-14 08:09:43
|
Update of /cvsroot/octave/octave-forge/admin/MacOSX/createapp In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29367/createapp Modified Files: _DS_Store_Main mkoctfile.in octave.in octaveapp.texi Log Message: Further changes to build and pack Octave.app 2.9.15. Index: _DS_Store_Main =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/_DS_Store_Main,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 Binary files /tmp/cvsw5AWqX and /tmp/cvsojWadt differ Index: mkoctfile.in =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/mkoctfile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mkoctfile.in 16 Jul 2007 16:27:34 -0000 1.8 +++ mkoctfile.in 14 Oct 2007 08:09:42 -0000 1.9 @@ -51,9 +51,15 @@ # Export the variables that have been defined before so that the # mkoctfile program gets knowledge about them. -export OCTAVE_HOME PATH DYLD_LIBRARY_PATH -export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS -export DL_LDFLAGS SED +# 20071007 removed: +# export OCTAVE_HOME PATH DYLD_LIBRARY_PATH +# export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS +# export DL_LDFLAGS SED # Invoke mkoctfile, preserving spaces in all the input arguments. +OCTAVE_HOME="${OCTAVE_HOME}" PATH="${PATH}" \ + DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \ "${ROOT}/bin/mkoctfile-%VERSION%" "$@" Index: octaveapp.texi =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/octaveapp.texi,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- octaveapp.texi 7 Oct 2007 16:51:54 -0000 1.17 +++ octaveapp.texi 14 Oct 2007 08:09:42 -0000 1.18 @@ -104,9 +104,9 @@ @end example @item @b{How can I startup Octave.app with a XTerm window?} @* -If you prefer using the application @command{xterm} instead of the Terminal.app that comes with your X11 runtime environment (Install from 'DVD 1 of your Mac OS X Install Discs') then you can set up the environment variable @var{OCTAVE_TERMINAL=X11} before starting the Octave.app. A description about how to set up environment variables for all processes launched by a specific user can be found at @uref{http://developer.apple.com/qa/qa2001/qa1067.html}. If you installed Octave.app in your applications folder then a one time startup might look like eg. +If you prefer using the application @command{xterm} instead of the Terminal.app that comes with your X11 runtime environment (Install from 'DVD 1 of your Mac OS X Install Discs') then you can set up the environment variable @var{OCTAVE_TERMINAL=x11} before starting the Octave.app. A description about how to set up environment variables for all processes launched by a specific user can be found at @uref{http://developer.apple.com/qa/qa2001/qa1067.html}. If you installed Octave.app in your applications folder then a one time startup might look like eg. @example -bash ~$ export OCTAVE_TERMINAL=X11 +bash ~$ export OCTAVE_TERMINAL=x11 # lower case letter 'x' bash ~$ open /Applications/Octave.app @end example @@ -185,7 +185,7 @@ @html{} <hr> @end html -File created from @file{octaveapp.texi} with makeinfo at %DATE%. +File created from @file{admin/MacOSX/createapp/octaveapp.texi} with makeinfo at %DATE%. @end ifhtml @c %*** End of BODY Index: octave.in =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/octave.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- octave.in 7 Oct 2007 16:53:22 -0000 1.13 +++ octave.in 14 Oct 2007 08:09:42 -0000 1.14 @@ -63,7 +63,9 @@ # export DL_LDFLAGS SED # Invoke Octave, preserving spaces in all the input arguments. -OCTAVE_HOME="${OCTAVE_HOME}" PATH="${PATH}" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \ -CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ -LDFLAGS="${LDFLAGS}" DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \ +OCTAVE_HOME="${OCTAVE_HOME}" PATH="${PATH}" \ + DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \ "${ROOT}/bin/octave-%VERSION%" "$@" |