fixes build issues

myTonino · Apr 8, 2017 · d90f20d · d90f20d
1 parent 4368d5b
commit d90f20d
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 9 deletions.
diff --git a/src/setup-mac2.py b/src/setup-mac2.py
@@ -174,12 +174,12 @@ def my_parse_makefile(filename, g):
 #            'QtTest',
 #            'QtWebKit',
 #            'QtXMLPatterns']:
-#    for root,dirs,files in os.walk('./Artisan.app/Contents/Frameworks/' + fw + ".framework"):
+#    for root,dirs,files in os.walk('./Tonino.app/Contents/Frameworks/' + fw + ".framework"):
 #        for file in files:
 #            print 'Deleting', file
 #            os.remove(os.path.join(root,file))
 # for Qt5
-print '*** Removing unused Qt frameworks ***'
+print('*** Removing unused Qt frameworks ***')
 for fw in [
             'QtDeclarative.framework',
             'QtHelp.framework',
@@ -207,9 +207,9 @@ def my_parse_makefile(filename, g):
             'QtGui.framework/Versions/4.0',
             'QtWidgets.framework/Versions/4',
             'QtWidgets.framework/Versions/4.0']:
-    for root,dirs,files in os.walk('./Artisan.app/Contents/Frameworks/' + fw):
+    for root,dirs,files in os.walk('./Tonino.app/Contents/Frameworks/' + fw):
         for file in files:
-            print 'Deleting', file
+            print('Deleting', file)
             os.remove(os.path.join(root,file))
 
 

diff --git a/src/setup-mac35.py b/src/setup-mac35.py
@@ -162,6 +162,49 @@ def my_parse_makefile(filename, g):
 # generated by v0.8 of py2app:
 #os.system(r'cp /Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config-3.3m/Makefile ./Tonino.app/Contents/Resources/lib/python3.3/config-3.3m/')
 
+# delete unused Qt.framework files (py2app exclude does not seem to work)
+print('*** Removing unused Qt frameworks ***')
+for fw in [
+            'QtBluetooth.framework',
+            'QtConcurrent.framework',
+            'QtDesigner.framework',
+            'QtDeclarative.framework',
+            'QtHelp.framework',
+            'QtLocation.framework',
+            'QtMultimedia.framework',
+            'QtMultimediaWidgets.framework',
+            'QtNetwork.framework',
+            'QtNfc.framework',
+            'QtOpenGL.framework',
+            'QtScript.framework',
+            'QtScriptTools.framework',
+            'QtSql.framework',
+            'QtDesigner.framework',
+            'QtTest.framework',
+            'QtWebKit.framework',
+            'QtWebKitWidgets.framework',
+            'QtXMLPatterns.framework',
+            'QtCLucene.framework',
+            'QtPositioning.framework',
+            'QtQml.framework',
+            'QtQuick.framework',
+            'QtQuickWidgets.framework',
+            'QtSensors.framework',
+            'QtSerialPort.framework',
+            'QtSvg.framework',
+            'QtWebChannel.framework',
+            'QtWebSockets.framework',
+            'QtCore.framework/Versions/4',
+            'QtCore.framework/Versions/4.0',
+            'QtGui.framework/Versions/4',
+            'QtGui.framework/Versions/4.0',
+            'QtWidgets.framework/Versions/4',
+            'QtWidgets.framework/Versions/4.0']:
+    for root,dirs,files in os.walk('./Tonino.app/Contents/Frameworks/' + fw):
+        for file in files:
+            print('Deleting', file)
+            os.remove(os.path.join(root,file))
+
 print('*** Removing Qt debug libs ***')
 for root, dirs, files in os.walk('.'):
     for file in files:

diff --git a/src/translations/tonino_de.ts b/src/translations/tonino_de.ts
@@ -74,7 +74,7 @@
     </message>
     <message encoding="UTF-8">
         <location filename="../uic/AboutDialogUI.py" line="77"/>
-        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
+        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/src/translations/tonino_es.ts b/src/translations/tonino_es.ts
@@ -74,7 +74,7 @@
     </message>
     <message encoding="UTF-8">
         <location filename="../uic/AboutDialogUI.py" line="77"/>
-        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
+        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/src/translations/tonino_fr.ts b/src/translations/tonino_fr.ts
@@ -74,7 +74,7 @@
     </message>
     <message encoding="UTF-8">
         <location filename="../uic/AboutDialogUI.py" line="77"/>
-        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
+        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/src/translations/tonino_it.ts b/src/translations/tonino_it.ts
@@ -74,7 +74,7 @@
     </message>
     <message encoding="UTF-8">
         <location filename="../uic/AboutDialogUI.py" line="77"/>
-        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
+        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/src/translations/tonino_nl.ts b/src/translations/tonino_nl.ts
@@ -74,7 +74,7 @@
     </message>
     <message encoding="UTF-8">
         <location filename="../uic/AboutDialogUI.py" line="77"/>
-        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
+        <source>Copyright © 2017 Marko Luther, Paul Holleis</source>
         <translation type="unfinished"></translation>
     </message>
 </context>