[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1199796 by kuemmel:

OSX: 
- build libs as framework, then we could use macdeployqt
- add deploy script (asciidata plugin only atm)

 M  +8 -1      datasourceplugin.pri  
 M  +4 -2      kst.pro  
 AM            misc/macdeploykst  
 M  +8 -1      src/kst/kst.pro  
 M  +1 -0      src/libkst/libkst.pro  
 M  +14 -0     src/libkstapp/libkstapp.pro  
 M  +6 -1      src/libkstmath/libkstmath.pro  
 M  +8 -1      src/widgets/widgets.pro  


--- branches/work/kst/portto4/kst/datasourceplugin.pri #1199795:1199796
@@ -20,8 +20,15 @@
 	      tmp \
 	      $$TOPLEVELDIR/src/libkst 
 
-LIBS += -L$$OUTPUT_DIR/lib -l$$kstlib(kst2lib)
 
+macx {
+	LIBS += -F$$OUTPUT_DIR/lib
+	qtAddLibrary(kst2lib)
+ } else {
+	LIBS += \
+		-L$$OUTPUT_DIR/lib \
+		-l$$kstlib(kst2lib)
+}
 
 LibExists(cfitsio) {
     win32 {
--- branches/work/kst/portto4/kst/kst.pro #1199795:1199796
@@ -7,9 +7,11 @@
     src/datasources \
     src/widgets \
     src/libkstapp \
-    src/kst \
+    src/kst
+
+!macx:SUBDIRS += \
     src/d2asc \
     src/plugins \
-    tests
+    test
 
 !win32-msvc*:SUBDIRS += tests/dirfile_maker
--- branches/work/kst/portto4/kst/src/kst/kst.pro #1199795:1199796
@@ -19,7 +19,13 @@
     $$TOPLEVELDIR/src/libkstapp \
     $$OUTPUT_DIR/src/kst/tmp
 
-
+macx {
+	LIBS += -F$$OUTPUT_DIR/lib
+	qtAddLibrary(kst2lib)
+	qtAddLibrary(kst2math)
+	qtAddLibrary(kst2widgets)
+	qtAddLibrary(kst2app)
+} else {
 LIBS += \
 		-L$$OUTPUT_DIR/lib \
 		-L$$OUTPUT_DIR/plugin \
@@ -27,6 +33,7 @@
 		-l$$kstlib(kst2widgets) \
 		-l$$kstlib(kst2math) \
 		-l$$kstlib(kst2lib)
+}
 
 
 SOURCES += \
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #1199795:1199796
@@ -7,6 +7,7 @@
 TARGET = $$kstlib(kst2lib)
 DESTDIR = $$OUTPUT_DIR/lib
 
+macx:CONFIG += lib_bundle
 
 !isEmpty(INSTALL_PREFIX) {
     target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #1199795:1199796
@@ -8,21 +8,35 @@
 TARGET = $$kstlib(kst2app)
 DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
+
+
 !isEmpty(INSTALL_PREFIX) { 
     target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
     INSTALLS += target
 }
+
 INCLUDEPATH += tmp \
     $$TOPLEVELDIR/src/libkst \
     $$TOPLEVELDIR/src/libkstmath \
     $$TOPLEVELDIR/src/widgets \
     $$TOPOUTDIR/src/widgets \
     $$TOPOUTDIR/src/libkstapp/tmp
+
+macx {
+	CONFIG += lib_bundle
+	LIBS += -F$$OUTPUT_DIR/lib
+	qtAddLibrary(kst2lib)
+	qtAddLibrary(kst2widgets)
+	qtAddLibrary(kst2math)
+} else {
 LIBS += -L$$OUTPUT_DIR/lib \
     -L$$OUTPUT_DIR/plugin \
     -l$$kstlib(kst2widgets) \
     -l$$kstlib(kst2math) \
     -l$$kstlib(kst2lib)
+}
+
+
 SOURCES += aboutdialog.cpp \
     application.cpp \
     applicationsettings.cpp \
--- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #1199795:1199796
@@ -7,7 +7,6 @@
 TARGET = $$kstlib(kst2math)
 DESTDIR = $$OUTPUT_DIR/lib
 
-
 !isEmpty(INSTALL_PREFIX) {
   target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
   INSTALLS += target
@@ -18,9 +17,15 @@
     $$TOPLEVELDIR/src/libkst \
     $$OUTPUT_DIR/src/libkstmath/tmp
 
+macx {
+	CONFIG += lib_bundle
+	LIBS += -F$$OUTPUT_DIR/lib
+	qtAddLibrary(kst2lib)
+} else {
 LIBS += \
 		-L$$OUTPUT_DIR/lib \
 		-l$$kstlib(kst2lib)
+}
 
 #Don't trigger qmake's lex/yacc handling by default.
 #Rather we want to use the files that are pre-generated and checked in.
--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #1199795:1199796
@@ -11,6 +11,7 @@
 DESTDIR = $$OUTPUT_DIR/lib
 QT += core xml gui
 
+
 !isEmpty(INSTALL_PREFIX) {
     target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
     INSTALLS += target
@@ -20,12 +21,18 @@
     $$TOPLEVELDIR/src/libkstmath \
     $$OUTPUT_DIR/src/widgets/tmp
 
+macx {
+	CONFIX += lib_bundle
+	LIBS += -F$$OUTPUT_DIR/lib
+	qtAddLibrary(kst2lib)
+	qtAddLibrary(kst2math)
+} else {
 LIBS += \
     -L$$OUTPUT_DIR/lib \
     -L$$OUTPUT_DIR/plugin \
     -l$$kstlib(kst2math) \
     -l$$kstlib(kst2lib)
-
+}
 SOURCES += \
     colorbutton.cpp \
     colorpalette.cpp \