Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e67cd5eaf026d824862bcb5345f0852cb9066485)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e67cd5eaf026d824862bcb5345f0852cb9066485)
  • Date: Thu, 29 Jan 2015 19:24:30 -0600

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

ChangeLog | 4 ++++
libs/ixion/DEPENDS | 6 ++++++
libs/ixion/DETAILS | 17 +++++++++++++++++
libs/ixion/HISTORY | 3 +++
libs/ixion/PREPARE | 2 ++
libs/ixion/PRE_BUILD | 8 ++++++++
libs/orcus/DEPENDS | 6 ++++++
libs/orcus/DETAILS | 17 +++++++++++++++++
libs/orcus/HISTORY | 3 +++
libs/orcus/PREPARE | 2 ++
libs/orcus/PRE_BUILD | 8 ++++++++
science-libs/mdds/DEPENDS | 13 ++++++++++++-
science-libs/mdds/DETAILS | 10 ++++++++++
science-libs/mdds/HISTORY | 4 +++-
science-libs/mdds/PREPARE | 2 ++
science-libs/mdds/PRE_BUILD | 5 +++++
science-libs/mdds/PRE_SUB_DEPENDS | 5 +++++
science-libs/mdds/REPAIR^all^PRE_SUB_DEPENDS | 11 +++++++++++
science-libs/mdds/SUB_DEPENDS | 11 +++++++++++
19 files changed, 135 insertions(+), 2 deletions(-)

New commits:
commit e67cd5eaf026d824862bcb5345f0852cb9066485
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/orcus: new spell, an import filter library for ODS, XLSX and CSV
filters

commit 96b3686d6cb78365972f6b7ae36485c7102c1bf9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/ixion: new spell, a general purpose formula parser and interpreter

commit 4b0a19868e173edf05bcaa0e34f13d001ef18868
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

science-libs/mdds: added scm branch and its sub_dependency

diff --git a/ChangeLog b/ChangeLog
index 77bb782..7702e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-01-29 Pavel Vinogradov <public AT sourcemage.org>
* science-libs/mdds: new spell, multi-dimensional data index algorithm
+ * libs/ixion: new spell, a general purpose formula parser and
+ interpreter
+ * libs/orcus: new spell, an import filter library for ODS, XLSX and
+ CSV filters

2015-01-27 Ladislav Hagara <hgr AT vabo.cz>
* gnu.gpg: added key 5D1B36D7, Andreas Gruenbacher <agruen AT gnu.org>
diff --git a/libs/ixion/DEPENDS b/libs/ixion/DEPENDS
new file mode 100755
index 0000000..6df17b7
--- /dev/null
+++ b/libs/ixion/DEPENDS
@@ -0,0 +1,6 @@
+depends autoconf &&
+depends automake &&
+depends -sub "PROGRAM_OPTIONS SYSTEM THREAD" boost &&
+depends git &&
+depends libtool &&
+depends -sub "SCM" mdds
diff --git a/libs/ixion/DETAILS b/libs/ixion/DETAILS
new file mode 100755
index 0000000..fe947dd
--- /dev/null
+++ b/libs/ixion/DETAILS
@@ -0,0 +1,17 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=ixion
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ WEB_SITE=http://gitorious.org/ixion
+ ENTERED=20150129
+ LICENSE[0]=MPL
+ KEYWORDS=""
+ SHORT="A general purpose formula parser and interpreter"
+cat << EOF
+Ixion is a general purpose formula parser and interpreter that can calculate
+multiple named targets, or cells.
+EOF
diff --git a/libs/ixion/HISTORY b/libs/ixion/HISTORY
new file mode 100644
index 0000000..3785d08
--- /dev/null
+++ b/libs/ixion/HISTORY
@@ -0,0 +1,3 @@
+2015-01-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD, PREPARE: spell created
+
diff --git a/libs/ixion/PREPARE b/libs/ixion/PREPARE
new file mode 100755
index 0000000..f8b7d7e
--- /dev/null
+++ b/libs/ixion/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/libs/ixion/PRE_BUILD b/libs/ixion/PRE_BUILD
new file mode 100755
index 0000000..ae7c60cd
--- /dev/null
+++ b/libs/ixion/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+rm -rf autom4te*.cache &&
+libtoolize --force --copy &&
+aclocal -I m4 &&
+autoheader &&
+automake -a -c --foreign &&
+autoconf
diff --git a/libs/orcus/DEPENDS b/libs/orcus/DEPENDS
new file mode 100755
index 0000000..a6d88b3
--- /dev/null
+++ b/libs/orcus/DEPENDS
@@ -0,0 +1,6 @@
+depends autoconf &&
+depends automake &&
+depends -sub "PROGRAM_OPTIONS SYSTEM THREAD" boost &&
+depends git &&
+depends libtool &&
+depends mdds
diff --git a/libs/orcus/DETAILS b/libs/orcus/DETAILS
new file mode 100755
index 0000000..39afd8f
--- /dev/null
+++ b/libs/orcus/DETAILS
@@ -0,0 +1,17 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=orcus
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ WEB_SITE=http://gitorious.org/orcus
+ ENTERED=20150128
+ LICENSE[0]=MPL
+ KEYWORDS=""
+ SHORT="Import filter library for ODS, XLSX and CSV filters"
+cat << EOF
+Standalone file import filter library for spreadsheet documents. Currently
+under development are ODS, XLSX and CSV import filters.
+EOF
diff --git a/libs/orcus/HISTORY b/libs/orcus/HISTORY
new file mode 100644
index 0000000..f4f6836
--- /dev/null
+++ b/libs/orcus/HISTORY
@@ -0,0 +1,3 @@
+2015-01-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: spell created
+
diff --git a/libs/orcus/PREPARE b/libs/orcus/PREPARE
new file mode 100755
index 0000000..f8b7d7e
--- /dev/null
+++ b/libs/orcus/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/libs/orcus/PRE_BUILD b/libs/orcus/PRE_BUILD
new file mode 100755
index 0000000..ae7c60cd
--- /dev/null
+++ b/libs/orcus/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+rm -rf autom4te*.cache &&
+libtoolize --force --copy &&
+aclocal -I m4 &&
+autoheader &&
+automake -a -c --foreign &&
+autoconf
diff --git a/science-libs/mdds/DEPENDS b/science-libs/mdds/DEPENDS
index f148724..bd1434b 100755
--- a/science-libs/mdds/DEPENDS
+++ b/science-libs/mdds/DEPENDS
@@ -1 +1,12 @@
-depends -sub CXX gcc
+if [[ $MDDS_BRANCH == scm ]]; then
+ depends autoconf &&
+ depends automake &&
+ depends libtool &&
+ depends git
+fi &&
+depends -sub CXX gcc &&
+
+optional_depends -sub "PROGRAM_OPTIONS SYSTEM THREAD" boost \
+ "--with-hash-container=boost" \
+ "" \
+ "to use Boost hash container"
diff --git a/science-libs/mdds/DETAILS b/science-libs/mdds/DETAILS
index 69dd427..1b0f823 100755
--- a/science-libs/mdds/DETAILS
+++ b/science-libs/mdds/DETAILS
@@ -1,9 +1,19 @@
+. ${GRIMOIRE}/FUNCTIONS &&
SPELL=mdds
+if [[ $MDDS_BRANCH == scm ]]; then
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
+ SOURCE_URL=git_http://code.google.com/p/multidimalgorithm:${SPELL}-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+else
VERSION=0.11.2
SOURCE="${SPELL}_${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kohei.us/files/${SPELL}/src/${SOURCE}

SOURCE_HASH=sha512:b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}_${VERSION}"
+fi
WEB_SITE="http://code.google.com/p/multidimalgorithm";
LICENSE[0]="MIT"
ENTERED=20150129
diff --git a/science-libs/mdds/HISTORY b/science-libs/mdds/HISTORY
index 67326b3..8699635 100644
--- a/science-libs/mdds/HISTORY
+++ b/science-libs/mdds/HISTORY
@@ -1,3 +1,5 @@
2015-01-29 Pavel Vinogradov <public AT sourcemage.org>
- * DEPENDS, DETAILS: spell created
+ * DEPENDS, DETAILS: spell created, added scm branch, added boost
+ * PREPARE, PRE_BUILD: added scm specific code
+ * *SUB_DEPENDS: added scm sub_dependency

diff --git a/science-libs/mdds/PREPARE b/science-libs/mdds/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/science-libs/mdds/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/science-libs/mdds/PRE_BUILD b/science-libs/mdds/PRE_BUILD
new file mode 100755
index 0000000..831647b
--- /dev/null
+++ b/science-libs/mdds/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $MDDS_BRANCH == scm ]]; then
+ autoconf
+fi
diff --git a/science-libs/mdds/PRE_SUB_DEPENDS
b/science-libs/mdds/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..cf7c831
--- /dev/null
+++ b/science-libs/mdds/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+SCM) [[ "$MDDS_BRANCH" != "stable" ]] && return 0 ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/science-libs/mdds/REPAIR^all^PRE_SUB_DEPENDS
b/science-libs/mdds/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..7d5c574
--- /dev/null
+++ b/science-libs/mdds/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ SCM) if [[ "$MDDS_BRANCH" == "stable" ]]; then
+ MDDS_BRANCH="scm" &&
+ persistent_add MDDS_BRANCH &&
+ message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mdds${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}scm${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}branch."
+ fi ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/science-libs/mdds/SUB_DEPENDS b/science-libs/mdds/SUB_DEPENDS
new file mode 100755
index 0000000..7d5c574
--- /dev/null
+++ b/science-libs/mdds/SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ SCM) if [[ "$MDDS_BRANCH" == "stable" ]]; then
+ MDDS_BRANCH="scm" &&
+ persistent_add MDDS_BRANCH &&
+ message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mdds${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}scm${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}branch."
+ fi ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e67cd5eaf026d824862bcb5345f0852cb9066485), Pavel Vinogradov, 01/29/2015

Archive powered by MHonArc 2.6.24.

Top of Page