From e2184e68fcffb0b2f84df67c341f88a887fcadf5 Mon Sep 17 00:00:00 2001
From: imirzov <imirzov@gmail.com>
Date: Sat, 20 Jun 2020 13:17:01 +0200
Subject: [PATCH] Removed SPOOLES and ARPACK sources

---
 .gitignore      |  3 ++-
 README.md       |  6 ++++--
 make_release.py | 33 +++++++++++++++++++++++----------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a631f68f..402f1174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 .vscode
 __pycache__
 /backup
+/dist
 /releases
-/examples/default.log
+/examples/*.log
 /src/architecture.odp
 /src/architecture.png
 /config/*.py
diff --git a/README.md b/README.md
index 6e1f9f28..87af5bfc 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Please, you may:
 - Simply use this software and ask questions.
 - Share your models and screenshots.
 - Do something from the [TODO-list](#TODO).
-- Report problems by [posting issues](https://github.com/calculix/cae/issues). If any error accured, please, in the settings dialog change the Logging level to 'DEBUG', then repeat actions leading to the error. In such a way you'll obtain much more detailed log - attach it to the problem report.
+- Report problems by [posting issues](https://github.com/calculix/cae/issues). Please, attach ./examples/default.log to the problem report.
 
 <br/><br/>
 
@@ -164,7 +164,9 @@ In Windows to work with subroutines and to recompile CalculiX sources from CAE y
 
 # What's new
 
-+ Now help on CalculiX keywords is opened in the default web browser. Embeded QWebEngineView was removed. It led to relatively lightweight distribution (203 MB -> 123 MB).
++ Weight of the distribution reduced by ~90 MB.
+
++ Now help on CalculiX keywords is opened in the default web browser. Embeded QWebEngineView was removed.
 
 + Improved communication between windows.
 
diff --git a/make_release.py b/make_release.py
index 54d637d5..5a8c1d0c 100644
--- a/make_release.py
+++ b/make_release.py
@@ -29,13 +29,14 @@ def copy(src, dst, skip):
 if __name__ == '__main__':
     if os.name=='nt':
         op_sys = '_windows'
-        skip = ('_linux', '_linux.env', '.sh', '.desktop',
-            'ccx', 'cgx', 'unv2ccx', 'ccx2paraview')
+        skip = ('_linux', 'Settings_linux.py', '.sh',
+            '.desktop', 'ccx', 'cgx', 'unv2ccx', 'ccx2paraview')
         extension = '.exe' # binary extension in OS
         TEMP = 'C:\\Windows\\Temp\\'
     else:
         op_sys = '_linux'
-        skip = ('_windows', '_windows.env', '.bat', '.exe', '.dll')
+        skip = ('_windows', 'Settings_windows.py',
+            '.bat', '.exe', '.dll')
         extension = '' # binary extension in OS
         TEMP = '/tmp/'
 
@@ -67,17 +68,29 @@ def copy(src, dst, skip):
     shutil.move('./dist/cae', './dist/src')
 
     # Prepare skip list
-    with open('.gitignore', 'r') as f:
-        lines = f.readlines()
-    for i in range(len(lines)):
-        skip += (lines[i].rstrip().lstrip('*'), )
-    skip += ('.git', '.gitignore', '.py',
-        'tests.log', 'requirements.txt',
-        'dist', 'gui', 'model')
+    skip += ('.git', '.gitignore', '.py', 'tests.log',
+        'dist', 'gui', 'model', 'backup', 'releases',
+        'default.log', 'materials.log', 'ARPACK', 
+        'SPOOLES.2.2')
 
     # Copy files and folders from sources to 'dist'
     copy('.', 'dist', skip)
 
+    # Copy ARPACK library to 'dist'
+    lib = os.path.join('ccx'+op_sys, 'ARPACK', 'libarpack_INTEL.a')
+    dst = os.path.join('dist', 'ccx'+op_sys, 'ARPACK')
+    os.makedirs(dst)
+    shutil.copy(lib, dst)
+
+    # Copy SPOOLES libraries to 'dist'
+    lib = os.path.join('ccx'+op_sys, 'SPOOLES.2.2', 'MT', 'src', 'spoolesMT.a')
+    dst = os.path.join('dist', 'ccx'+op_sys, 'SPOOLES.2.2', 'MT', 'src')
+    os.makedirs(dst)
+    shutil.copy(lib, dst)
+    lib = os.path.join('ccx'+op_sys, 'SPOOLES.2.2', 'spooles.a')
+    dst = os.path.join('dist', 'ccx'+op_sys, 'SPOOLES.2.2')
+    shutil.copy(lib, dst)
+
     # Make archive
     if os.path.isfile(ARCH + '.zip'):
         os.remove(ARCH + '.zip') # delete old