[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Yves Renard |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Sun, 2 Jul 2017 09:44:58 -0400 (EDT) |
branch: devel-yves
commit 92d3170456b9c206362f7c90830386fe2f2618c7
Author: Yves Renard <address@hidden>
Date: Sun Jul 2 15:44:33 2017 +0200
scripts and installer for matlab and python interface on windows
---
bin/upload_documentation | 2 +-
bin/upload_html | 2 +-
bin/upload_misc | 2 +-
bin/upload_version | 3 +-
doc/sphinx/source/.templates/download.html | 21 +++-
doc/sphinx/source/.templates/indexcontent.html | 5 +-
doc/sphinx/source/install/install_windows.rst | 2 +-
doc/sphinx/source/userdoc/bmesh.rst | 2 +-
internal_tools/getfem-matlab-interface-script.iss | 124 ++++++++++++++++++++++
internal_tools/getfem-python-interface-script.iss | 104 ++++++++++++++++++
10 files changed, 256 insertions(+), 11 deletions(-)
diff --git a/bin/upload_documentation b/bin/upload_documentation
index 605cc12..aa401d7 100755
--- a/bin/upload_documentation
+++ b/bin/upload_documentation
@@ -31,7 +31,7 @@ if [ "$srcdir" == "" ]; then
srcdir="."
fi
-me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"//"
'{print $2}' | awk -F"@" '{print $1}')
+me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"From "
'{print $2}' | awk -F"@" '{print $1}')
echo "Savannah login : $me"
if [ "$me" == "" ]; then
# me="renard"
diff --git a/bin/upload_html b/bin/upload_html
index 92f0983..884afaa 100755
--- a/bin/upload_html
+++ b/bin/upload_html
@@ -33,7 +33,7 @@ fi
where="html"
-me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"//"
'{print $2}' | awk -F"@" '{print $1}')
+me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"From "
'{print $2}' | awk -F"@" '{print $1}')
echo "Savannah login : $me"
if [ "$me" == "" ]; then
# me="renard"
diff --git a/bin/upload_misc b/bin/upload_misc
index d4381d7..d89b7c3 100755
--- a/bin/upload_misc
+++ b/bin/upload_misc
@@ -33,7 +33,7 @@ fi
where="misc"
-me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"//"
'{print $2}' | awk -F"@" '{print $1}')
+me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"From "
'{print $2}' | awk -F"@" '{print $1}')
echo "Savannah login : $me"
if [ "$me" == "" ]; then
# me="renard"
diff --git a/bin/upload_version b/bin/upload_version
index 4b2b62c..7936ccd 100755
--- a/bin/upload_version
+++ b/bin/upload_version
@@ -33,8 +33,7 @@ where=""
if [ "$srcdir" == "" ]; then
srcdir=".."
fi
-
-me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"//"
'{print $2}' | awk -F"@" '{print $1}')
+me=$((cd $srcdir && git ls-remote) 2>&1| grep "git.sv.gnu.org" | awk -F"From "
'{print $2}' | awk -F"@" '{print $1}')
echo "Savannah login : $me"
if [ "$me" == "" ]; then
# me="renard"
diff --git a/doc/sphinx/source/.templates/download.html
b/doc/sphinx/source/.templates/download.html
index c8430f5..0558cb8 100644
--- a/doc/sphinx/source/.templates/download.html
+++ b/doc/sphinx/source/.templates/download.html
@@ -98,9 +98,26 @@ and with respect to different Ubuntu releases at
GetFEM++ including its python interface can be installed from a terminal
by executing <b>aptitude update</b> and <b>aptitude install
python-getfem++</b>.
-<h3> On Windows </h3>
+<h3> On Windows (last release)</h3>
-<p>Installer of the Scilab interface for 32bits Windows and Scilab 5.3
provided by Yann Colette (2011/11/18):
+<p>Installer of the GetFEM 5.2 interface for 64bits Windows and Matlab 2016:
+ <a
href="http://download-mirror.savannah.gnu.org/releases/getfem/misc/getfem5.2-matlab2016-interface-setup.exe";>getfem5.2-matlab2016-interface-setup.exe</a>.</p>
+
+<p>IMPORTANT : Unfortunately, it seems that recent Matlab versions on Windows
do not take properly into account the MATLABPATH environment variable (Matlab
is unable to run correctly with a defined MATLABPATH variable). So, the
installer do not set it and you have to add the install path specified on the
installer yourself using Matlab (Click on "home" and "add path" in Matlab).</p>
+
+<p>Once installed, you can test under Matlab the tests programs included.</p>
+
+
+<p>Installer of the GetFEM 5.2 interface for 64bits Windows and Python 2.7 of
Anaconda 2-4.4.0:
+ <a
href="http://download-mirror.savannah.gnu.org/releases/getfem/misc/getfem5.2-python-2.7-interface-setup.exe";>getfem5.2-python-2.7-interface-setup.exe</a>.</p>
+<p>Note that you have to install first Anaconda 2. The interface is only built
for Anaconda 2, if you want to use Anaconda 3 (Python 3.x) you have to build
the interface following <a href="{{ pathto("install/install_windows")
}}">this</a>.</p>
+
+<p>Once installed, you can test under for instance command shell the Python
tests programs included.</p>
+
+
+<h3> On Windows (old releases)</h3>
+
+<p>Installer of the GetFEM 4.1 Scilab interface for 32bits Windows and Scilab
5.3 provided by Yann Colette (2011/11/18):
<a
href="http://download-mirror.savannah.gnu.org/releases/getfem/misc/sci_getfem-rev2914-scilab-5.3-setup.exe";>sci_getfem-rev2914-scilab-5.3-setup.exe</a>.</p>
<p>Binaries for the python-interface (python 2.4, 2.5 and 2.6) on Windows XP
(2010/08/28) kindly provided by Yao Koutsawa:
diff --git a/doc/sphinx/source/.templates/indexcontent.html
b/doc/sphinx/source/.templates/indexcontent.html
index 3cc14b4..57b0f3b 100644
--- a/doc/sphinx/source/.templates/indexcontent.html
+++ b/doc/sphinx/source/.templates/indexcontent.html
@@ -6,8 +6,9 @@
<META NAME="Keywords" CONTENT=" finite element library, finite element
package, finite element software, finite elements">
<div style="text-align:center;"><img src="{{ pathto('_static/logogetfem.png',
1) }}" alt="the GetFEM++ logo"><br/> An open-source finite element library
</div>
+<br/><br/>
-
+<p><strong>NEW</strong> (July 2017): Version 5.2 has been released and Windows
installer for python and matlab interfaces can be found <a href="{{
pathto("download") }}">here</a>.<br/></p>
<p><strong>Parts of the documentation:</strong></p>
<table class="contentstable" align="center"><tr>
@@ -110,7 +111,7 @@
<p>
GetFEM++ has only an experimental meshing procedure (and produces regular
meshes). It is therefore often necessary to import meshes. The formats
- currently supported are GID, GMSH and EMC2.
+ currently supported are GID, GMSH, EMC2 and ANSYS.
</p>
</div>
diff --git a/doc/sphinx/source/install/install_windows.rst
b/doc/sphinx/source/install/install_windows.rst
index 830719e..9ba1839 100644
--- a/doc/sphinx/source/install/install_windows.rst
+++ b/doc/sphinx/source/install/install_windows.rst
@@ -152,7 +152,7 @@ Additionnaly to build the Python interface, you will have
first to install a 64b
$ make
- It normally build the interface correctly. Then just add as a Windows
+ It normally builds the interface correctly. Then just add as a Windows
system variable ``PYTHONPATH`` with the
value ``c:\msys\home\login\getfem-5.?\interface\src\python`` where
``login`` and ``5.?`` have tobe adapted. You can either copy the
diff --git a/doc/sphinx/source/userdoc/bmesh.rst
b/doc/sphinx/source/userdoc/bmesh.rst
index 9569df6..576c3a9 100644
--- a/doc/sphinx/source/userdoc/bmesh.rst
+++ b/doc/sphinx/source/userdoc/bmesh.rst
@@ -504,7 +504,7 @@ the aforementioned format specifiers.
The "gid" format specifier is for meshes generated by `GiD`_ and "gmsh"
is for meshes generated by the open-source mesh generator `Gmsh`_.
-The "cdb" format specifier is for reading meshes from `ANSYS`_ models
+The "cdb" format specifier is for reading meshes from `ANSYS
<http://www.ansys.com>`_ models
exported in blocked format with the CDWRITE command. Currently the
`ANSYS`_ element types 42,45,73,82,87,89,90,92,95,162,182,183,185,186,187
and 191 can be imported, this however does not include any finite element
diff --git a/internal_tools/getfem-matlab-interface-script.iss
b/internal_tools/getfem-matlab-interface-script.iss
new file mode 100755
index 0000000..96a7eb0
--- /dev/null
+++ b/internal_tools/getfem-matlab-interface-script.iss
@@ -0,0 +1,124 @@
+#define MyAppName "Getfem-5.2-Matlab2016"
+#define MyAppVersion "5.2"
+#define MyAppPublisher "Getfem project"
+#define MyAppURL "http://www.getfem.org";
+
+[Setup]
+AppId={{ACCE7B33-300B-4CAB-9D51-EAA9E007A1C0}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+LicenseFile=C:\msys\home\yves\getfem-5.1\COPYING
+OutputDir=C:\msys\home\yves
+OutputBaseFilename=getfem5.2-matlab2016-interface-setup
+Compression=lzma
+SolidCompression=yes
+ChangesEnvironment=yes
+DisableDirPage=no
+
+[Code]
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+ Path, AppDir: string;
+ Index: Integer;
+begin
+ if CurUninstallStep = usUninstall then
+ begin
+ if RegQueryStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\',
+ 'MATLABPATH', Path) then
+ begin
+ AppDir := ExpandConstant('{app}');
+ Index := Pos(AppDir, Path);
+ Delete(Path, Index-1, Length(AppDir)+1);
+ RegWriteStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\',
+ 'MATLABPATH', Path);
+ end;
+ end;
+end;
+
+[Code]
+function NeedsAddPath(Param: string): boolean;
+var
+ OrigPath: string;
+begin
+ if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
+ 'MATLABPATH', OrigPath)
+ then begin
+ Result := True;
+ exit;
+ end;
+ { look for the path with leading and trailing semicolon }
+ { Pos() returns 0 if not found }
+ Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
+end;
+
+[Registry]
+; Disabled because set MATLABPATH disturb Matlab 2016 ...
+; Root: HKLM; SubKey: "SYSTEM\CurrentControlSet\Control\Session
Manager\Environment\"; ValueType: string; ValueName: "MATLABPATH"; ValueData:
"{reg:HKLM\SYSTEM\CurrentControlSet\Control\Session
Manager\Environment\,MATLABPATH};{app}"; Check: NeedsAddPath('{app}'); Flags:
uninsdeletekeyifempty
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.islu"
+Name: "brazilianportuguese"; MessagesFile:
"compiler:Languages\BrazilianPortuguese.isl"
+Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
+Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
+Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
+Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
+Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
+Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
+Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
+Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl"
+Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
+Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
+
+[Files]
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\matlab\*.m";
DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\matlab\*.mex*";
DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\matlab\private\*.m";
DestDir: "{app}\private"; Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden"; Flags:
ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:address@hidden"; DestDir: "address@hidden";
Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\tests\matlab\*.m";
DestDir: "{app}\tests"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\tests\matlab\private\*.m";
DestDir: "{app}\tests\private"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\tests\meshes\*.msh";
DestDir: "{app}\meshes"; Flags: ignoreversion
+
+
diff --git a/internal_tools/getfem-python-interface-script.iss
b/internal_tools/getfem-python-interface-script.iss
new file mode 100755
index 0000000..2604745
--- /dev/null
+++ b/internal_tools/getfem-python-interface-script.iss
@@ -0,0 +1,104 @@
+#define MyAppName "Getfem-5.2-Python2"
+#define MyAppVersion "5.2"
+#define MyAppPublisher "Getfem project"
+#define MyAppURL "http://www.getfem.org";
+
+[Setup]
+AppId={{ACCE7B33-300B-4CAB-9D51-EAA9E007A1C0}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+LicenseFile=C:\msys\home\yves\getfem-5.1\COPYING
+OutputDir=C:\msys\home\yves
+OutputBaseFilename=getfem5.2-python-2.7-interface-setup
+Compression=lzma
+SolidCompression=yes
+ChangesEnvironment=yes
+DisableDirPage=no
+
+[Code]
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+ Path, AppDir: string;
+ Index: Integer;
+begin
+ if CurUninstallStep = usUninstall then
+ begin
+ if RegQueryStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\',
+ 'PYTHONPATH', Path) then
+ begin
+ AppDir := ExpandConstant('{app}');
+ Index := Pos(AppDir, Path);
+ Delete(Path, Index-1, Length(AppDir)+1);
+ RegWriteStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\',
+ 'PYTHONPATH', Path);
+ end;
+ end;
+end;
+
+[Code]
+function NeedsAddPath(Param: string): boolean;
+var
+ OrigPath: string;
+begin
+ if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
+ 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
+ 'PYTHONPATH', OrigPath)
+ then begin
+ Result := True;
+ exit;
+ end;
+ { look for the path with leading and trailing semicolon }
+ { Pos() returns 0 if not found }
+ Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
+end;
+
+[Registry]
+Root: HKLM; SubKey: "SYSTEM\CurrentControlSet\Control\Session
Manager\Environment\"; ValueType: string; ValueName: "PYTHONPATH"; ValueData:
"{reg:HKLM\SYSTEM\CurrentControlSet\Control\Session
Manager\Environment\,PYTHONPATH};{app}"; Check: NeedsAddPath('{app}'); Flags:
uninsdeletekeyifempty
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.islu"
+Name: "brazilianportuguese"; MessagesFile:
"compiler:Languages\BrazilianPortuguese.isl"
+Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
+Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
+Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
+Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
+Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
+Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
+Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
+Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl"
+Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
+Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
+
+[Files]
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\python\__init__.py";
DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\python\_getfem.pyd";
DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\src\python\getfem.py";
DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\tests\python\*.py"; DestDir:
"{app}\tests"; Flags: ignoreversion
+Source: "C:\msys\home\yves\getfem-5.2\interface\tests\meshes\*.msh"; DestDir:
"{app}\meshes"; Flags: ignoreversion
+
+