From: David B. <bil...@us...> - 2013-09-28 03:44:57
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima CAS". The branch, master has been updated via 99f8cd5a99ee746aa282e0f7a14def7374e47ba3 (commit) from ce8a0a6adcdf89c4c4feddf7fa33e7e3703884ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99f8cd5a99ee746aa282e0f7a14def7374e47ba3 Author: David Billinghurst <dbm...@gm...> Date: Sat Sep 28 13:43:59 2013 +1000 Fix Postscript plotting on windows. Makefile.am: o Move files from $(prefix)/gnuplot to $(prefix)/gnuplot/bin o Install gnnuplot share, etc and license directories src/maxima.bat.in: o Update path to gnuplot binaries INSTALL.win32: o Add note to test Postscript plotting diff --git a/INSTALL.win32 b/INSTALL.win32 index 3b91e55..2cc11cb 100755 --- a/INSTALL.win32 +++ b/INSTALL.win32 @@ -17,6 +17,7 @@ distribution, I do the following in a MSYS window: ./configure --prefix=c:/maxima \ --enable-chm \ --enable-xmaxima-exe \ + --with-hhc=hhc \ --enable-lang-es --enable-lang-pt --enable-lang-pt_BR make make install @@ -247,13 +248,15 @@ directory (c:/maxima above) before testing the installation. - compile(f); - f(2); o Test the graphics systems in both xmaxima and wxmaxima - - plot2d(sin(x),[x,0,10]); - - plot3d(x*y,[x,-1,1],[y,-1,1]); - - load(draw)$ - draw3d(xu_grid = 30, yv_grid = 60, surface_hide = true, + plot2d(sin(x),[x,0,10]); + plot3d(x*y,[x,-1,1],[y,-1,1]); + load(draw)$ + draw3d(xu_grid = 30, yv_grid = 60, surface_hide = true, parametric_surface(cos(phi) * sin(theta), sin(phi) * sin(theta), cos(theta), theta, 0, %pi, phi, 0, 2 * %pi))$ + o Check that plotting to Postscript works + plot2d(sin(x),[x,0,10],[psfile,"pstest.ps"]); o Try out the on-line help: describe(sin) diff --git a/Makefile.am b/Makefile.am index ecde623..9f01031 100755 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,10 @@ iss: extradocinstall gnuplot wxmaxima win32-lisp-runtime # Install the gnuplot binary files gnuplot: mkdir -p $(prefix)/gnuplot - cp -rf $(GNUPLOTDIR)/bin/* $(prefix)/gnuplot + cp -rf $(GNUPLOTDIR)/bin $(prefix)/gnuplot + cp -rf $(GNUPLOTDIR)/share $(prefix)/gnuplot + cp -rf $(GNUPLOTDIR)/etc $(prefix)/gnuplot + cp -rf $(GNUPLOTDIR)/license $(prefix)/gnuplot # Install wxMaxima wxmaxima: diff --git a/src/maxima.bat.in b/src/maxima.bat.in index 8200dbc..ebac776 100755 --- a/src/maxima.bat.in +++ b/src/maxima.bat.in @@ -25,7 +25,7 @@ set maxima_prefix=@prefix@ set package=@PACKAGE@ set verbose=false set mingw_gccver=@GCCVER@ -set path=%maxima_prefix%\gnuplot;%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\@GCCVER@;%path% +set path=%maxima_prefix%\gnuplot\bin;%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\@GCCVER@;%path% if "%USERPROFILE%" == "" goto win9x if "%MAXIMA_USERDIR%" == "" set MAXIMA_USERDIR=%USERPROFILE%\maxima ----------------------------------------------------------------------- Summary of changes: INSTALL.win32 | 11 +++++++---- Makefile.am | 5 ++++- src/maxima.bat.in | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- Maxima CAS |