From 3004676bcadb638fff915b7e9ccf342611da0383 Mon Sep 17 00:00:00 2001
From: jared <jared2020@163.com>
Date: Sat, 3 Aug 2019 21:26:38 +0800
Subject: [PATCH] update for bundle

---
 Common/BundleCommon.pri                      | 11 +++++++++++
 examples/TaoEffectPlugin/TaoEffectPlugin.pro |  2 +-
 examples/TaoQuickApp/PluginCommon.pri        |  3 ++-
 examples/TaoQuickApp/TaoQuickApp.pro         |  3 ++-
 examples/TaoQuickPlugin/TaoQuickPlugin.pro   |  4 ++--
 src/TaoQuick/TaoQuick.pro                    | 18 +++++-------------
 6 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 Common/BundleCommon.pri

diff --git a/Common/BundleCommon.pri b/Common/BundleCommon.pri
new file mode 100644
index 0000000..d59e7fa
--- /dev/null
+++ b/Common/BundleCommon.pri
@@ -0,0 +1,11 @@
+isEmpty(TaoBundlePri) {
+    TaoBundlePri=1
+    BundlePath=
+    macos{
+        CONFIG(debug, debug|release){
+              CONFIG -=app_bundle
+        } else {
+              BundlePath=TaoQuickApp.app/Contents/MacOS/
+        }
+    }
+}
diff --git a/examples/TaoEffectPlugin/TaoEffectPlugin.pro b/examples/TaoEffectPlugin/TaoEffectPlugin.pro
index a64ae55..1a3d6c1 100644
--- a/examples/TaoEffectPlugin/TaoEffectPlugin.pro
+++ b/examples/TaoEffectPlugin/TaoEffectPlugin.pro
@@ -21,7 +21,7 @@ RESOURCES += \
 CONFIG(debug, debug|release){
     tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/TaoPlugin)
 } else {
-    tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/TaoPlugin)
+    tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin)
 }
 win32 {
     tgt ~= s,/,\\\\,g
diff --git a/examples/TaoQuickApp/PluginCommon.pri b/examples/TaoQuickApp/PluginCommon.pri
index dc29d34..4643894 100644
--- a/examples/TaoQuickApp/PluginCommon.pri
+++ b/examples/TaoQuickApp/PluginCommon.pri
@@ -1,3 +1,4 @@
 HEADERS += $$PWD/Src/ITaoQuickPlugin.h
 INCLUDEPATH +=$$PWD/Src
-include($$PWD/../../common/TaoVersion.pri)
\ No newline at end of file
+include($$PWD/../../common/TaoVersion.pri)
+include($$PWD/../../common/BundleCommon.pri)
diff --git a/examples/TaoQuickApp/TaoQuickApp.pro b/examples/TaoQuickApp/TaoQuickApp.pro
index f25f28e..7822375 100644
--- a/examples/TaoQuickApp/TaoQuickApp.pro
+++ b/examples/TaoQuickApp/TaoQuickApp.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = TaoQuickDemo
+TARGET = TaoQuickApp
 QT += qml quick
 CONFIG += plugin c++14 qtquickcompiler
 
@@ -21,6 +21,7 @@ win32 {
 macos {
     ICON = milk.icns
 }
+
 CONFIG(debug,debug|release){
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/)
     MOC_DIR = build/debug/moc
diff --git a/examples/TaoQuickPlugin/TaoQuickPlugin.pro b/examples/TaoQuickPlugin/TaoQuickPlugin.pro
index 1841239..a379f72 100644
--- a/examples/TaoQuickPlugin/TaoQuickPlugin.pro
+++ b/examples/TaoQuickPlugin/TaoQuickPlugin.pro
@@ -1,6 +1,6 @@
 QT  += core gui qml
 
-TARGET = $$qtLibraryTarget(TaoQuick)
+TARGET = $$qtLibraryTarget(TaoQuickPlugin)
 TEMPLATE = lib
 CONFIG += plugin
 msvc {
@@ -21,7 +21,7 @@ RESOURCES += \
 CONFIG(debug, debug|release){
     tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/TaoPlugin)
 } else {
-    tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/TaoPlugin)
+    tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin)
 }
 win32 {
     tgt ~= s,/,\\\\,g
diff --git a/src/TaoQuick/TaoQuick.pro b/src/TaoQuick/TaoQuick.pro
index 700c7a9..4933884 100644
--- a/src/TaoQuick/TaoQuick.pro
+++ b/src/TaoQuick/TaoQuick.pro
@@ -6,14 +6,10 @@ QT += qml quick
 CONFIG += plugin c++11 qtquickcompiler
 uri = TaoQuick
 
-BundlePath=
-macos{
-    CONFIG(debug, debug|release){
-          CONFIG -=app_bundle
-    } else {
-          BundlePath=TaoQuickDemo.app/Contents/MacOS/
-    }
-}
+include(../../common/TaoVersion.pri)
+include(../../common/BundleCommon.pri)
+include(Qml/TaoQuickDesigner.pri)
+include(TaoQuick.pri)
 
 CONFIG(debug, debug|release){
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/$${BundlePath}$${uri})
@@ -21,11 +17,7 @@ CONFIG(debug, debug|release){
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}$${uri})
 }
 
-include(../../common/TaoVersion.pri)
-include(Qml/TaoQuickDesigner.pri)
-include(TaoQuick.pri)
-
-build_pass:!equals(_PRO_FILE_PWD_, $$DESTDIR) {
+!equals(_PRO_FILE_PWD_, $$DESTDIR) {
     copy_qmldir.target = $$DESTDIR/qmldir
     copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
     win32 {