sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dca5166715ce9a42a3ca64b8667944995878b58)
- 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 (8dca5166715ce9a42a3ca64b8667944995878b58)
- Date: Sat, 12 May 2007 06:20:47 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 8 +++++---
FUNCTIONS | 16 ++++++++++++++++
utils/FUNCTIONS | 12 ------------
3 files changed, 21 insertions(+), 15 deletions(-)
New commits:
commit 8dca5166715ce9a42a3ca64b8667944995878b58
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
FUNCTIONS: add cmake and qt4 builds
diff --git a/ChangeLog b/ChangeLog
index 6add5c5..46963ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< HEAD:ChangeLog
+2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: merge some common functions from utls/FUNCTIONS
+ * utls/FUNCTIONS: deleted
+
2007-05-11 Colin "Phoul" Childs <phoul AT sourcemage.org>
* perl-cpan/acme-bleach: Modified DETAILS to include $PERL_CPAN_URL
* perl-cpan/algorithm-annotate: Modified DETAILS to include
$PERL_CPAN_URL
@@ -15,11 +18,10 @@
2007-05-11 Colin Childs <phoul AT sourcemage.org>
*added DEPENDS: xmms2 BOOST to nyello spell.
-=======
+
2007-05-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcompat: added PERL_CPAN_URL fallback as that's not in
stable sorcery yet but spells and quill already use it
->>>>>>> d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f:ChangeLog
2007-05-11 Colin Childs <phoul AT sourcemage.org>
Cleaned up the history & Depends files for
diff --git a/FUNCTIONS b/FUNCTIONS
index 4e203f2..12ad13e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -496,3 +496,19 @@ function waf_build(){
function waf_install(){
./waf install
}
+
+# spells in several sections now need cmake or qt4
+#
+cmake_build() {
+cd $SOURCE_DIRECTORY &&
+mkdir -p build &&
+cd build &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+make
+}
+
+qt4_build() {
+QTDIR=/usr
+PATH=$QTDIR/bin/qt4:$PATH
+cmake_build
+}
diff --git a/utils/FUNCTIONS b/utils/FUNCTIONS
deleted file mode 100755
index 973d328..0000000
--- a/utils/FUNCTIONS
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_build() {
-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
-make
-}
-qt4_build() {
-QTDIR=/usr
-PATH=$QTDIR/bin/qt4:$PATH
-cmake_build
-}
-
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dca5166715ce9a42a3ca64b8667944995878b58),
Treeve Jelbert, 05/12/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dca5166715ce9a42a3ca64b8667944995878b58),
Andraž 'ruskie' Levstik, 05/12/2007
- Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dca5166715ce9a42a3ca64b8667944995878b58), Treeve Jelbert, 05/13/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dca5166715ce9a42a3ca64b8667944995878b58),
Andraž 'ruskie' Levstik, 05/12/2007
Archive powered by MHonArc 2.6.24.