Commit 864846286b9bcce0fa62938ba8f65b548fc9303f
2012-09-15T20:50:01
a new deb version with the tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
diff --git a/.gitignore b/.gitignore
index ce616e4..818561f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
*.cpp~
+build/
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f250fe..44d9884 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,13 @@ ENDIF(DOXYGEN_FOUND)
SUBDIRS(src)
-OPTION(BUILD_TESTS "Build Unit Tests" ON)
-IF(BUILD_TESTS)
- SUBDIRS(test)
-ENDIF(BUILD_TESTS)
+FIND_PACKAGE(CxxTest)
+IF(CxxTest_FOUND)
+ OPTION(BUILD_TESTS "Build Unit Tests" ON)
+ IF(BUILD_TESTS)
+ SUBDIRS(test)
+ ENDIF(BUILD_TESTS)
+ENDIF(CxxTest_FOUND)
IF(NOT DEFINED FTGL_CMAKE_FINDER_INSTALL_DIR)
SET(FTGL_CMAKE_FINDER_INSTALL_DIR "share/cmake-2.8/Modules")
diff --git a/debian/changelog b/debian/changelog
index 3ed18aa..146f4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,34 @@
-ftgl (2.1.3~rc5-6polyextr~oneiric) oneiric; urgency=low
+ftgl (2.1.3~rc5-8polyextr~precise) precise; urgency=low
+
+ * not building the tests if cxxtest not found
+
+ -- Richard Ulrich <richi@paraeasy.ch> Thu, 13 Sep 2012 22:41:38 +0200
+
+ftgl (2.1.3~rc5-7polyextr~precise) precise; urgency=low
+
+ * added some tests
+
+ -- Richard Ulrich <richi@paraeasy.ch> Fri, 14 Sep 2012 00:15:42 +0200
+
+ftgl (2.1.3~rc5-6polyextr~precise) precise; urgency=low
* Fixed a bug with spaces in the text as reported on http://blog.ulrichard.ch/?p=64
-- Richard Ulrich <richi@paraeasy.ch> Thu, 26 Jan 2012 21:19:02 +0000
-ftgl (2.1.3~rc5-5polyextr~oneiric) oneiric; urgency=low
+ftgl (2.1.3~rc5-5polyextr~precise) precise; urgency=low
* Added build dependency for cmake
-- Richard Ulrich <richi@paraeasy.ch> Wed, 09 Nov 2011 22:09:02 +0000
-ftgl (2.1.3~rc5-4polyextr~oneiric) oneiric; urgency=low
+ftgl (2.1.3~rc5-4polyextr~precise) precise; urgency=low
* Changes for polygon extraction
-- Richard Ulrich <richi@paraeasy.ch> Wed, 09 Nov 2011 22:09:02 +0000
-ftgl (2.1.3~rc5-3ubuntu1) oneiric; urgency=low
+ftgl (2.1.3~rc5-3ubuntu1) precise; urgency=low
* Build-depend on doxygen-latex. Closes: #616215. LP: #749191.
diff --git a/ppa_upload.sh b/ppa_upload.sh
index dc4a1b2..ceef4ff 100755
--- a/ppa_upload.sh
+++ b/ppa_upload.sh
@@ -1,17 +1,11 @@
#!/bin/sh
# build a debian sourcepackage and upload it to the launchpad ppa
-export GPGKEY=DA94BB53
-export DEBEMAIL="richi@paraeasy.ch"
-export DEBFULLNAME="Richard Ulrich"
-rm -r builddeb
-mkdir builddeb
-cd builddeb
for DISTRIBUTION in precise # oneiric natty maverick
do
- FTGLVERSIONSTR=2.1.3~rc5-6polyextr~${DISTRIBUTION}
+ FTGLVERSIONSTR=2.1.3~rc5-8polyextr~${DISTRIBUTION}
sed -i -e "s/maverick/${DISTRIBUTION}/g" -e "s/natty/${DISTRIBUTION}/g" -e "s/oneiric/${DISTRIBUTION}/g" -e "s/precise/${DISTRIBUTION}/g" debian/changelog
# rm -rf debian/source
- dpkg-buildpackage -rfakeroot -S
+ dpkg-buildpackage -rfakeroot -k${GPGKEY} -S
dput ppa:richi-paraeasy/ppa ../ftgl_${FTGLVERSIONSTR}_source.changes
done