Skip to content

Commit 404dd28

Browse files
committed
added linux.spec for linux binaries and also improved Makefile
1 parent 166cf82 commit 404dd28

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

Makefile

+4-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ ${PYTHON_EXE}: deps/python-${PYTHON_VERSION}.msi
5959
msiexec /i python-2.7.3.msi /qb
6060
@touch $@
6161

62-
dependencies_wine: ${PYTHON_EXE} pip.installed
63-
6462
${WINE_PATH}/Python27/msvcp90.dll: ${WINE_PATH}/windows/system32/msvcp90.dll
6563
@cp $< $@
6664

@@ -89,8 +87,6 @@ ${PYINSTALLER}: tools/.done deps/pyinstaller-2.0.zip
8987
unzip ../deps/pyinstaller-2.0.zip
9088
@touch $@
9189

92-
build_tools: tools/pyinstaller-${PYINSTALLER_VERSION}/pyinstaller.py
93-
9490
tools/env/bin/activate: tools/.done
9591
virtualenv --no-site-packages --distribute tools/env
9692
@touch $@
@@ -107,11 +103,14 @@ dependencies_wine: ${PYTHON_EXE} ${PIP_EXE}
107103

108104
windows_binary_dependencies: ${WINE_PATH}/Python27/Scripts/pywin32_postinstall.py
109105

106+
dist/linux/pynes: ${PYINSTALLER} tools/requirements.windows.checked
107+
python ${PYINSTALLER} pynes.linux.spec
108+
110109
dist/windows/pynes.exe: ${PYINSTALLER} ${PYTHON_EXE} windows_binary_dependencies tools/requirements.windows.checked
111110
wine ${PYTHON_EXE} ${PYINSTALLER} --onefile pynes.windows.spec
112111
@touch $@
113112

114-
dist: clean dist/windows/pynes.exe
113+
dist: clean dist/linux/pynes dist/windows/pynes.exe
115114

116115
clean:
117116
@rm -rf build

pynes.linux.spec

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# -*- mode: python -*-
2+
3+
a = Analysis(['bin/pynes'], pathex=[os.path.join('.')],
4+
hiddenimports=['pynes'], hookspath=None)
5+
6+
pyz = PYZ(a.pure)
7+
8+
exe = EXE(pyz,
9+
a.scripts,
10+
exclude_binaries=1,
11+
name=os.path.join('build', 'pyi.linux', 'pynes'),
12+
debug=False,
13+
strip=None,
14+
upx=False,
15+
console=True )
16+
17+
coll = COLLECT(exe,
18+
a.binaries,
19+
a.zipfiles,
20+
a.datas,
21+
strip=None,
22+
upx=False,
23+
name=os.path.join('dist', 'linux'))

0 commit comments

Comments
 (0)