Update plotline.sh to get script directory. Skip test dir for release build. Add lib directory correctly.

Author: Jordan

Plotline.pro

@@ -7,9 +7,10 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS = src \
-    test \
     doc
 
+CONFIG(debug, debug|release): SUBDIRS += test
+
 OTHER_FILES = \
     README.markdown
 

packages/me.rngr.plotline/meta/package.xml

@@ -4,8 +4,8 @@
     <Description>
         Application to create, manage, and publish a novel.
     </Description>
-    <Version>0.0.1</Version>
-    <ReleaseDate>2016-02-23</ReleaseDate>
+    <Version>1.0</Version>
+    <ReleaseDate>2016-03-04</ReleaseDate>
     <Name>me.rngr.plotline</Name>
     <Licenses>
         <License name="GPL v3" file="license.txt" />

plotline.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:src/lib ./src/app/plotline
+# Thanks to https://stackoverflow.com/a/246128
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:src/lib $DIR/src/app/plotline

test/test.pro

@@ -5,4 +5,11 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    unit
+    ./unit
+
+LIBS += -L$$OUT_PWD../../src/lib/libplotline.a
+
+INCLUDEPATH += \
+    $$PWD/../../src/lib
+
+CONFIG += c++11

test/unit/unit.pro

@@ -31,26 +31,17 @@ DISTFILES += \
     fixtures/revision-deserialize.json \
     fixtures/revision-bug-test.json
 
-REQUIRES += \
-    $$PWD/../../src/lib \
-    $$PWD/../../src/app
-
-INCLUDEPATH += \
-    $$OUT_PWD/../../src/lib \
-    $$OUT_PWD/../../src/app
-
 ##
 # Depending on whether we're building the libraries statically or dynamically,
 # Either the .so will be found or the .a will be found.
 # There is probably a more elegant solution.
 ##
 
-exists($$OUT_PWD/../../src/lib/libplotline.a){
-    LIBS += $$OUT_PWD/../../src/lib/libplotline.a
-}
+CONFIG += console testcase c++11
 
-exists($$OUT_PWD/../../src/lib/libplotline.so){
-    LIBS += $$OUT_PWD/../../src/lib/libplotline.so
-}
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../src/lib/release/ -lplotline
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../src/lib/debug/ -lplotline
+else:unix: LIBS += -L$$OUT_PWD/../../src/lib/ -lplotline
 
-CONFIG += console testcase c++11
+INCLUDEPATH += $$PWD/../../src/lib
+DEPENDPATH += $$PWD/../../src/lib