Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b9911511248b226788a0a971b6a9b7d7cced88d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b9911511248b226788a0a971b6a9b7d7cced88d)
  • Date: Mon, 24 Nov 2008 11:44:21 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 1 +
FUNCTIONS | 10 +++++++++-
database/openrpt/BUILD | 6 +-----
database/openrpt/DETAILS | 5 ++---
database/openrpt/HISTORY | 5 +++++
database/openrpt/PRE_BUILD | 12 ------------
6 files changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 8b9911511248b226788a0a971b6a9b7d7cced88d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - qt4_build -> qt4_cmake_build

commit 6f79bf26d17e467af61a6bec9b9acc7dc46c36e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"openrpt-3.0.0Beta"

diff --git a/ChangeLog b/ChangeLog
index f7e2b34..b79d41c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: rename qt4_build qt4_cmake_build
add a more appropriate qt4_build
+ add missing make

2008-11-22 George Sherwood <gsherwood AT sourcemage.org>
* wm-addons/alltray: new spell, application dock
diff --git a/FUNCTIONS b/FUNCTIONS
index 8ed8e1e..fddef66 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -529,13 +529,21 @@ cmake_build() {
make
}

-qt4_build() {
+qt4_cmake_build() {
[[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
PATH="$QTDIR/bin/qt4:$PATH"
cmake_build
}

+qt4_build() {
+ [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+ PATH="$QTDIR/bin/qt4:$PATH"
+ qmake &&
+ make
+}
+
# check whether the QT provider is qt4
function check_if_qt4_provider()
{
diff --git a/database/openrpt/BUILD b/database/openrpt/BUILD
index 2b7fd4a..eec3de4 100755
--- a/database/openrpt/BUILD
+++ b/database/openrpt/BUILD
@@ -1,5 +1 @@
-PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH &&
-qmake &&
-make_single &&
-make
-
+qt4_build
diff --git a/database/openrpt/DETAILS b/database/openrpt/DETAILS
index 20bca73..37b437a 100755
--- a/database/openrpt/DETAILS
+++ b/database/openrpt/DETAILS
@@ -1,7 +1,6 @@
SPELL=openrpt
- VERSION=2.3.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ddf91257eb2924f1e8b94134f62aeedac94690f4e0f8a86f5d539cd70f4cb0803fcc98641156738ce97d8ee786601bcc93756fd37abd855cf5f88b78e3a8a5a9
+ VERSION=3.0.0Beta
+
SOURCE_HASH=sha512:f4c79fb61f424a3207caf42f5b4a5f68465884ad357189c6950517f573d7ed377847372a18fc2964857ee51b0a4d1f8ef5b4ebaccf658be3ee5fe26aaf15ca5f
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-source
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/database/openrpt/HISTORY b/database/openrpt/HISTORY
index 0688221..c7cb858 100644
--- a/database/openrpt/HISTORY
+++ b/database/openrpt/HISTORY
@@ -1,3 +1,8 @@
+2008-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0Beta
+ * BUILD: use qt4_build
+ * PRE_BUILD: deleted
+
2008-06-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
LICENSE=LGPL
diff --git a/database/openrpt/PRE_BUILD b/database/openrpt/PRE_BUILD
deleted file mode 100755
index de75aa7..0000000
--- a/database/openrpt/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# use dynamic libraries
-sed -i -e "s/staticlib//" common/common.pro OpenRPT/renderer/renderer.pro \
- OpenRPT/wrtembed/wrtembed.pro &&
-# fix for missing library during link
-sed -i -e "/^TEMPLATE/ a\
-LIBS += -L../../lib -lcommon
-" OpenRPT/renderer/renderer.pro &&
-sed -i -e "/^TEMPLATE/ a\
-LIBS += -L../../lib -lcommon -lrenderer
-" OpenRPT/wrtembed/wrtembed.pro



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b9911511248b226788a0a971b6a9b7d7cced88d), Treeve Jelbert, 11/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page