Skip to content

Commit

Permalink
Removed SPOOLES and ARPACK sources
Browse files Browse the repository at this point in the history
  • Loading branch information
imirzov committed Jun 20, 2020
1 parent 10d0269 commit e2184e6
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.vscode
__pycache__
/backup
/dist
/releases
/examples/default.log
/examples/*.log
/src/architecture.odp
/src/architecture.png
/config/*.py
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/>

Expand Down Expand Up @@ -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.

Expand Down
33 changes: 23 additions & 10 deletions make_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/'

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e2184e6

Please sign in to comment.