From d90f20d07b2df1647b29a199d4d8e472924c9ae6 Mon Sep 17 00:00:00 2001 From: myTonino Date: Sat, 8 Apr 2017 20:59:43 +0200 Subject: [PATCH] fixes build issues --- src/setup-mac2.py | 8 +++---- src/setup-mac35.py | 43 +++++++++++++++++++++++++++++++++++ src/translations/tonino_de.ts | 2 +- src/translations/tonino_es.ts | 2 +- src/translations/tonino_fr.ts | 2 +- src/translations/tonino_it.ts | 2 +- src/translations/tonino_nl.ts | 2 +- 7 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/setup-mac2.py b/src/setup-mac2.py index a99f76a..63469d6 100755 --- 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 index 84fb4f2..cf349bc 100755 --- 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 index 0eee0df..62865e1 100755 --- a/src/translations/tonino_de.ts +++ b/src/translations/tonino_de.ts @@ -74,7 +74,7 @@ - Copyright © 2017 Marko Luther, Paul Holleis + Copyright © 2017 Marko Luther, Paul Holleis diff --git a/src/translations/tonino_es.ts b/src/translations/tonino_es.ts index ff221b3..886b3cd 100755 --- a/src/translations/tonino_es.ts +++ b/src/translations/tonino_es.ts @@ -74,7 +74,7 @@ - Copyright © 2017 Marko Luther, Paul Holleis + Copyright © 2017 Marko Luther, Paul Holleis diff --git a/src/translations/tonino_fr.ts b/src/translations/tonino_fr.ts index 35103b6..52a4803 100755 --- a/src/translations/tonino_fr.ts +++ b/src/translations/tonino_fr.ts @@ -74,7 +74,7 @@ - Copyright © 2017 Marko Luther, Paul Holleis + Copyright © 2017 Marko Luther, Paul Holleis diff --git a/src/translations/tonino_it.ts b/src/translations/tonino_it.ts index 964677d..8647617 100755 --- a/src/translations/tonino_it.ts +++ b/src/translations/tonino_it.ts @@ -74,7 +74,7 @@ - Copyright © 2017 Marko Luther, Paul Holleis + Copyright © 2017 Marko Luther, Paul Holleis diff --git a/src/translations/tonino_nl.ts b/src/translations/tonino_nl.ts index 8ce0b8e..3254ca2 100755 --- a/src/translations/tonino_nl.ts +++ b/src/translations/tonino_nl.ts @@ -74,7 +74,7 @@ - Copyright © 2017 Marko Luther, Paul Holleis + Copyright © 2017 Marko Luther, Paul Holleis