branches/work/kst/2.0.0-beta3/kst

SVN commit 1030093 by netterfield:

Fix build system to allow simultaneous installation
of kst 1 and kst2.
  -proper use of library versioning
  -rename the kst 2 binary to 'kst2'



 M  +1 -1      datasourceplugin.pri  
 M  +1 -1      run-kst  
 M  +1 -1      src/kst/kst.pro  
 M  +14 -14    src/widgets/widgets.pro  


--- branches/work/kst/2.0.0-beta3/kst/datasourceplugin.pri #1030092:1030093
@@ -13,6 +13,6 @@
 
 INCLUDEPATH += \
     tmp \
-    $$TOPLEVELDIR/src/libkst \
+    $$TOPLEVELDIR/src/libkst
 
 LIBS += -L$$OUTPUT_DIR/lib -lkst
--- branches/work/kst/2.0.0-beta3/kst/run-kst #1030092:1030093
@@ -5,4 +5,4 @@
 export SCRIPTDIR=$PWD
 export BUILDDIR=$PWD/build
 
-$BUILDDIR/bin/kst "$@"
+$BUILDDIR/bin/kst2 "$@"
--- branches/work/kst/2.0.0-beta3/kst/src/kst/kst.pro #1030092:1030093
@@ -1,7 +1,7 @@
 include($$PWD/../../kst.pri)
 
 TEMPLATE = app
-TARGET = kst
+TARGET = kst2
 DESTDIR = $$OUTPUT_DIR/bin
 
 ! isEmpty(INSTALL_PREFIX) {
--- branches/work/kst/2.0.0-beta3/kst/src/widgets/widgets.pro #1030092:1030093
@@ -3,27 +3,27 @@
 QT += gui
 
 TEMPLATE = lib
-CONFIG += designer plugin
+CONFIG += designer
 TARGET = kstwidgets
+DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
-
-! isEmpty(INSTALL_PREFIX) {
-  target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR/kst
-  INSTALLS += target
+!isEmpty(INSTALL_PREFIX) {
+    target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
+    INSTALLS += target
 }
-
-
-DESTDIR = $$OUTPUT_DIR/plugin
-
-INCLUDEPATH += \
-    tmp \
+INCLUDEPATH += tmp \
     $$TOPLEVELDIR/src/libkst \
     $$TOPLEVELDIR/src/libkstmath \
     $$OUTPUT_DIR/src/widgets/tmp
+win32:LIBS += -L$$OUTPUT_DIR/lib \
+    -L$$OUTPUT_DIR/plugin \
+    -lkstmath \
+    -lkst
+!win32:LIBS += -L$$OUTPUT_DIR/lib \
+    -L$$OUTPUT_DIR/plugin \
+    -lkst \
+    -lkstmath
 
-win32:LIBS += -L$$OUTPUT_DIR/lib -lkstmath -lkst
-!win32:LIBS += -L$$OUTPUT_DIR/lib -lkst -lkstmath
-
 SOURCES += \
     colorbutton.cpp \
     colorpalette.cpp \
_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

> SVN commit 1030093 by netterfield:
>
> Fix build system to allow simultaneous installation
> of kst 1 and kst2.
>   -proper use of library versioning
>   -rename the kst 2 binary to 'kst2'

Is this (rename to kst2) what we want?  Although it's really nice to
have both versions simultaneously installed, it makes me worry that the
"kst2" name will stick forever which doesn't seem right.  

--
"If you have only seen it once, then you haven't seen it twice."
--------------------------
Matthew Truch
Department of Physics and Astronomy
University of Pennsylvania
matt@...
http://matt.truch.net/


_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

I think it is fine and required for the beta, since basically everyone will
have both 1.x and 2.0beta installed.

Longer term, its hard to say.  While kst2 is not as cool (ie, short) a name as
kst, basically any script that uses 'kst' will break using kst2.  The command
line has changed.  The input files have changed... So renaming kst2 is
probably not such a bad idea.

I think some distributions that want to install both a qt3 and qt4 version
will give them different names eg app-qt3 and app-qt4, and then use
/etc/alternatives links to choose which one is the default, which you get when
running 'app'.  But I think this magic is done by the distribution.

Boh?
cbn

On Thursday 01 October 2009 12:02:31 Matthew D Truch wrote:

> > SVN commit 1030093 by netterfield:
> >
> > Fix build system to allow simultaneous installation
> > of kst 1 and kst2.
> >   -proper use of library versioning
> >   -rename the kst 2 binary to 'kst2'
>
> Is this (rename to kst2) what we want?  Although it's really nice to
> have both versions simultaneously installed, it makes me worry that the
> "kst2" name will stick forever which doesn't seem right.
>

_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

On Thu, Oct 01, 2009 at 12:58:03PM -0400, Barth Netterfield wrote:

> I think it is fine and required for the beta, since basically everyone will
> have both 1.x and 2.0beta installed.
>
> Longer term, its hard to say.  While kst2 is not as cool (ie, short) a name as
> kst, basically any script that uses 'kst' will break using kst2.  The command
> line has changed.  The input files have changed... So renaming kst2 is
> probably not such a bad idea.
>
> I think some distributions that want to install both a qt3 and qt4 version
> will give them different names eg app-qt3 and app-qt4, and then use
> /etc/alternatives links to choose which one is the default, which you get when
> running 'app'.  But I think this magic is done by the distribution.
>
> Boh?

Well, I was slightly playing devil's advocate, and yes, in the end,
distributions leave this up to the distribution (if that makes sense).
As I am one of the distributions, may I request that the build system be
made to easily allow a name change from kst (or kst2) to whatever with a
command line switch?  

--
"One in every seven days is a Thursday."
--------------------------
Matthew Truch
Department of Physics and Astronomy
University of Pennsylvania
matt@...
http://matt.truch.net/


_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

Its set by the line
TARGET = kst2
in src/kst/kst.pro

Its also used by 'run-kst'.

So... it somehow has to be changed in two places.  Can we do this by hand for
now, and think of better magic later?

cbn


On Thursday 01 October 2009 14:15:55 Matthew D Truch wrote:

> On Thu, Oct 01, 2009 at 12:58:03PM -0400, Barth Netterfield wrote:
> > I think it is fine and required for the beta, since basically everyone
> > will have both 1.x and 2.0beta installed.
> >
> > Longer term, its hard to say.  While kst2 is not as cool (ie, short) a
> > name as kst, basically any script that uses 'kst' will break using kst2.
> > The command line has changed.  The input files have changed... So
> > renaming kst2 is probably not such a bad idea.
> >
> > I think some distributions that want to install both a qt3 and qt4
> > version will give them different names eg app-qt3 and app-qt4, and then
> > use /etc/alternatives links to choose which one is the default, which you
> > get when running 'app'.  But I think this magic is done by the
> > distribution.
> >
> > Boh?
>
> Well, I was slightly playing devil's advocate, and yes, in the end,
> distributions leave this up to the distribution (if that makes sense).
> As I am one of the distributions, may I request that the build system be
> made to easily allow a name change from kst (or kst2) to whatever with a
> command line switch?
>

_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

> Its set by the line
> TARGET = kst2
> in src/kst/kst.pro
>
> Its also used by 'run-kst'.
>
> So... it somehow has to be changed in two places.  Can we do this by hand for
> now, and think of better magic later?

Sounds cool to me.

--
"Things are more like they are today than they ever have been before."
--------------------------
Matthew Truch
Department of Physics and Astronomy
University of Pennsylvania
matt@...
http://matt.truch.net/


_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst

On Thu, Oct 01, 2009 at 02:42:58PM -0400, Matthew D Truch wrote:

> > Its set by the line
> > TARGET = kst2
> > in src/kst/kst.pro
> >
> > Its also used by 'run-kst'.
> >
> > So... it somehow has to be changed in two places.  Can we do this by hand for
> > now, and think of better magic later?
>
> Sounds cool to me.

Since I can't let an opportunity to awk pass me by, replacing the last line
of 'run-kst' with:

$BUILDDIR/bin/`awk 'BEGIN {FS="=\\\W*"} /^TARGET/ {print $2}' src/kst/kst.pro` "$@"

might be sufficiently magical.  However, is run-kst meant to be installed?  If
not, does it matter that a distro package maintainer changing TARGET would break
'run-kst'?  Is run-kst used during package build/install?

Cheers,
-dvw
--
Don Wiebe                                   dvw@...
Department of Physics and Astronomy
University of British Columbia
6224 Agricultural Road                      Tele: [phone]
University Endowment Lands, BC
Canada   V6T 1Z1                            http://ketiltrout.net/


_______________________________________________
Kst mailing list
Kst@...
https://mail.kde.org/mailman/listinfo/kst