forked from OmniDB/OmniDB
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://github.com/OmniDB/OmniDB into dev
- Loading branch information
Showing
11 changed files
with
107 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,46 @@ | ||
| # -*- mode: python ; coding: utf-8 -*- | ||
|
|
||
| block_cipher = None | ||
|
|
||
| data_files_server = [ | ||
| ('omnidb.db','.'), | ||
| ('config.py','.'), | ||
| ('OmniDB_app/static','OmniDB_app/static'), | ||
| ('OmniDB_app/include','OmniDB_app/include'), | ||
| ('OmniDB_app/templates','OmniDB_app/templates'), | ||
| ('OmniDB_app/plugins','OmniDB_app/plugins') | ||
| ] | ||
|
|
||
|
|
||
| a = Analysis(['omnidb-server.py'], | ||
| pathex=['C:\\Users\\omnidb\\OmniDB\\OmniDB\\OmniDB'], | ||
| binaries=[], | ||
| datas=data_files_server, | ||
| hiddenimports=['cheroot.ssl','cheroot.ssl.builtin','psycopg2','paramiko'], | ||
| hookspath=[], | ||
| runtime_hooks=[], | ||
| excludes=[], | ||
| win_no_prefer_redirects=False, | ||
| win_private_assemblies=False, | ||
| cipher=block_cipher, | ||
| noarchive=False) | ||
| pyz = PYZ(a.pure, a.zipped_data, | ||
| cipher=block_cipher) | ||
| exe = EXE(pyz, | ||
| a.scripts, | ||
| [], | ||
| exclude_binaries=True, | ||
| name='omnidb-server', | ||
| debug=False, | ||
| bootloader_ignore_signals=False, | ||
| strip=False, | ||
| upx=True, | ||
| console=True ) | ||
| coll = COLLECT(exe, | ||
| a.binaries, | ||
| a.zipfiles, | ||
| a.datas, | ||
| strip=False, | ||
| upx=True, | ||
| upx_exclude=[], | ||
| name='omnidb-server') | ||
| # -*- mode: python ; coding: utf-8 -*- | ||
|
|
||
| block_cipher = None | ||
|
|
||
| data_files_server = [ | ||
| ('omnidb.db','.'), | ||
| ('config.py','.'), | ||
| ('OmniDB_app/static','OmniDB_app/static'), | ||
| ('OmniDB_app/include','OmniDB_app/include'), | ||
| ('OmniDB_app/templates','OmniDB_app/templates'), | ||
| ('OmniDB_app/plugins','OmniDB_app/plugins') | ||
| ] | ||
|
|
||
|
|
||
| a = Analysis(['omnidb-server.py'], | ||
| pathex=['C:\\Users\\omnidb\\OmniDB\\OmniDB\\OmniDB'], | ||
| binaries=[], | ||
| datas=data_files_server, | ||
| hiddenimports=['cheroot.ssl','cheroot.ssl.builtin','psycopg2','paramiko'], | ||
| hookspath=[], | ||
| runtime_hooks=[], | ||
| excludes=[], | ||
| win_no_prefer_redirects=False, | ||
| win_private_assemblies=False, | ||
| cipher=block_cipher, | ||
| noarchive=False) | ||
| pyz = PYZ(a.pure, a.zipped_data, | ||
| cipher=block_cipher) | ||
| exe = EXE(pyz, | ||
| a.scripts, | ||
| [], | ||
| exclude_binaries=True, | ||
| name='omnidb-server', | ||
| debug=False, | ||
| bootloader_ignore_signals=False, | ||
| strip=False, | ||
| upx=True, | ||
| console=True ) | ||
| coll = COLLECT(exe, | ||
| a.binaries, | ||
| a.zipfiles, | ||
| a.datas, | ||
| strip=False, | ||
| upx=True, | ||
| upx_exclude=[], | ||
| name='omnidb-server') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| mkdir release | ||
| mkdir release/omnidb-app | ||
| unzip app.zip -d release/omnidb-app | ||
| cp ../app/index.html release/omnidb-app | ||
| cp ../app/package.json release/omnidb-app | ||
| ../../../../AppData/Local/Programs/Python/Python36-32/Scripts/pyinstaller.exe ../../OmniDB/omnidb-win.spec | ||
| cp -R dist/omnidb-server release/omnidb-app | ||
| mv dist/omnidb-server release | ||
| rm -rf build | ||
| rm -rf dist | ||
| mkdir release | ||
| curl https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-win-ia32.zip -o app.zip | ||
| unzip app.zip -d release | ||
| rm app.zip | ||
| mv release/nwjs-v0.49.0-win-ia32 release/OmniDB | ||
| mv release/OmniDB/nw.exe release/OmniDB/omnidb-app.exe | ||
| cp ../app/index.html release/OmniDB | ||
| cp ../app/package.json release/OmniDB | ||
| cp ../app/omnidb_icon.png release/OmniDB | ||
| ../../../../AppData/Local/Programs/Python/Python36-32/Scripts/pyinstaller.exe ../../OmniDB/omnidb-win.spec | ||
| mv dist/omnidb-server release/OmniDB | ||
| #../../../../../../Arquivos\ de\ Programas/Resource\ Hacker/ResourceHacker.exe -open release/OmniDB/omnidb-app.exe -save release/OmniDB/omnidb-app.exe -action addoverwrite -res ../win-icon.ico -mask ICONGROUP,IDR_MAINFRAME, | ||
| #../../../../../../Arquivos\ de\ Programas/Resource\ Hacker/ResourceHacker.exe -open release/OmniDB/omnidb-server/omnidb-server.exe -save release/OmniDB/omnidb-server/omnidb-server.exe -action addoverwrite -res ../win-icon.ico -mask ICONGROUP,IDR_MAINFRAME, | ||
| rm -rf build | ||
| rm -rf dist |