update build exe in Windows and makefile

kmolLin · May 17, 2017 · 2a0bb2a · 2a0bb2a
1 parent 4f20d08
commit 2a0bb2a
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,16 @@
+#Pyquino Makefile
+
+all: build run
+
+build: launchPyquino.py
+	pyinstaller -F $< -i ./icons/usb.ico \
+--path="C:\Users\Lin\AppData\Local\Programs\Python\Python35\Lib\site-packages\PyQt5\Qt\bin" \
+--add-binary="core/vrep_remoAPI/remoteApi.dll;."
+
+run: build dist\launchPyquino.exe
+	dist\launchPyquino.exe
+
+clean:
+	rd build /s /q
+	rd dist /s /q
+	del launchPyquino.spec
diff --git a/Pyquino.e4p b/Pyquino.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project Pyquino -->
-<!-- Saved: 2017-03-15, 19:39:25 -->
+<!-- Saved: 2017-05-17, 19:19:19 -->
 <!-- Copyright (C) 2017 you-sheng,  -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -55,6 +55,7 @@
   <Interfaces/>
   <Others>
     <Other>Arduino_test_file/README.md</Other>
+    <Other>Makefile</Other>
   </Others>
   <MainScript>launchPyquino.py</MainScript>
   <Vcs>

diff --git a/__pycache__/icons_rc.cpython-35.pyc b/__pycache__/icons_rc.cpython-35.pyc
diff --git a/__pycache__/pnael.cpython-35.pyc b/__pycache__/pnael.cpython-35.pyc
diff --git a/_eric6project/Pyquino.e4q b/_eric6project/Pyquino.e4q
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
+<!-- eric6 user project file for project Pyquino -->
+<!-- Saved: 2017-05-17, 19:19:20 -->
+<!-- Copyright (C) 2017 you-sheng,  -->
+<UserProject version="4.0"/>
diff --git a/_eric6project/Pyquino.e6t b/_eric6project/Pyquino.e6t
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-6.0.dtd">
 <!-- eric6 tasks file for project Pyquino -->
-<!-- Saved: 2017-02-26, 16:15:12 -->
+<!-- Saved: 2017-05-17, 19:19:20 -->
 <Tasks version="6.0">
   <ProjectScanFilter></ProjectScanFilter>
-  <Task priority="1" completed="False" type="1" uid="{5d8e266e-8254-4f26-b12e-e0ecc4840841}">
-    <Summary>TODO: not implemented yet</Summary>
-    <Description></Description>
-    <Created>2017-02-26, 16:15:09</Created>
-    <Resource>
-      <Filename>core/mainwindow.py</Filename>
-      <Linenumber>425</Linenumber>
-    </Resource>
-  </Task>
 </Tasks>
diff --git a/build/launchPyquino/base_library.zip b/build/launchPyquino/base_library.zip
diff --git a/core/__pycache__/Ui_mainwindow.cpython-35.pyc b/core/__pycache__/Ui_mainwindow.cpython-35.pyc
diff --git a/core/__pycache__/__init__.cpython-35.pyc b/core/__pycache__/__init__.cpython-35.pyc
diff --git a/core/__pycache__/info.cpython-35.pyc b/core/__pycache__/info.cpython-35.pyc
diff --git a/core/__pycache__/mainwindow.cpython-35.pyc b/core/__pycache__/mainwindow.cpython-35.pyc
diff --git a/core/__pycache__/serialportcontext.cpython-35.pyc b/core/__pycache__/serialportcontext.cpython-35.pyc
diff --git a/core/gcode/__pycache__/gcodeParser.cpython-35.pyc b/core/gcode/__pycache__/gcodeParser.cpython-35.pyc
diff --git a/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc b/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc
diff --git a/core/graphy/__pycache__/__init__.cpython-35.pyc b/core/graphy/__pycache__/__init__.cpython-35.pyc
diff --git a/core/graphy/__pycache__/graphy.cpython-35.pyc b/core/graphy/__pycache__/graphy.cpython-35.pyc
diff --git a/core/graphy/graphy.py b/core/graphy/graphy.py
@@ -9,7 +9,6 @@
 
 from .Ui_graphy import Ui_Dialog
 
-import pyqtgraph as pg
 
 import pyqtgraph.opengl as gl
 

diff --git a/core/mainwindow.py b/core/mainwindow.py
@@ -12,7 +12,7 @@
 
 from .Ui_mainwindow import Ui_MainWindow
 from .monitor.machine_mointor import Machine
-from .graphy.graphy import Dialog
+#from .graphy.graphy import Dialog
 import pnael 
 
 from .vrep.vrep_setting import vrepsetting

diff --git a/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc b/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc
diff --git a/core/monitor/__pycache__/__init__.cpython-35.pyc b/core/monitor/__pycache__/__init__.cpython-35.pyc
diff --git a/core/monitor/__pycache__/machine_mointor.cpython-35.pyc b/core/monitor/__pycache__/machine_mointor.cpython-35.pyc
diff --git a/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc b/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc
diff --git a/core/vrep/__pycache__/vrep_setting.cpython-35.pyc b/core/vrep/__pycache__/vrep_setting.cpython-35.pyc
diff --git a/core/vrep/vrep_setting.py b/core/vrep/vrep_setting.py
@@ -29,11 +29,12 @@ def run(self):
         self.getProgress.setMaximum(len([e for e in self.layers[0].segments]))
         self.layer_vertices = list()
         for layer in self.layers:
+            '''
             x = layer.start["X"]
             y = layer.start["Y"]
             z = layer.start["Z"]
+            '''
             for seg in layer.segments:
-                self.layer_vertices.append([x, y, z])
                 seg_x = seg.coords["X"]
                 seg_y = seg.coords["Y"]
                 seg_z = seg.coords["Z"]

diff --git a/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc b/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc
diff --git a/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc b/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc
diff --git a/icons/usb.ico b/icons/usb.ico
diff --git a/launchPyquino.spec b/launchPyquino.spec
@@ -4,8 +4,8 @@ block_cipher = None
 
 
 a = Analysis(['launchPyquino.py'],
-             pathex=['/home/kmol/桌面/Pyquino'],
-             binaries=[],
+             pathex=['C:\\Users\\Lin\\AppData\\Local\\Programs\\Python\\Python35\\Lib\\site-packages\\PyQt5\\Qt\\bin', 'C:\\Users\\Lin\\Desktop\\Pyquino'],
+             binaries=[('core/vrep_remoAPI/remoteApi.dll', '.')],
              datas=[],
              hiddenimports=[],
              hookspath=[],
@@ -18,16 +18,11 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          exclude_binaries=True,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
           name='launchPyquino',
           debug=False,
           strip=False,
           upx=True,
-          console=False )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='launchPyquino')
+          console=True , icon='icons\\usb.ico')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,6 @@

		from .Ui_graphy import Ui_Dialog

		import pyqtgraph as pg

		import pyqtgraph.opengl as gl

Expand Down