From: N. Brouard Date: Tue, 18 Aug 2015 23:23:08 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: imach-099s7~345 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=b513698766cba339b3440b725c7f84785006cb89;p=.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e843331..992fd88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/version.h.in" - "${PROJECT_BINARY_DIR}/version.h" + "${PROJECT_SOURCE_DIR}/src/version.h" ) CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/config.h.in" @@ -48,6 +48,7 @@ if(UNIX) set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons") endif() if(MSVC) + set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll b/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll new file mode 100755 index 0000000..b9c3ab5 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll b/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll new file mode 100755 index 0000000..c3261a8 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll new file mode 100755 index 0000000..fe09c82 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll new file mode 100755 index 0000000..b304e5e Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll new file mode 100755 index 0000000..92836aa Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll new file mode 100755 index 0000000..7b70d14 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll new file mode 100755 index 0000000..1f4c0ca Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll new file mode 100755 index 0000000..516ead6 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll new file mode 100755 index 0000000..9b2b38f Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll new file mode 100755 index 0000000..f55b4da Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll new file mode 100755 index 0000000..6198fa3 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll new file mode 100755 index 0000000..9e1d5a4 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll new file mode 100755 index 0000000..db88a8d Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll new file mode 100755 index 0000000..2ec5039 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll new file mode 100755 index 0000000..8659e2c Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll new file mode 100755 index 0000000..2804528 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll new file mode 100755 index 0000000..7de80e0 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll new file mode 100755 index 0000000..7ffc552 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll new file mode 100755 index 0000000..91c5bc2 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll new file mode 100755 index 0000000..29f0cb0 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll b/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll new file mode 100755 index 0000000..d3ea862 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm new file mode 100644 index 0000000..6f4006d Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu new file mode 100644 index 0000000..70fd63d --- /dev/null +++ b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu @@ -0,0 +1,755 @@ +; Menu file for Windows gnuplot +; Roger Hadgraft, 26-5-92 +; Russell Lang, 30 Nov 1992 +; Modified for 4.0, John Bollinger, 31 Dec 2002 +; translated by Masahito Yamaga (ma@yama-ga.com) (for 3.7.2) +; translated by Shigeharu TAKENO 03/25 2006 (for 4.1) +; $Id$ + +[Menu] +ƒtƒ@ƒCƒ‹(&F) + ŠJ‚­(&O) ... + load '[OPEN]load[EOS]*.plt[EOS]'{ENTER} + •Û‘¶(&S) ... + save '[SAVE]save[EOS]*.plt[EOS]'{ENTER} + ƒfƒ‚(&D) ... + load '[OPEN]load[EOS]*.dem[EOS]'{ENTER} + -- + ƒfƒBƒŒƒNƒgƒŠ‚̈ړ®(&C) ... + cd '[DIRECTORY]New directory?[EOS]'{ENTER} + Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ(&D) + pwd{ENTER} + -- + o—͐æ‚̐ݒè(&U) ... + set output "[INPUT]Output filename?[EOS]"{ENTER} + ƒvƒŠƒ“ƒ^‚Ö(&P) + set output "PRN"{ENTER} + ƒEƒBƒ“ƒhƒE•\Ž¦(&W) + set output{ENTER}set terminal win{ENTER} + Œ»Ý‚̏o—͐æ + show output{ENTER} + o—̓fƒoƒCƒX‚̐ݒè(&T) ... + set terminal [INPUT]Terminal type?{ENTER} + o—̓fƒoƒCƒX‚Ì•\Ž¦ + set terminal{ENTER}show terminal{ENTER} + -- + [Menu] + s•ÒW + ‘O‚ÉŽÀs‚µ‚½ƒRƒ}ƒ“ƒh ^P + {^P} + ŽŸ‚ÉŽÀs‚µ‚½ƒRƒ}ƒ“ƒh ^N + {^N} + -- + ˆê•¶Žš–ß‚é ^B + {^B} + ˆê•¶Žši‚Þ ^F + {^F} + -- + s“ª‚ÖˆÚ“® ^A + {^A} + s––‚ÖˆÚ“® ^E + {^E} + -- + ƒJ[ƒ\ƒ‹‚Ì‘O‚̈ꕶŽš‚ðíœ ^H + {^H} + ƒJ[ƒ\ƒ‹ã‚̈ꕶŽšíœ ^D + {^D} + ƒJ[ƒ\ƒ‹‚Ì‘O‚̈êŒê‚ðíœ ^W + {^W} + ƒJ[ƒ\ƒ‹ˆÈ~‚ð‚·‚×‚Äíœ ^K + {^K} + s‚ð‚·‚×‚Äíœ ^U + {^U} + -- + s‚ðÄ•\Ž¦ ^L + {^L} + [EndMenu] + DOS ‘‹‚ðŠJ‚­ + shell{ENTER} + DOS ‚̃Rƒ}ƒ“ƒh‚ðŽÀs ... + ![INPUT]DOS command?{ENTER} + -- + I—¹(&X) + quit{ENTER} +[EndMenu] + +[Menu] +ƒvƒƒbƒg(&P) + ƒvƒƒbƒg (plot) + plot + 3ŽŸŒ³ƒvƒƒbƒg (splot) + splot + Äƒvƒƒbƒg (replot) + replot{ENTER} + ƒfƒoƒCƒX‚ðƒNƒŠƒA (clear) + clear{ENTER} + -- + ”͈͎w’è + [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS] + “Á’è‚̕ϐ”‚͈͎̔w’è + [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS] + -- + ƒf[ƒ^ƒtƒ@ƒCƒ‹–¼ ... + '[OPEN]Open[EOS]*.dat[EOS]' [EOS] + x,y ‚Æ‚µ‚ÄŽg‚¤—ñ + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS] + x,y,ydelta ‚Æ‚µ‚ÄŽg‚¤—ñ + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS] + x,y,ylow,yhigh ‚Æ‚µ‚ÄŽg‚¤—ñ + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS] + -- + [Menu] + ƒXƒ^ƒCƒ‹ (’Pˆê) + ü (Lines) + with lines + ƒ|ƒCƒ“ƒg (Points) + with points + ü‚ƃ|ƒCƒ“ƒg (Lines and Points) + with linespoints + ‚ü (Impulses) + with impulses + ƒhƒbƒg (Dots) + with dots + ƒXƒeƒbƒv (Steps) + with steps + ŽŸ‚̍‚‚³‚̃Xƒeƒbƒv (Fsteps) + with fsteps + ƒqƒXƒgƒOƒ‰ƒ€ƒXƒeƒbƒv (Histeps) + with histeps + [EndMenu] + [Menu] + ƒXƒ^ƒCƒ‹ (•¡‡) + ƒGƒ‰[ƒo[ (Error Bars) + with errorbars + X ƒGƒ‰[ƒo[ + with xerrorbars + Y ƒGƒ‰[ƒo[ + with yerrorbars + XY ƒGƒ‰[ƒo[ + with xyerrorbars + ƒGƒ‰[ƒ‰ƒCƒ“ (Error Lines) + with errorlines + X ƒGƒ‰[ƒ‰ƒCƒ“ + with xerrorlines + Y ƒGƒ‰[ƒ‰ƒCƒ“ + with yerrorlines + XY ƒGƒ‰[ƒ‰ƒCƒ“ + with xyerrorlines + ‹éŒ` (Boxes) + with boxes + —̈æ“h‚è‚‚Ԃµ (Filled Curves) + with filledcurves + ‹éŒ`‚ƃGƒ‰[ƒo[ (Box Error Bars) + with boxerrorbars + ‹éŒ`‚Æ XY ƒGƒ‰[ƒo[ + with boxxyerrorbars + ‹à—Zƒf[ƒ^Œ`Ž® (Finance Bars) + with financebars + “•‘äŒ`Ž® (Candlesticks) + with candlesticks + [EndMenu] +[EndMenu] + +[Menu] +•\Œ»(&E) + •Ï” + print + •¡‘f” ... + {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]} + [Menu] + ’P€‰‰ŽZŽq + •‰•„† -a + -[INPUT]Arg + ³•„† +a + +[INPUT]Arg + •â” ~a + ~[INPUT]Arg + ˜_—”Û’è !a + ![INPUT]Arg + ŠKæ a! + [INPUT]Arg[EOS]! + [EndMenu] + [Menu] + 2 €‰‰ŽZŽq + Žw”‰‰ŽZŽq ** + ** + Ï * + * + ¤ / + / + ˜a + + + + · - + - + -- + ƒ‚ƒWƒ…ƒ‰‰ŽZŽq % + % + [EndMenu] + [Menu] + ˜_—‰‰ŽZŽq + “™‚µ‚¢ == + == + “™‚µ‚­‚È‚¢ != + != + -- + ‚æ‚菬‚³‚¢ < + < + ˆÈ‰º <= + <= + ‚æ‚è‘å‚«‚¢ > + > + ˆÈã >= + >= + -- + ƒrƒbƒg‚²‚Æ‚Ì AND & + & + ƒrƒbƒg‚²‚Æ‚Ì”r‘¼“I OR ^ + ^ + ƒrƒbƒg‚²‚Æ‚Ì OR | + | + -- + ˜_—“I AND && + && + ˜_—“I OR || + || + -- + 3 €‰‰ŽZŽq a?b:c + [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS] + [EndMenu] +[EndMenu] +[Menu] +ŠÖ”(&N) + [Menu] + ‰“™ŠÖ” + —” + rand([INPUT]Argument[EOS]) + â‘Î’l (abs) + abs([INPUT]Argument[EOS]) + •„† (sgn) + sgn([INPUT]Argument[EOS]) + -- + ˆø”‚æ‚菬‚³‚­‚È‚¢Å¬‚̐®” (ceil) + ceil([INPUT]Argument[EOS]) + ˆø”‚æ‚è‘å‚«‚­‚È‚¢Å‘å‚̐®” (floor) + floor([INPUT]Argument[EOS]) + ®” (int) + int([INPUT]Argument[EOS]) + -- + •½•ûª (sqrt) + sqrt([INPUT]Argument[EOS]) + Žw” (exp) + exp([INPUT]Argument[EOS]) + Ž©‘R‘ΐ” (log) + log([INPUT]Argument[EOS]) + í—p‘ΐ” (log10) + log10([INPUT]Argument[EOS]) + -- + cos + cos([INPUT]Argument[EOS]) + sin + sin([INPUT]Argument[EOS]) + tan + tan([INPUT]Argument[EOS]) + -- + arc cos + acos([INPUT]Argument[EOS]) + arc sin + asin([INPUT]Argument[EOS]) + arc tan + atan([INPUT]Argument[EOS]) + arc tan 2 + atan2([INPUT]Argument[EOS]) + -- + cosh + cosh([INPUT]Argument[EOS]) + sinh + sinh([INPUT]Argument[EOS]) + tanh + tanh([INPUT]Argument[EOS]) + -- + ‹••” (imag) + imag([INPUT]Argument[EOS]) + ŽÀ•” (real) + real([INPUT]Argument[EOS]) + •ÎŠp (arg) + arg([INPUT]Argument[EOS]) + [EndMenu] + [Menu] + “ÁŽêŠÖ” + Œë·ŠÖ” (erf) + erf([INPUT]Argument[EOS]) + Œë·•âŠÖ” (erfc) + erfc([INPUT]Argument[EOS]) + ‹tŒë·ŠÖ” (inverf) + inverf([INPUT]Argument[EOS]) + -- + ƒKƒ“ƒ}ŠÖ” (gamma) + gamma([INPUT]Argument[EOS]) + •sŠ®‘SƒKƒ“ƒ}ŠÖ” (igamma) + igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS]) + ‘ΐ”ƒKƒ“ƒ}ŠÖ” (lgamma) + lgamma([INPUT]Argument[EOS]) + -- + •sŠ®‘Sƒx[ƒ^ŠÖ” (ibeta) + ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS]) + -- + ‘æj0ŽŸƒxƒbƒZƒ‹ŠÖ” (besj0) + besj0([INPUT]Argument[EOS]) + ‘æj1ŽŸƒxƒbƒZƒ‹ŠÖ” (besj1) + besj1([INPUT]Argument[EOS]) + ‘æy0ŽŸƒxƒbƒZƒ‹ŠÖ” (besy0) + besy0([INPUT]Argument[EOS]) + ‘æy1ŽŸƒxƒbƒZƒ‹ŠÖ” (besy1) + besy1([INPUT]Argument[EOS]) + -- + ƒ‰ƒ“ƒxƒ‹ƒg W ŠÖ” (lanbertw) + lambertw([INPUT]Argument[EOS]) + + [EndMenu] + [Menu] + “ŒvŠwŠÖ” + ³‹K•ª•zŠÖ” (norm) + norm([INPUT]Argument[EOS]) + ‹t³‹K•ª•zŠÖ” (invnrom) + invnorm([INPUT]Argument[EOS]) + [EndMenu] + -- + ŠÖ”‚ð’è‹` ... + [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]= + ’è‹`‚µ‚½ŠÖ”‚ð•\Ž¦ + show functions{ENTER} + -- + •Ï”‚ð’è‹` ... + [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER} + ’è‹`‚µ‚½•Ï”‚ð•\Ž¦ + show variables{ENTER} + -- + x ƒ_ƒ~[•Ï” + set dummy [INPUT]Variable name?{ENTER} + x,y ƒ_ƒ~[•Ï” + set dummy [INPUT]Variable names (eg. u,v)?{ENTER} + ƒ_ƒ~[•Ï”‚ð•\Ž¦ + show dummy{ENTER} +[EndMenu] + +[Menu] +ˆê”Ê(&G) + ˜g‚ð‚‚¯‚é + set border{ENTER} + ˜g‚ð‚‚¯‚È‚¢ + unset border{ENTER} + ˜g‚̏ó‘Ô‚ð•\Ž¦ + show border{ENTER} + -- + ‹éŒ`‚Ì•‚ðÝ’è + set boxwidth [INPUT]Box Width?{ENTER} + ‹éŒ`‚Ì•‚ðŽ©“®Ý’è + set boxwidth{ENTER} + ‹éŒ`‚Ì•‚ð•\Ž¦ + show boxwidth{ENTER} + -- + üŽí‚Ì•\Ž¦ + test{ENTER} + -- + [Menu] + ”}‰î•Ï” + ”}‰î•Ï”•\Ž¦‚É‚·‚é + set parametric{ENTER} + ”}‰î•Ï”•\Ž¦‚ð‚µ‚È‚¢ + unset parametric{ENTER} + ”}‰î•Ï”•\Ž¦‚̏ó‘Ô‚ð•\Ž¦ + show parametric{ENTER} + -- + t ‚Ì”ÍˆÍ + set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + u ‚Ì”ÍˆÍ + set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + v ‚Ì”ÍˆÍ + set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + [EndMenu] + -- + [Menu] + Ø‚蔲‚« + ‹«ŠE‚É‹ß‚¢“_‚ðí‚é + set clip points{ENTER} + ˆê•û‚Ì’[‚¾‚¯Ø‚èŽæ‚é + set clip one{ENTER} + —¼’[‚ðØ‚èŽæ‚é + set clip two{ENTER} + Ø‚èŽæ‚ç‚È‚¢ + unset clip{ENTER} + Ø‚蔲‚«•û‚̏ó‘Ô‚ð•\Ž¦ + show clip{ENTER} + [EndMenu] + -- + [Menu] + ‹ÉÀ•W + ‹ÉÀ•WŒn‚ɕύX + set polar{ENTER} + ’¼ŒðÀ•W‚ɕύX + unset polar{ENTER} + ‹ÉÀ•WŒn‚©‚Ç‚¤‚©‚ð•\Ž¦ + show polar{ENTER} + “®Œa•ûŒü‚͈͎̔w’è + set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Šp“x‚ð“x‚ÅŽw’è + set angles degrees{ENTER} + Šp“x‚ðƒ‰ƒWƒAƒ“‚ÅŽw’è + set angles radians{ENTER} + Šp“x‚Ì’PˆÊ‚ð•\Ž¦ + show angles{ENTER} + [EndMenu] + -- + kŽÚ‚ðÝ’è + set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER} + kŽÚ‚ð•\Ž¦ + show size{ENTER} + -- + ŠÖ”‚̃Tƒ“ƒvƒŠƒ“ƒO”‚ðŽw’è + set sample [INPUT]Sampling rate (default=100)?{ENTER} + ŠÖ”‚̃Tƒ“ƒvƒŠƒ“ƒO”‚ð•\Ž¦ + show sample{ENTER} +[EndMenu] + +[Menu] +Ž²(&A) + Ž©“®kŽÚ‚ðŽg‚¤ + set autoscale [INPUT]Which axes (eg. xy)?{ENTER} + Ž©“®kŽÚ‚ðŽg‚í‚È‚¢ + unset autoscale [INPUT]Which axes (eg. xy)?{ENTER} + Ž©“®kŽÚ‚̏ó‘Ô‚ð•\Ž¦ + show autoscale{ENTER} + -- + ‘ΐ”Ž²‚ðŽg‚¤ + set logscale [INPUT]Which axes (eg. xy)?{ENTER} + ‘ΐ”Ž²‚ðŽg‚í‚È‚¢ + unset logscale [INPUT]Which axes (eg. xy)?{ENTER} + ‘ΐ”Ž²‚̏ó‘Ô‚ð•\Ž¦ + show logscale{ENTER} + -- + [Menu] + –ڐ· + –ڐ·Œ©o‚µ‚̏‘Ž®‚ðŽw’è + set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER} + –ڐ·Œ©o‚µ‚̏‘Ž®‚ð•\Ž¦ + show format{ENTER} + -- + –ڐ·‚ð“à‘¤‚É (ƒfƒtƒHƒ‹ƒg) + set tics in{ENTER} + –ڐ·‚ðŠO‘¤‚É + set tics out{ENTER} + –ڐ·‚̐ݒè‚ð•\Ž¦ + show tics{ENTER} + -- + zŽ²‚̍‚‚³‚ÌŽw’è + set ticslevel [INPUT]Level (default=0.5)?{ENTER} + -- + –ڐ·‚ÌŠÔŠu‚ÌŽw’è + set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER} + -- + –ڐ·‚̐ݒèŠJŽn + set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS] + –ڐ·‚̃‰ƒxƒ‹‚ƈʒu‚ÌŽw’è + ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS] + –ڐ·‚̐ݒèI—¹ + ){ENTER} + [EndMenu] + -- + X ‚Ì”ÍˆÍ + set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Y ‚Ì”ÍˆÍ + set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Z ‚Ì”ÍˆÍ + set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + -- + X Ž²‚̃‰ƒxƒ‹ + set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Y Ž²‚̃‰ƒxƒ‹ + set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Z Ž²‚̃‰ƒxƒ‹ + set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Ž²‚̃‰ƒxƒ‹‚ð•\Ž¦ + show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER} + -- + X Ž²‚ð‚Ђ©‚È‚¢ + unset xzeroaxis{ENTER} + Y Ž²‚ð‚Ђ©‚È‚¢ + unset yzeroaxis{ENTER} + X,Y —¼Ž²‚ð‚Ђ­ + set zeroaxis{ENTER} + Ž²‚̏ó‘Ô‚ð•\Ž¦ + show zeroaxis{ENTER} +[EndMenu] + +[Menu] +ƒ`ƒƒ[ƒg(&C) + ƒOƒŠƒbƒh‚ð•\Ž¦‚·‚é + set grid{ENTER} + ƒOƒŠƒbƒh‚ð•\Ž¦‚µ‚È‚¢ + unset grid{ENTER} + ƒOƒŠƒbƒh‚̏ó‘Ô‚ð•\Ž¦ + show grid{ENTER} + -- + –îˆó‚ð’ljÁ + set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER} + –îˆó‚ðíœ + unset arrow [INPUT]Tag (1-99)?{ENTER} + –îˆó‚̏ó‘Ô‚ð•\Ž¦ + show arrow{ENTER} + -- + ƒ‰ƒxƒ‹‚ð’ljÁ + set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER} + ƒ‰ƒxƒ‹‚ðíœ + unset label [INPUT]Tag?{ENTER} + ƒ‰ƒxƒ‹‚̏ó‘Ô‚ð•\Ž¦ + show label{ENTER} + -- + ƒ^ƒCƒgƒ‹‚ðÝ’è + set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER} + ƒ^ƒCƒgƒ‹‚ð•\Ž¦ + show title{ENTER} + -- + –}—á‚̈ʒu‚ðÝ’è + set key [INPUT]Key position?{ENTER} + –}—á‚̈ʒu‚ðƒfƒtƒHƒ‹ƒg‚É + set key{ENTER} + –}—á‚ð•\Ž¦‚µ‚È‚¢ + unset key{ENTER} + –}—á‚̈ʒu‚ð•\Ž¦ + show key{ENTER} + -- + ƒIƒtƒZƒbƒg‚ðÝ’è + set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER} + ƒIƒtƒZƒbƒg‚ð•\Ž¦ + show offsets{ENTER} + -- + Žž‚Ì•\Ž¦ˆÊ’u‚ðÝ’è + set time [INPUT]Location (eg. 1,1)?{ENTER} + Žž‚ð•\Ž¦‚µ‚È‚¢ + unset time{ENTER} + Žž‚Ì•\Ž¦ˆÊ’u‚ð•\Ž¦ + show time{ENTER} +[EndMenu] + +[Menu] +ƒXƒ^ƒCƒ‹(&S) + [Menu] + ƒf[ƒ^‚Ì•\Ž¦ƒXƒ^ƒCƒ‹ + ü (Lines) + set style data lines{ENTER} + ƒ|ƒCƒ“ƒg (Points) + set style data points{ENTER} + ü‚ƃ|ƒCƒ“ƒg (Lines + Points) + set style data linespoints{ENTER} + ƒhƒbƒg (Dots) + set style data dots{ENTER} + ‚ü (Impulses) + set style data impulses{ENTER} + -- + ƒGƒ‰[ƒo[ (Error Bars) + set style data errorbars{ENTER} + ‹éŒ` (Boxes) + set style data boxes{ENTER} + ‹éŒ`‚ƃGƒ‰[ƒo[ (Box Error Bars) + set style data boxerrorbars{ENTER} + -- + “•‘äŒ`Ž® (Candlesticks) + set style data candlesticks{ENTER} + ‹à—Zƒf[ƒ^Œ`Ž® (Finance Bars) + set style data financebars{ENTER} + [EndMenu] + ƒf[ƒ^‚̃Xƒ^ƒCƒ‹‚ð•\Ž¦ + show style data{ENTER} + ƒf[ƒ^‚̃Xƒ^ƒCƒ‹‚ð‰Šú‰» + unset style data{ENTER} + -- + [Menu] + ŠÖ”‚Ì•\Ž¦ƒXƒ^ƒCƒ‹ + ü (Lines) + set style function lines{ENTER} + ƒ|ƒCƒ“ƒg (Points) + set style function points{ENTER} + ü‚ƃ|ƒCƒ“ƒg (Lines + Points) + set style function linespoints{ENTER} + ƒhƒbƒg (Dots) + set style function dots{ENTER} + ‚ü (Impulses) + set style function impulses{ENTER} + -- + ƒGƒ‰[ƒo[ (Error Bars) + set style function errorbars{ENTER} + ‹éŒ` (Boxes) + set style function boxes{ENTER} + ‹éŒ`‚ƃGƒ‰[ƒo[ (Box Error Bars) + set style function boxerrorbars{ENTER} + -- + “•‘äŒ`Ž® (Candlesticks) + set style function candlesticks{ENTER} + ‹à—Zƒf[ƒ^Œ`Ž® (Finance Bars) + set style function financebars{ENTER} + [EndMenu] + ŠÖ”‚̃Xƒ^ƒCƒ‹‚ð•\Ž¦ + show style function{ENTER} + ŠÖ”‚̃Xƒ^ƒCƒ‹‚ð‰Šú‰» + unset style function{ENTER} + -- + [Menu] + –î‚Ì•\Ž¦ƒXƒ^ƒCƒ‹ + –îæ (Head) + set style arrow [INPUT]Arrow number?[EOS] head{ENTER} + —¼–îæ (Heads) + set style arrow [INPUT]Arrow number?[EOS] heads{ENTER} + –îæ‚È‚µ (No Heads) + set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER} + [EndMenu] + –î‚̃Xƒ^ƒCƒ‹‚ð•\Ž¦ + show style arrow [INPUT]Arrow number? {ENTER} + –î‚̃Xƒ^ƒCƒ‹‚ð‰Šú‰» + unset style arrow [INPUT]Arrow number? {ENTER} + -- + [Menu] + “h‚è‚‚ԂµƒXƒ^ƒCƒ‹ + “h‚è‚‚Ԃ³‚È‚¢ (Empty) + set style fill empty{ENTER} + ƒxƒ^“h‚è (Solid) + set style fill solid [INPUT]Density?{ENTER} + ƒpƒ^[ƒ““h‚è (Pattern) + set style fill pattern [INPUT]Pattern number?{ENTER} + ‹«ŠE (Border) + set style fill border [INPUT]Line Type?{ENTER} + ‹«ŠE‚È‚µ (No Border) + set style fill noborder{ENTER} + [EndMenu] + “h‚è‚‚ԂµƒXƒ^ƒCƒ‹‚Ì•\Ž¦ + show style fill{ENTER} + “h‚è‚‚ԂµƒXƒ^ƒCƒ‹‚̏‰Šú‰» + unset style fill{ENTER} + -- + [Menu] + üA“_‚Ì•\Ž¦ƒXƒ^ƒCƒ‹ + ü‚ÌŽí—Þ (Line Type) + set style linetype [INPUT]Line Type?{ENTER} + ü‚Ì• (Line Width) + set style linewidth [INPUT]Line Width?{ENTER} + “_‚ÌŽí—Þ (Point Type) + set style pointtype [INPUT]Point Type?{ENTER} + “_‚Ì‘å‚«‚³ (Point Size) + set style pointsize [INPUT]Point Size?{ENTER} +; F (Palette) +; set style line{ENTER} + [EndMenu] + üA“_‚̃Xƒ^ƒCƒ‹‚Ì•\Ž¦ + show style line{ENTER} + üA“_‚̃Xƒ^ƒCƒ‹‚̏‰Šú‰» + unset style line{ENTER} +[EndMenu] + +[Menu] +&3ŽŸŒ³ + [Menu] + “™‚ü + ’¼ü‚Å•`‰æ + set cntrparam linear{ENTER} + ‹Èü‚Å•`‰æ + set cntrparam cubicspline{ENTER} + B-spline •âŠÔ‚Å•`‰æ + set cntrparam bspline{ENTER} + “™‚ü‚̐” + set cntrparam levels [INPUT]How many contours?{ENTER} + •âŠÔ‚·‚é“_‚̐” + set cntrparam points [INPUT]How many points for the contours?{ENTER} + B-spline •âŠÔ‚ÌŽŸ” + set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER} + -- + °‚É“™‚ü‚ð•\Ž¦‚·‚é + set contour base{ENTER} + •\–Ê‚É“™‚ü‚ð•\Ž¦‚·‚é + set contour surface{ENTER} + °‚Æ•\–Ê‚Ì—¼•û‚É“™‚ü‚ð•\Ž¦ + set contour both{ENTER} + “™‚ü‚ð•\Ž¦‚µ‚È‚¢ + unset contour{ENTER} + “™‚ü‚̏ó‘Ô‚ð•\Ž¦ + show contour{ENTER} + -- + –Ê•`‰æ‚ÉŽg‚¤ü‚̐”‚ðŽw’è + set isosamples [INPUT]Number of isosamples?{ENTER} + –Ê•`‰æ‚ÉŽg‚¤ü‚̐”‚ð•\Ž¦ + show isosamples{ENTER} + [EndMenu] + -- + ’¼ŒðÀ•WŒn + set mapping cartesian{ENTER} + ‹…À•WŒn + set mapping spherical{ENTER} + ‰~“›À•WŒn + set mapping cylindrical{ENTER} + ŽÊ‘œ‚̐ݒè‚ð•\Ž¦ + show mapping{ENTER} + -- + ‰Aüˆ—‚ð‚·‚é + set hidden3d{ENTER} + ‰Aüˆ—‚ð‚µ‚È‚¢ + unset hidden3d{ENTER} + ‰Aüˆ—‚̏ó‘Ô‚ð•\Ž¦ + show hidden3d{ENTER} + -- + •\–Ê‚ð–Ô‚Å•\Ž¦‚·‚é + set surface{ENTER} + •\–Ê‚ð–Ô‚Å•\Ž¦‚µ‚È‚¢ + unset surface{ENTER} + •\–Ê‚Ì•\Ž¦ó‘Ô‚ð•\Ž¦ + show surface{ENTER} + -- + Ž‹Šp‚ðÝ’è + set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER} + Ž‹Šp‚ð•\Ž¦ + show view{ENTER} +[EndMenu] + +[Menu] +ƒwƒ‹ƒv(&H) + –ÚŽŸ(&I) + help{ENTER} + ƒCƒ“ƒgƒƒ_ƒNƒVƒ‡ƒ“ + help introduction{ENTER} + ƒgƒsƒbƒN(&T) + help [INPUT]Help Topic?{ENTER} + ƒEƒBƒ“ƒhƒEƒY(&W) + help windows{ENTER} + -- + gnuplot ‚ÉŠÖ‚µ‚Ä(&A) + [ABOUT] +[EndMenu] + +; ƒ{ƒ^ƒ“‚ð‚¢‚­‚‚© +; ƒ^ƒCƒgƒ‹•¶Žš—ñ“à‚̃Zƒ~ƒRƒƒ“‚ÌŽŸ‚̐”Žš‚̓AƒCƒRƒ“‚̃Cƒ“ƒfƒbƒNƒXB +; MSDN ‚̈ȉºŽQÆ: "Toolbar Standard Button Image Index Values" +; http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx +[Button] + Ä•\Ž¦;4 + replot{ENTER} +[Button] + ŠJ‚­;7 + load '[OPEN]load[EOS]*.plt[EOS]'{ENTER} +[Button] + •Û‘¶;8 + save '[SAVE]save[EOS]*.plt[EOS]'{ENTER} +[Button] + ˆÚ“®;31 + cd '[DIRECTORY]New directory?[EOS]'{ENTER} +[Button] + ˆóü;14 + set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER} +[Button] + ƒ_ƒ“ƒv;14 + screendump{ENTER} +[Button] + ‘O;15 + {^P} +[Button] + ŽŸ;16 + {^N} +[Button] + ƒIƒvƒVƒ‡ƒ“;10 + [OPTIONS] diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm new file mode 100644 index 0000000..fdd8992 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu new file mode 100644 index 0000000..5da1377 --- /dev/null +++ b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu @@ -0,0 +1,752 @@ +; Menu file for Windows gnuplot +; Roger Hadgraft, 26-5-92 +; Russell Lang, 30 Nov 1992 +; Modified for 4.0, John Bollinger, 31 Dec 2002 + +[Menu] +&File + &Open ... + load '[OPEN]load[EOS]*.plt[EOS]'{ENTER} + &Save ... + save '[SAVE]save[EOS]*.plt[EOS]'{ENTER} + &Demos ... + load '[OPEN]load[EOS]*.dem[EOS]'{ENTER} + -- + &Change Directory ... + cd '[DIRECTORY]New directory?[EOS]'{ENTER} + show Current &Directory + pwd{ENTER} + -- + O&utput ... + set output "[INPUT]Output filename?[EOS]"{ENTER} + &Printer Output + set output "PRN"{ENTER} + &Window Output + set output{ENTER}set terminal win{ENTER} + Show Output + show output{ENTER} + Ou&tput Device ... + set terminal [INPUT]Terminal type?{ENTER} + Show Output Devices + set terminal{ENTER}show terminal{ENTER} + -- + [Menu] + History + Previous command ^P + {^P} + Next command ^N + {^N} + -- + Back one character ^B + {^B} + Forward one character ^F + {^F} + -- + Beginning of the line ^A + {^A} + End of the line ^E + {^E} + -- + Delete previous character ^H + {^H} + Delete current character ^D + {^D} + Delete last word ^W + {^W} + Delete to end of line ^K + {^K} + Delete entire line ^U + {^U} + -- + Redraw the line ^L + {^L} + [EndMenu] + open DOS window + shell{ENTER} + run DOS command ... + ![INPUT]DOS command?{ENTER} + -- + E&xit + quit{ENTER} +[EndMenu] + +[Menu] +&Plot + Plot + plot + 3D Plot + splot + Replot + replot{ENTER} + Clear device + clear{ENTER} + -- + Simple Range + [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS] + Named Range + [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS] + -- + Data filename ... + '[OPEN]Open[EOS]*.dat[EOS]' [EOS] + using x,y columns + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS] + using x,y,ydelta columns + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS] + using x,y,ylow,yhigh columns + using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS] + -- + [Menu] + with Style (simple) + Lines + with lines + Points + with points + Lines and Points + with linespoints + Impulses + with impulses + Dots + with dots + Steps + with steps + Fsteps + with fsteps + Histeps + with histeps + [EndMenu] + [Menu] + with Style (compound) + Error Bars + with errorbars + X Error Bars + with xerrorbars + Y Error Bars + with yerrorbars + XY Error Bars + with xyerrorbars + Error Lines + with errorlines + X Error Lines + with xerrorlines + Y Error Lines + with yerrorlines + XY Error Lines + with xyerrorlines + Boxes + with boxes + Filled Curves + with filledcurves + Box Error Bars + with boxerrorbars + Box XY Error Bars + with boxxyerrorbars + Finance Bars + with financebars + Candlesticks + with candlesticks + [EndMenu] +[EndMenu] + +[Menu] +&Expressions + Evaluate + print + Complex number ... + {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]} + [Menu] + Unary + Minus -a + -[INPUT]Arg + Plus +a + +[INPUT]Arg + One's compliment ~a + ~[INPUT]Arg + Logcial negation !a + ![INPUT]Arg + Factorial a! + [INPUT]Arg[EOS]! + [EndMenu] + [Menu] + Binary + Exponentiation ** + ** + Multiply * + * + Divide / + / + Add + + + + Subtract - + - + -- + Modulo % + % + [EndMenu] + [Menu] + Logical + Equality == + == + Inequality != + != + -- + less than < + < + less than or equal <= + <= + greater than > + > + greater than or equal >= + >= + -- + Bitwise AND & + & + Bitwise exclusive OR ^ + ^ + Bitwise inclusive OR | + | + -- + Logical AND && + && + Logical OR || + || + -- + Ternary operator a?b:c + [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS] + [EndMenu] +[EndMenu] +[Menu] +Fu&nctions + [Menu] + Elementary + random number + rand([INPUT]Argument[EOS]) + absolute value + abs([INPUT]Argument[EOS]) + sign + sgn([INPUT]Argument[EOS]) + -- + ceiling + ceil([INPUT]Argument[EOS]) + floor + floor([INPUT]Argument[EOS]) + integer + int([INPUT]Argument[EOS]) + -- + square root + sqrt([INPUT]Argument[EOS]) + exponent + exp([INPUT]Argument[EOS]) + logarithm (e) + log([INPUT]Argument[EOS]) + logarithm (10) + log10([INPUT]Argument[EOS]) + -- + cosine + cos([INPUT]Argument[EOS]) + sine + sin([INPUT]Argument[EOS]) + tangent + tan([INPUT]Argument[EOS]) + -- + arc cosine + acos([INPUT]Argument[EOS]) + arc sine + asin([INPUT]Argument[EOS]) + arc tangent + atan([INPUT]Argument[EOS]) + arc tangent 2 + atan2([INPUT]Argument[EOS]) + -- + hyperbolic cosine + cosh([INPUT]Argument[EOS]) + hyperbolic sine + sinh([INPUT]Argument[EOS]) + hyperbolic tangent + tanh([INPUT]Argument[EOS]) + -- + imaginary + imag([INPUT]Argument[EOS]) + real + real([INPUT]Argument[EOS]) + arg + arg([INPUT]Argument[EOS]) + [EndMenu] + [Menu] + Special + error + erf([INPUT]Argument[EOS]) + error c + erfc([INPUT]Argument[EOS]) + inv error + inverf([INPUT]Argument[EOS]) + -- + gamma + gamma([INPUT]Argument[EOS]) + igamma + igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS]) + lgamma + lgamma([INPUT]Argument[EOS]) + -- + ibeta + ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS]) + -- + bessel j0 + besj0([INPUT]Argument[EOS]) + bessel j1 + besj1([INPUT]Argument[EOS]) + bessel y0 + besy0([INPUT]Argument[EOS]) + bessel y1 + besy1([INPUT]Argument[EOS]) + -- + lambertw + lambertw([INPUT]Argument[EOS]) + + [EndMenu] + [Menu] + Statistical + normal + norm([INPUT]Argument[EOS]) + inverse normal + invnorm([INPUT]Argument[EOS]) + [EndMenu] + -- + Define User Function ... + [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]= + Show User Functions + show functions{ENTER} + -- + Define User Variable ... + [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER} + Show User Variables + show variables{ENTER} + -- + x Dummy variable + set dummy [INPUT]Variable name?{ENTER} + x,y Dummy variables + set dummy [INPUT]Variable names (eg. u,v)?{ENTER} + Show Dummy variables + show dummy{ENTER} +[EndMenu] + +[Menu] +&General + Border on + set border{ENTER} + Border off + unset border{ENTER} + Show Border + show border{ENTER} + -- + Box width + set boxwidth [INPUT]Box Width?{ENTER} + Auto Box Width + set boxwidth{ENTER} + Show Box width + show boxwidth{ENTER} + -- + Show Line Types + test{ENTER} + -- + [Menu] + Parametric + Set Parametric + set parametric{ENTER} + Not Parametric + unset parametric{ENTER} + Show Parametric + show parametric{ENTER} + -- + t Range + set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + u Range + set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + v Range + set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + [EndMenu] + -- + [Menu] + Clipping + Clip near points + set clip points{ENTER} + Clip one point + set clip one{ENTER} + Clip two points + set clip two{ENTER} + No Clipping + unset clip{ENTER} + Show Clip type + show clip{ENTER} + [EndMenu] + -- + [Menu] + Polar + Polar + set polar{ENTER} + Not Polar + unset polar{ENTER} + Show Polar + show polar{ENTER} + Radial Range + set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Angles in Degrees + set angles degrees{ENTER} + Angles in Radians + set angles radians{ENTER} + Show Angle units + show angles{ENTER} + [EndMenu] + -- + Set Plot Size + set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER} + Show Plot Size + show size{ENTER} + -- + Sampling Rate + set sample [INPUT]Sampling rate (default=100)?{ENTER} + Show Sampling Rate + show sample{ENTER} +[EndMenu] + +[Menu] +&Axes + Autoscale xy + set autoscale [INPUT]Which axes (eg. xy)?{ENTER} + No Autoscale xy + unset autoscale [INPUT]Which axes (eg. xy)?{ENTER} + Show Autoscale + show autoscale{ENTER} + -- + Logscale xyz + set logscale [INPUT]Which axes (eg. xy)?{ENTER} + No Logscale xyz + unset logscale [INPUT]Which axes (eg. xy)?{ENTER} + Show Logscale + show logscale{ENTER} + -- + [Menu] + Tics + Tic format string + set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER} + Tic marks format + show format{ENTER} + -- + Inward facing tics (default) + set tics in{ENTER} + Outward facing tics + set tics out{ENTER} + Show tics + show tics{ENTER} + -- + Tics level + set ticslevel [INPUT]Level (default=0.5)?{ENTER} + -- + Tic interval + set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER} + -- + Tic labels start + set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS] + another Tic label + ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS] + Tic labels finish + ){ENTER} + [EndMenu] + -- + X Range + set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Y Range + set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + Z Range + set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER} + -- + X Label + set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Y Label + set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Z Label + set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER} + Show axis Labels + show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER} + -- + No X zero axis + unset xzeroaxis{ENTER} + No Y zero axis + unset yzeroaxis{ENTER} + X,Y zero axes on + set zeroaxis{ENTER} + Show zero axis status + show zeroaxis{ENTER} +[EndMenu] + +[Menu] +&Chart + Grid on + set grid{ENTER} + Grid off + unset grid{ENTER} + Show Grid + show grid{ENTER} + -- + Add Arrow + set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER} + Remove arrow + unset arrow [INPUT]Tag (1-99)?{ENTER} + Show Arrows + show arrow{ENTER} + -- + Add Label + set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER} + Remove Label + unset label [INPUT]Tag?{ENTER} + Show Labels + show label{ENTER} + -- + Set Title + set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER} + Show Title + show title{ENTER} + -- + Key (legend) position + set key [INPUT]Key position?{ENTER} + Default Key position + set key{ENTER} + No Key + unset key{ENTER} + Show Key position + show key{ENTER} + -- + Offsets + set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER} + Show Offsets + show offsets{ENTER} + -- + Time location + set time [INPUT]Location (eg. 1,1)?{ENTER} + No Time + unset time{ENTER} + Show Time Location + show time{ENTER} +[EndMenu] + +[Menu] +&Styles + [Menu] + Data Style + Lines + set style data lines{ENTER} + Points + set style data points{ENTER} + Lines + Points + set style data linespoints{ENTER} + Dots + set style data dots{ENTER} + Impulses + set style data impulses{ENTER} + -- + Error Bars + set style data errorbars{ENTER} + Boxes + set style data boxes{ENTER} + Box Error Bars + set style data boxerrorbars{ENTER} + -- + Candlesticks + set style data candlesticks{ENTER} + Finance Bars + set style data financebars{ENTER} + [EndMenu] + Show Data Style + show style data{ENTER} + Clear Data Style + unset style data{ENTER} + -- + [Menu] + Function Style + Lines + set style function lines{ENTER} + Points + set style function points{ENTER} + Lines + Points + set style function linespoints{ENTER} + Dots + set style function dots{ENTER} + Impulses + set style function impulses{ENTER} + -- + Error Bars + set style function errorbars{ENTER} + Boxes + set style function boxes{ENTER} + Box Error Bars + set style function boxerrorbars{ENTER} + -- + Candlesticks + set style function candlesticks{ENTER} + Finance Bars + set style function financebars{ENTER} + [EndMenu] + Show Function Style + show style function{ENTER} + Clear Function Style + unset style function{ENTER} + -- + [Menu] + Arrow Style + Head + set style arrow [INPUT]Arrow number?[EOS] head{ENTER} + Heads + set style arrow [INPUT]Arrow number?[EOS] heads{ENTER} + No Heads + set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER} + [EndMenu] + Show Arrow Style + show style arrow [INPUT]Arrow number? {ENTER} + Clear Arrow Style + unset style arrow [INPUT]Arrow number? {ENTER} + -- + [Menu] + Fill Style + Empty + set style fill empty{ENTER} + Solid + set style fill solid [INPUT]Density?{ENTER} + Pattern + set style fill pattern [INPUT]Pattern number?{ENTER} + Border + set style fill border [INPUT]Line Type?{ENTER} + No Border + set style fill noborder{ENTER} + [EndMenu] + Show Fill Style + show style fill{ENTER} + Clear Fill Style + unset style fill{ENTER} + -- + [Menu] + Line Style + Line Type + set style linetype [INPUT]Line Type?{ENTER} + Line Width + set style linewidth [INPUT]Line Width?{ENTER} + Point Type + set style pointtype [INPUT]Point Type?{ENTER} + Point Size + set style pointsize [INPUT]Point Size?{ENTER} +; Palette +; set style line{ENTER} + [EndMenu] + Show Line Style + show style line{ENTER} + Clear Line Style + unset style line{ENTER} +[EndMenu] + +[Menu] +&3D + [Menu] + Contours + Linear Contours + set cntrparam linear{ENTER} + Cubic Spline Contours + set cntrparam cubicspline{ENTER} + B-spline Contours + set cntrparam bspline{ENTER} + Number of Contours + set cntrparam levels [INPUT]How many contours?{ENTER} + Points for Contours + set cntrparam points [INPUT]How many points for the contours?{ENTER} + Order of B-splines + set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER} + -- + Contours on Base + set contour base{ENTER} + Contours on Surfaces + set contour surface{ENTER} + Contours on Both + set contour both{ENTER} + No Contours + unset contour{ENTER} + Show Contour + show contour{ENTER} + -- + Number of Isosamples + set isosamples [INPUT]Number of isosamples?{ENTER} + Show Isosamples + show isosamples{ENTER} + [EndMenu] + -- + Cartesian Mapping + set mapping cartesian{ENTER} + Spherical Mapping + set mapping spherical{ENTER} + Cylindrical Mapping + set mapping cylindrical{ENTER} + Show Mapping + show mapping{ENTER} + -- + Hidden line removal + set hidden3d{ENTER} + No Hidden line removal + unset hidden3d{ENTER} + Show Hidden line removal + show hidden3d{ENTER} + -- + Display Surface mesh + set surface{ENTER} + No Surface mesh + unset surface{ENTER} + Show Surface status + show surface{ENTER} + -- + Set View + set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER} + Show View + show view{ENTER} +[EndMenu] + +[Menu] +&Help + &Index + help{ENTER} + Introduction + help introduction{ENTER} + &Topic + help [INPUT]Help Topic?{ENTER} + &Windows + help windows{ENTER} + -- + &About + [ABOUT] +[EndMenu] + +; now some buttons +; a number after a semicolon in the title string is interpreted as icon index +; see the article "Toolbar Standard Button Image Index Values" on MSDN +; http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx +[Button] + Replot;4 + replot{ENTER} +[Button] + Open;7 + load '[OPEN]load[EOS]*.plt[EOS]'{ENTER} +[Button] + Save;8 + save '[SAVE]save[EOS]*.plt[EOS]'{ENTER} +[Button] + ChDir;31 + cd '[DIRECTORY]New directory?[EOS]'{ENTER} +[Button] + Print;14 + set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER} +[Button] + PrtSc;14 + screendump{ENTER} +[Button] + Prev;15 + {^P} +[Button] + Next;16 + {^N} +[Button] + Options;10 + [OPTIONS] diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll b/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll new file mode 100755 index 0000000..6e37233 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll b/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll new file mode 100755 index 0000000..e9cf3d5 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll differ diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll new file mode 100755 index 0000000..4f70d17 Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll differ diff --git a/distributions/windows/mybuildicl32.bat b/distributions/windows/mybuildicl32.bat new file mode 100644 index 0000000..a57a0ef --- /dev/null +++ b/distributions/windows/mybuildicl32.bat @@ -0,0 +1,22 @@ +@echo on +rem Visual Studio environment +@REM C:\Windows\SysWOW64\cmd.exe /c +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" +rem --- VS done +echo version=%1 %2 %3 +%2 +rem cd +rem cd imachcvs\NetBeans\imach\build\icl32 +rem cd imach\imach-gui\build\icl32 +cd %2%3\icl32 +call "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013 +call cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE:STRING="/MT /O2 /Ob2 /D NDEBUG" +call cmake --config Release +@rem call cmake --build . --config Release +call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.sln /IC:"Intel C++ Compiler XE 15.0" /s /f +call cmake --build . --config Release -- /p:PlatformToolset="Intel C++ Compiler XE 15.0" /p:BasePlatformToolset=v120_xp +@rem v120_xp +@rem "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh-%1.vcxproj /IC:"Intel C++ Compiler XE 15.0" /s /f +@rem --- Intel Done +@rem call msbuild g:\imach\imach-gui\build\icl32\imach-0.98q3.vcxproj /t:Build /p:Configuration=Release +@rem call msbuild g:\imach\imach-gui\build\icl32\IMaCh-%1.vcxproj /t:Build /p:Configuration=Release /p:PlatformToolset="Intel C++ Compiler XE 15.0" /p:BasePlatformToolset=v120_xp diff --git a/distributions/windows/mybuildicl64.bat b/distributions/windows/mybuildicl64.bat new file mode 100644 index 0000000..211bb5f --- /dev/null +++ b/distributions/windows/mybuildicl64.bat @@ -0,0 +1,23 @@ +@echo on +rem Visual Studio environment +@REM C:\Windows\SysWOW64\cmd.exe /c +@rem call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 +@rem call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" +rem --- VS done +rem cd imach\imach-gui\build\icl64 +rem cd imachcvs\NetBeans\imach\build\icl64 +echo version=%1 %2 %3 +%2 +rem cd imach\cvs\imach\build\icl64 +cd %2%3\icl64 +call cmake -G "Visual Studio 12 2013 Win64" ../.. +call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.sln /IC:"Intel C++ Compiler XE 15.0" /s /f +call cmake --build . --config Release +@rem call cmake -G "Visual Studio 12 2013 Win64" ../../src -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE:STRING="/MT /O2 /Ob2 /D NDEBUG" +@rem call cmake --build . --config Release +@rem call "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" intel64 vs2013 +@rem call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.vcxproj /IC:"Intel C++ Compiler XE 15.0" /s /f +rem --- Intel Done +@rem g: +@rem call msbuild g:\imachcvs\NetBeans\imach\build\icl32\imach-0.98q3.vcxproj /t:Build /p:Configuration=Release +@rem call msbuild g:\imachcvs\NetBeans\imach\build\icl64\IMaCh-%1.vcxproj /t:Build /p:Configuration=Release diff --git a/src/Makefile b/src/Makefile index 7e20338..a52f17f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,9 @@ -VERSION=0.98q4 +#Version has to be set in ../CMakeLists.txt too. +VERSION=0.98q5 +# DRIVEG is for VirtualBox Windows 64bit +DRIVEG=g: +#DIRG is the corresponding build directory for Virtual Windows +DIRG=\imach\cvs\imach\build COPYRIGHT=Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015 IMACHSETUPVERSION=icl # This is for Windows only @@ -305,8 +310,9 @@ imachICL-build: imach.c #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch" # /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe # both 32 and 64 executables should have been built on Windows with Intel compiler. -imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat mybuildicl32.bat +imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat pwd + touch setup.iss.in $(SETUPCOMP) /cc setup.iss $(CP) Output/$(TMPSETUPEXE) imachICL-setup @@ -321,19 +327,19 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) $(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup -../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl64.bat +../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat rm -rf ../build/icl64 && mkdir ../build/icl64 - cp mybuildicl64.bat ../build/icl64/ + cp ../distributions/windows/mybuildicl64.bat ../build/icl64/ cd ../build/icl64 VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \ - --username brouard --verbose --wait-exit --wait-stdout --wait-stderr -- "/c" "g:\imachcvs\NetBeans\imach\build\icl64\mybuildicl64.bat" "$(VERSION)" + --username brouard --verbose --wait-exit --wait-stdout --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)" -../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl32.bat +../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat rm -rf ../build/icl32 && mkdir -p ../build/icl32 - cp mybuildicl32.bat ../build/icl32/ + cp ../distributions/windows/mybuildicl32.bat ../build/icl32/ cd ../build/icl32 VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \ - --username brouard --verbose --wait-exit --wait-stdout -- "/c" "g:\imachcvs\NetBeans\imach\build\icl32\mybuildicl32.bat" "$(VERSION)" + --username brouard --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)" ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat rm -rf ../build/vs32 && mkdir -p ../build/vs32 diff --git a/src/setup.iss b/src/setup.iss index e1bdb14..c193c8f 100644 --- a/src/setup.iss +++ b/src/setup.iss @@ -2,6 +2,9 @@ ; $Id$ ; $State$ ; $Log$ +; Revision 1.13 2015/08/04 07:18:28 brouard +; *** empty log message *** +; ; Revision 1.12 2015/03/11 13:28:31 brouard ; Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5 ; @@ -40,12 +43,12 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES! [Setup] -AppName=IMaCh-0.98q4 -AppVerName=IMaCh-0.98q4 Version 0.98q4 +AppName=IMaCh-0.98q5 +AppVerName=IMaCh-0.98q5 Version 0.98q5 AppCopyright=Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015 -DefaultDirName={pf}\IMaCh-0.98q4 +DefaultDirName={pf}\IMaCh-0.98q5 DefaultGroupName=IMaCh -OutputBaseFilename=imach-0.98q4-icl-setup +OutputBaseFilename=imach-0.98q5-icl-setup UninstallDisplayIcon={app}\imach.exe Compression=lzma2 SolidCompression=yes @@ -66,18 +69,18 @@ ArchitecturesInstallIn64BitMode=x64 ChangesAssociations=yes [Files] -; Install IMaCh-x640.98q4.exe if running in 64-bit mode (x64; see above), +; Install IMaCh-x640.98q5.exe if running in 64-bit mode (x64; see above), ; IMaCh.exe otherwise. -;Source: "IMaCh-icl64-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode -Source: "..\build\icl64\Release\IMaCh-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode -;Source: "IMaCh-icl32-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode -Source: "..\build\icl32\Release\IMaCh-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode +;Source: "IMaCh-icl64-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode +Source: "..\build\icl64\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode +;Source: "IMaCh-icl32-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode +Source: "..\build\icl32\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode ;Source: "IMaCh.chm"; DestDir: "{app}\bin" Source: ..\html\doc\imach.htm; DestDir: {app}\doc Source: README.txt; DestDir: {app}; Flags: isreadme Source: imach.ico; DestDir: {app}\bin ;;Source: gnuplot.exe; DestDir: {app}\bin -Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin +Source: ..\distributions\windows\gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin ;;Source: wgnuplot.hlp; DestDir: {app}\bin Source: website.url; DestDir: {app} @@ -147,8 +150,8 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc ;P.S. -silent is recommended for use in install scripts [Icons] -Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q4 0.98q4; IconFilename: {app}\imach.ico -Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q4 0.98q4; Flags: runmaximized +Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q5 0.98q5; IconFilename: {app}\imach.ico +Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q5 0.98q5; Flags: runmaximized Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url ; NOTE: Most apps do not need registry entries to be pre-created. If you @@ -164,7 +167,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98q4; Flags: uninsdeletekeyifempty +Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98q5; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app} Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.6; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app} diff --git a/src/setup.iss.in b/src/setup.iss.in index 0e80d86..02a215b 100644 --- a/src/setup.iss.in +++ b/src/setup.iss.in @@ -2,6 +2,9 @@ ; $Id$ ; $State$ ; $Log$ +; Revision 1.13 2015/08/04 07:18:28 brouard +; *** empty log message *** +; ; Revision 1.12 2015/03/11 13:28:31 brouard ; Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5 ; @@ -77,7 +80,7 @@ Source: ..\html\doc\imach.htm; DestDir: {app}\doc Source: README.txt; DestDir: {app}; Flags: isreadme Source: imach.ico; DestDir: {app}\bin ;;Source: gnuplot.exe; DestDir: {app}\bin -Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin +Source: ..\distributions\windows\gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin ;;Source: wgnuplot.hlp; DestDir: {app}\bin Source: website.url; DestDir: {app} diff --git a/version.h.in b/version.h.in index 2a4932f..9c7f3ea 100644 --- a/version.h.in +++ b/version.h.in @@ -2,4 +2,4 @@ #define __IMACH_VERSION_MINOR__ @IMACH_VERSION_MINOR@ #define __IMACH_VERSION_PATCH__ @IMACH_VERSION_PATCH@ -#define __IMACH_VERSION__ "@IMACH_VERSION_MAJOR@.@IMACH_VERSION_MINOR@.@IMACH_VERSION_PATCH@@IMACH_VERSION_NOTE@" +#define __IMACH_VERSION__ "@IMACH_VERSION_MAJOR@.@IMACH_VERSION_MINOR@"