From: <tr...@us...> - 2008-11-22 13:28:02
|
Revision: 5453 http://octave.svn.sourceforge.net/octave/?rev=5453&view=rev Author: treichl Date: 2008-11-22 13:27:48 +0000 (Sat, 22 Nov 2008) Log Message: ----------- Updates Added Paths: ----------- trunk/octave-forge/admin/MacOSX/createapp/Readme.cc trunk/octave-forge/admin/MacOSX/createapp/Readme.texi trunk/octave-forge/admin/MacOSX/createapp/startup.sh.in Removed Paths: ------------- trunk/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in trunk/octave-forge/admin/MacOSX/createapp/octaveapp.css trunk/octave-forge/admin/MacOSX/createapp/octaveapp.texi Copied: trunk/octave-forge/admin/MacOSX/createapp/Readme.cc (from rev 5448, trunk/octave-forge/admin/MacOSX/createapp/octaveapp.css) =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/Readme.cc (rev 0) +++ trunk/octave-forge/admin/MacOSX/createapp/Readme.cc 2008-11-22 13:27:48 UTC (rev 5453) @@ -0,0 +1,12 @@ +/* Copyright (c) 2008 Thomas Treichl <tr...@us...> */ +/* Permission is granted to copy, distribute and/or modify this document */ +/* under the terms of the GNU Free Documentation License, Version 1.2 */ +/* or any later version published by the Free Software Foundation; */ +/* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover */ +/* Texts. A copy of the license is available at the GNU website */ +/* http://www.gnu.org/licenses/fdl.txt. */ +body { font-family:Comic Sans MS; margin:50px; } +h1 { font-size:16pt; } +h2 { font-size:14pt; } +:visited { color:blue; } +.example { background-color:#EAEAEA; } \ No newline at end of file Copied: trunk/octave-forge/admin/MacOSX/createapp/Readme.texi (from rev 5448, trunk/octave-forge/admin/MacOSX/createapp/octaveapp.texi) =================================================================== (Binary files differ) Deleted: trunk/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in 2008-11-21 09:25:49 UTC (rev 5452) +++ trunk/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in 2008-11-22 13:27:48 UTC (rev 5453) @@ -1,53 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007, Thomas Treichl and Paul Kienzle -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. - -ROOT="${0%/script}" - -if [ -z ${OCTAVE_TERMINAL} ]; then -# This is the startup procedure written as AppleScript to open a -# Terminal.app (if the Terminal.app is not already running) and start -# the Octave program. -# 20071007 removed: open -a /Applications/Utilities/Terminal.app -osascript 2>&1>/dev/null <<EOF - tell application "System Events" to set ProcessList to get name of every process - tell application "Terminal" - activate - if ProcessList contains "Terminal" then - do script ("exec '${ROOT}/bin/octave'") - else - do script ("exec '${ROOT}/bin/octave'") in front window - end if - end tell -EOF - -# If you set the variable ${OCTAVE_TERMINAL} to "X11" then we try to -# open the X11 environment and a XTerm with the Octave program running -# in this XTerm instead of a shell. -elif [ ${OCTAVE_TERMINAL} == "x11" ]; then - open "/Applications/Utilities/X11.app" - if [ -z ${DISPLAY} ]; then export DISPLAY=:0.0; fi - /usr/X11R6/bin/xterm -fn -adobe-courier-medium-*-*-*-14-*-*-*-*-*-*-* \ - -e "'${ROOT}/bin/octave'"; -fi - -# Quit the Octave.application immediately after startup (ie. quitting -# it in the taskbar) because once it is started it cannot be restarted -# a second time. If Octave.app stays (eg. because of a crash) opened -# then restarting is not possible. -osascript 2>&1>/dev/null <<EOF - tell application "octave" - quit - end tell -EOF Deleted: trunk/octave-forge/admin/MacOSX/createapp/octaveapp.css =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/octaveapp.css 2008-11-21 09:25:49 UTC (rev 5452) +++ trunk/octave-forge/admin/MacOSX/createapp/octaveapp.css 2008-11-22 13:27:48 UTC (rev 5453) @@ -1,12 +0,0 @@ -/* Copyright (c) 2008 Thomas Treichl <tr...@us...> */ -/* Permission is granted to copy, distribute and/or modify this document */ -/* under the terms of the GNU Free Documentation License, Version 1.2 */ -/* or any later version published by the Free Software Foundation; */ -/* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover */ -/* Texts. A copy of the license is available at the GNU website */ -/* http://www.gnu.org/licenses/fdl.txt. */ -body { font-family:Comic Sans MS; margin:50px; } -h1 { font-size:16pt; } -h2 { font-size:14pt; } -:visited { color:blue; } -.example { background-color:#EAEAEA; } \ No newline at end of file Deleted: trunk/octave-forge/admin/MacOSX/createapp/octaveapp.texi =================================================================== (Binary files differ) Copied: trunk/octave-forge/admin/MacOSX/createapp/startup.sh.in (from rev 5448, trunk/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in) =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/startup.sh.in (rev 0) +++ trunk/octave-forge/admin/MacOSX/createapp/startup.sh.in 2008-11-22 13:27:48 UTC (rev 5453) @@ -0,0 +1,53 @@ +#!/bin/sh +# Copyright (C) 2007, Thomas Treichl and Paul Kienzle +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +ROOT="${0%/script}" + +if [ -z ${OCTAVE_TERMINAL} ]; then +# This is the startup procedure written as AppleScript to open a +# Terminal.app (if the Terminal.app is not already running) and start +# the Octave program. +# 20071007 removed: open -a /Applications/Utilities/Terminal.app +osascript 2>&1>/dev/null <<EOF + tell application "System Events" to set ProcessList to get name of every process + tell application "Terminal" + activate + if ProcessList contains "Terminal" then + do script ("exec '${ROOT}/bin/octave'") + else + do script ("exec '${ROOT}/bin/octave'") in front window + end if + end tell +EOF + +# If you set the variable ${OCTAVE_TERMINAL} to "X11" then we try to +# open the X11 environment and a XTerm with the Octave program running +# in this XTerm instead of a shell. +elif [ ${OCTAVE_TERMINAL} == "x11" ]; then + open "/Applications/Utilities/X11.app" + if [ -z ${DISPLAY} ]; then export DISPLAY=:0.0; fi + /usr/X11R6/bin/xterm -fn -adobe-courier-medium-*-*-*-14-*-*-*-*-*-*-* \ + -e "'${ROOT}/bin/octave'"; +fi + +# Quit the Octave.application immediately after startup (ie. quitting +# it in the taskbar) because once it is started it cannot be restarted +# a second time. If Octave.app stays (eg. because of a crash) opened +# then restarting is not possible. +osascript 2>&1>/dev/null <<EOF + tell application "octave" + quit + end tell +EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tr...@us...> - 2008-11-22 13:28:43
|
Revision: 5454 http://octave.svn.sourceforge.net/octave/?rev=5454&view=rev Author: treichl Date: 2008-11-22 13:28:30 +0000 (Sat, 22 Nov 2008) Log Message: ----------- Updates Added Paths: ----------- trunk/octave-forge/admin/MacOSX/createapp/Readme.css Removed Paths: ------------- trunk/octave-forge/admin/MacOSX/createapp/Readme.cc Deleted: trunk/octave-forge/admin/MacOSX/createapp/Readme.cc =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/Readme.cc 2008-11-22 13:27:48 UTC (rev 5453) +++ trunk/octave-forge/admin/MacOSX/createapp/Readme.cc 2008-11-22 13:28:30 UTC (rev 5454) @@ -1,12 +0,0 @@ -/* Copyright (c) 2008 Thomas Treichl <tr...@us...> */ -/* Permission is granted to copy, distribute and/or modify this document */ -/* under the terms of the GNU Free Documentation License, Version 1.2 */ -/* or any later version published by the Free Software Foundation; */ -/* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover */ -/* Texts. A copy of the license is available at the GNU website */ -/* http://www.gnu.org/licenses/fdl.txt. */ -body { font-family:Comic Sans MS; margin:50px; } -h1 { font-size:16pt; } -h2 { font-size:14pt; } -:visited { color:blue; } -.example { background-color:#EAEAEA; } \ No newline at end of file Copied: trunk/octave-forge/admin/MacOSX/createapp/Readme.css (from rev 5453, trunk/octave-forge/admin/MacOSX/createapp/Readme.cc) =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/Readme.css (rev 0) +++ trunk/octave-forge/admin/MacOSX/createapp/Readme.css 2008-11-22 13:28:30 UTC (rev 5454) @@ -0,0 +1,12 @@ +/* Copyright (c) 2008 Thomas Treichl <tr...@us...> */ +/* Permission is granted to copy, distribute and/or modify this document */ +/* under the terms of the GNU Free Documentation License, Version 1.2 */ +/* or any later version published by the Free Software Foundation; */ +/* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover */ +/* Texts. A copy of the license is available at the GNU website */ +/* http://www.gnu.org/licenses/fdl.txt. */ +body { font-family:Comic Sans MS; margin:50px; } +h1 { font-size:16pt; } +h2 { font-size:14pt; } +:visited { color:blue; } +.example { background-color:#EAEAEA; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tr...@us...> - 2008-11-22 22:13:53
|
Revision: 5457 http://octave.svn.sourceforge.net/octave/?rev=5457&view=rev Author: treichl Date: 2008-11-22 22:13:39 +0000 (Sat, 22 Nov 2008) Log Message: ----------- Make Octave.app ready for GraphicsMagick Modified Paths: -------------- trunk/octave-forge/admin/MacOSX/createapp/mkoctfile.in trunk/octave-forge/admin/MacOSX/createapp/octave.in trunk/octave-forge/admin/MacOSX/createapp/selfupdate.sh Modified: trunk/octave-forge/admin/MacOSX/createapp/mkoctfile.in =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/mkoctfile.in 2008-11-22 13:39:44 UTC (rev 5456) +++ trunk/octave-forge/admin/MacOSX/createapp/mkoctfile.in 2008-11-22 22:13:39 UTC (rev 5457) @@ -48,17 +48,10 @@ DL_LDFLAGS="-bundle -bundle_loader ${ROOT}/bin/octave-%VERSION%" SED="/usr/bin/sed" -# Export the variables that have been defined before so that the -# mkoctfile program gets knowledge about them. -# 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}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" \ - DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \ + DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" MAGICK_HOME="${ROOT}" \ "${ROOT}/bin/mkoctfile-%VERSION%" "$@" Modified: trunk/octave-forge/admin/MacOSX/createapp/octave.in =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/octave.in 2008-11-22 13:39:44 UTC (rev 5456) +++ trunk/octave-forge/admin/MacOSX/createapp/octave.in 2008-11-22 22:13:39 UTC (rev 5457) @@ -28,8 +28,9 @@ # Check if Gnuplot.app is installed in /Applications. Other # directories could be added in a similiar way. -if [ -d "/Applications/Gnuplot.app" ]; then - PATH="/Applications/Gnuplot.app/Contents/Resources/bin:$PATH" +INST="${ROOT%/Octave.app/Contents/Resources}" +if [ -d "${INST}/Gnuplot.app" ]; then + PATH="${INST}/Gnuplot.app/Contents/Resources/bin:$PATH" fi # Setting up various path information variables that are needed to @@ -56,17 +57,10 @@ CC=`mkoctfile -p CC` CXX=`mkoctfile -p CXX` -# Export the variables that have been defined before so that the -# Octave program gets knowledge about them. -# 20071007 removed: -# export OCTAVE_HOME PATH DYLD_LIBRARY_PATH -# export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS -# 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}" \ CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" \ - DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \ + DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" MAGICK_HOME="${ROOT}" \ "${ROOT}/bin/octave-%VERSION%" "$@" Modified: trunk/octave-forge/admin/MacOSX/createapp/selfupdate.sh =================================================================== --- trunk/octave-forge/admin/MacOSX/createapp/selfupdate.sh 2008-11-22 13:39:44 UTC (rev 5456) +++ trunk/octave-forge/admin/MacOSX/createapp/selfupdate.sh 2008-11-22 22:13:39 UTC (rev 5457) @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright (C) 2007-2008, Thomas Treichl and Paul Kienzle +# Copyright (C) 2007, Thomas Treichl and Paul Kienzle +# Copyright (C) 2008, Thomas Treichl # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -11,46 +12,51 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA -######################################################################## -# This file is meant for developers only who know how to look at the # -# one or other problem that might appear when using this script. Write # -# me an email offside any list if you think the script could be # -# improved in a better way than this. In any case: # -# DON'T USE ANY OF THE OCTAVE AND OCTAVE-FORGE MAILING-LISTS TO REPORT # -# ERRORS OR BUGS THAT MAY OCCUR IF THIS SCRIPT FAILS. # -######################################################################## - -# Put this script into the root directory of your Octave sources. -# Before you start this script make sure that you don't use Apple's -# original programs 'sed', 'awk', 'aclocal', 'automake' and 'bison' -# anymore. Download these latest GNU tools from the GNU website and -# install them eg. in /usr/local (make sure that you set the $PATH -# environment variable correctly below). Change the version number in -# the file src/version.h to the version number of the current -# Octave.app that should be replaced. Then modify the following -# APPPATH variable for your needs (the absolut path including -# Octave.app that should be updated). +# USAGE: +# Put this script into the root directory of your Octave sources. +# Before you start this script by a call of './selfupdate.sh' make +# sure that you don't use Apple's original programs 'sed', 'awk', +# 'aclocal', 'automake', 'bison' and 'flex' anymore. Download these +# latest GNU tools from the GNU website and install them anywhere on +# your system where they can be found (eg. in /usr/local/bin, make +# sure that you set the $PATH environment variable correctly +# below). On my system this looks like +# bash ~$ which {sed,awk,aclocal,automake,bison,flex} +# /usr/local/bin/sed +# /usr/local/bin/awk +# /usr/local/bin/aclocal +# /usr/local/bin/automake +# /usr/local/bin/bison +# /usr/local/bin/flex +# /usr/local/bin/sed +# Change the version number in the file src/version.h to that +# version number of the current Octave.app that should be +# updated. Then modify the following APPPATH variable for your +# needs (the absolut path including Octave.app that should be +# updated). APPPATH=/Applications/Octave.app -# Don't change one of the following three lines. These lines are used +# Don't change one of the following four lines. These lines are used # internally here and are already set up correctly if APPPATH is set # up correctly. PRFPATH=${APPPATH}/Contents/Resources INCPATH=${PRFPATH}/include LIBPATH=${PRFPATH}/lib +BINPATH=${PRFPATH}/bin -# Add the option -gdwarf-2 to CFLAGS, CPPFLAGS and CXXFLAGS if you -# want to create a gdb version of Octave. +# Add the option -ggdb to CFLAGS, CPPFLAGS and CXXFLAGS if you want to +# create a debug version of Octave by adding -ggdb to OPTFLAGS. ARCH="-arch i386" +OPTFLAGS="-O3 -ftree-vectorize -march=i686 -mfpmath=sse,387 -fforce-addr -mieee-fp -msse3 -msse2 -msse -mmmx -ggdb" # Here are the optimization flags that can be used on a PPC platform +# ARCH="-arch ppc" # OPTFLAGS="-O3 -ftree-vectorize -mpowerpc -faltivec -maltivec -mabi=altivec" -# Here are the optimization flags that can be used on a i386 platform -OPTFLAGS="-O3 -ftree-vectorize -march=i686 -mfpmath=sse,387 -fforce-addr -mieee-fp -msse3 -msse2 -msse -mmmx" - # If you are running a Mac OS X 10.3 on the PPC platform then change to # MACOSX_DEPLOYMENT_TARGET=10.3 export MACOSX_DEPLOYMENT_TARGET=10.4 @@ -62,25 +68,26 @@ # If you are running a Mac OS X 10.3 on the PPC platform then change to # -isysroot /Developer/SDKs/MacOSX10.3.9.sdk and in the LDFLAGS use that # line -Wl,-syslibroot -Wl,/Developer/SDKs/MacOSX10.3.9.sdk -CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -I${INCPATH} -I${INCPATH}/curl -I${INCPATH}/readline" +CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/usr/X11R6/include -I${INCPATH} -I${INCPATH}/curl -I${INCPATH}/readline -I${INCPATH}/freetype -I${INCPATH}/GraphicsMagick" CPPFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" +#LDFLAGS="-L${LIBPATH} -L${LIBPATH}/pkgconfig -Wl,-headerpad_max_install_names -Wl,-syslibroot -Wl,/Developer/SDKs/MacOSX10.4u.sdk -Xlinker -m" LDFLAGS="-L${LIBPATH} -L${LIBPATH}/pkgconfig -Wl,-headerpad_max_install_names -Wl,-syslibroot -Wl,/Developer/SDKs/MacOSX10.4u.sdk" # Note: another architecture flag and isysroot information here, change # this if you are running a Mac OS X on the PPC platform F77="fort77 ${OPTFLAGS}" FLIBS="-L${LIBPATH} -lf2c" -FFLAGS="-Wc,-arch -Wc,i386 -Wc,-isysroot -Wc,/Developer/SDKs/MacOSX10.4u.sdk ${OPTFLAGS} -I${INCPATH} -I${INCPATH}/curl -I${INCPATH}/readline" +FFLAGS="-Wc,-arch -Wc,i386 -Wc,-isysroot -Wc,/Developer/SDKs/MacOSX10.4u.sdk ${OPTFLAGS} -I${INCPATH}" # If you are running a Mac OS X 10.3 on the PPC platform then change to # EXTRACONF="--host=powerpc-apple-darwin7.9.1" -EXTRACONF="--host=powerpc-apple-darwin8.9.1 --prefix=${PRFPATH} --enable-shared" +EXTRACONF="--host=i386-apple-darwin8.9.1" # I have installed the GNU tools in /usr/local/bin, that's why I need -# to use this path. We use f2c from the current Octave.app, that's why -# we add ${PRFPATH}/bin to the current path. -export PATH=/usr/local/bin:${PRFPATH}/bin:$PATH +# to use this path. I use f2c from the current Octave.app, that's why +# I add ${PRFPATH}/bin to the current path. +export PATH=${BINPATH}:/usr/local/bin:${PATH} export DYLD_LIBRARY_PATH=${LIBPATH} # Function: evalfailexit @@ -101,11 +108,11 @@ # Rebuild the './configure' script with './autogen.sh' to make sure # that we have the latest changes available. -# evalfailexit "./autogen.sh" +evalfailexit "./autogen.sh" evalfailexit "./configure CC=\"${GCC}\" CPP=\"${CPP}\" CXX=\"${CXX}\" \ F77=\"${F77}\" FLIBS=\"${FLIBS}\" FFLAGS=\"${FFLAGS}\" \ CFLAGS=\"${CFLAGS}\" CPPFLAGS=\"${CPPFLAGS}\" CXXFLAGS=\"${CXXFLAGS}\" \ - LDFLAGS=\"${LDFLAGS}\" ${EXTRACONF}" + LDFLAGS=\"${LDFLAGS}\" --prefix=${PRFPATH} --enable-shared" evalfailexit "make" # This is the point of *no return*: If something goes wrong in the @@ -121,7 +128,7 @@ evalfailexit "make install" # Replace the new created startup scripts that have been installed -# with the old startup scripts of Octave.app. +# with the old startup scripts of Octave.app - keep the _* files. evalfailexit "mv ${PRFPATH}/bin/_octave ${PRFPATH}/bin/octave" evalfailexit "mv ${PRFPATH}/bin/_mkoctfile ${PRFPATH}/bin/mkoctfile" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |