Skip to content

Commit 5df0ad4

Browse files
author
Michel Lampo
committed
Fix Linux code and create build file for linux
1 parent 4202850 commit 5df0ad4

File tree

7 files changed

+34
-3
lines changed

7 files changed

+34
-3
lines changed

BlocklyPropClient.linux.spec

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# -*- mode: python -*-
2+
a = Analysis(['BlocklyServer.py'],
3+
4+
hiddenimports=[],
5+
hookspath=None,
6+
runtime_hooks=None)
7+
pyz = PYZ(a.pure)
8+
exe = EXE(pyz,
9+
a.scripts,
10+
exclude_binaries=True,
11+
name='BlocklyPropClient',
12+
debug=False,
13+
strip=None,
14+
upx=True,
15+
console=True,
16+
icon='blocklyprop.ico' )
17+
propeller_libs_and_tools = Tree('propeller-tools', prefix='propeller-tools', excludes=['*.pdf'])
18+
propeller_libs_and_tools += Tree('propeller-lib', prefix='propeller-lib')
19+
propeller_libs_and_tools += Tree('propeller-c-lib', prefix='propeller-c-lib', excludes=['*.html', 'html', '*.doxyfile', '*.side', '*.c'])
20+
coll = COLLECT(exe,
21+
a.binaries,
22+
a.zipfiles,
23+
a.datas,
24+
propeller_libs_and_tools,
25+
strip=None,
26+
upx=True,
27+
name='linux')
28+
29+
# Analysis
30+
# pathex=['D:\\Development\\python\\BlocklyPropClient'],

BlocklyPropClient.spec renamed to BlocklyPropClient.windows.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ coll = COLLECT(exe,
2424
propeller_libs_and_tools,
2525
strip=None,
2626
upx=True,
27-
name='BlocklyPropClient')
27+
name='windows')
2828

2929
# Analysis
3030
# pathex=['D:\\Development\\python\\BlocklyPropClient'],

SpinCompiler.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def __init__(self, propeller_loader):
1212
self.propeller_loader = propeller_loader
1313
self.compiler_executables = {
1414
"Windows": "/propeller-tools/windows/openspin.exe",
15-
"Linux": "/propeller-tools/windows/openspin",
15+
"Linux": "/propeller-tools/linux/openspin",
1616
"MacOS": "/propeller-tools/mac/openspin"
1717
}
1818

@@ -58,6 +58,7 @@ def compile(self, action, code):
5858
binary_file.close()
5959

6060
executable = self.appdir + self.compiler_executables[platform.system()]
61+
print executable
6162
lib_directory = self.appdir + "/propeller-lib"
6263

6364
executing_data = [executable, "-o", binary_file.name, "-L", lib_directory]
@@ -73,4 +74,4 @@ def compile(self, action, code):
7374

7475
os.remove(spin_file.name)
7576

76-
return (success, binary_file, out, err)
77+
return (success, binary_file, out, err)

propeller-tools/linux/openspin

100644100755
File mode changed.

propeller-tools/linux/propeller-load

100644100755
File mode changed.

propeller-tools/mac/openspin

100644100755
File mode changed.

propeller-tools/mac/propeller-load

100644100755
File mode changed.

0 commit comments

Comments
 (0)