Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (97ba6f5e1570f9ad3250d9f2fcfe24c7e77cf6d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (97ba6f5e1570f9ad3250d9f2fcfe24c7e77cf6d3)
  • Date: Wed, 20 Oct 2010 04:47:00 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

php-pear/php-dev/DEPENDS | 2 ++
php-pear/php-dev/DETAILS | 7 ++++---
php-pear/php-dev/HISTORY | 6 ++++++
php-pear/php-dev/PREPARE | 9 +--------
php-pear/php-dev/getSnapshotTime | 34 ----------------------------------
5 files changed, 13 insertions(+), 45 deletions(-)

New commits:
commit 97ba6f5e1570f9ad3250d9f2fcfe24c7e77cf6d3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

php-dev: use svn to get the source

diff --git a/php-pear/php-dev/DEPENDS b/php-pear/php-dev/DEPENDS
index ec4e6a9..137170e 100755
--- a/php-pear/php-dev/DEPENDS
+++ b/php-pear/php-dev/DEPENDS
@@ -1,5 +1,7 @@
source $GRIMOIRE/FUNCTIONS &&

+depends subversion &&
+
depends flex &&
depends readline "--with-readline=/usr" &&

diff --git a/php-pear/php-dev/DETAILS b/php-pear/php-dev/DETAILS
index 72ad93c..39c0bd7 100755
--- a/php-pear/php-dev/DETAILS
+++ b/php-pear/php-dev/DETAILS
@@ -4,11 +4,12 @@ if [ "$PHP_DEV_AUTOUPDATE" == "y" ]; then
else
VERSION=6.0
fi
- SOURCE=php-trunk-${SNAP_VER}.tar.bz2
+ SNAP_VER=svn
+ SOURCE=$SPELL-${SNAP_VER}.tar.bz2
SOURCE_IGNORE=volatile
LICENSE[0]=http://www.php.net/license/3_0.txt
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-trunk-${SNAP_VER}
- SOURCE_URL[0]=http://snaps.php.net/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${SNAP_VER}
+
SOURCE_URL[0]=svn_http://svn.php.net/repository/php/php-src/trunk:$SPELL-${SNAP_VER}
WEB_SITE=http://www.php.net/
ENTERED=20020802
KEYWORDS="php"
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 4a15367..7d42933 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,9 @@
+2010-10-20 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: use svn to get the source
+ * DEPENDS: added subversion since we use svn source
+ * getSnapshotTime: removed, no longer needed
+ * PREPARE: we don't need getSnapshotTime anymore
+
2010-10-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Changed SOURCE to trunk as now listed.

diff --git a/php-pear/php-dev/PREPARE b/php-pear/php-dev/PREPARE
index a542174..f829fdf 100755
--- a/php-pear/php-dev/PREPARE
+++ b/php-pear/php-dev/PREPARE
@@ -1,8 +1 @@
-config_query PHP_DEV_AUTOUPDATE "Updated on every system update?" n &&
-
-#set snapshot to be downloaded depending on time
-. "$SPELL_DIRECTORY/getSnapshotTime" &&
-SNAP_DATE=$(date -u +%Y%m%d) &&
-SNAP_TIME=$(getSnapshotTime) &&
-persistent_add SNAP_VER
-SNAP_VER=${SNAP_DATE}${SNAP_TIME}
+config_query PHP_DEV_AUTOUPDATE "Updated on every system update?" n
diff --git a/php-pear/php-dev/getSnapshotTime
b/php-pear/php-dev/getSnapshotTime
deleted file mode 100644
index ba077b6..0000000
--- a/php-pear/php-dev/getSnapshotTime
+++ /dev/null
@@ -1,34 +0,0 @@
-# php builds snapshots from cvs every two hours on the even half hour
-# 0830, 1030, 1230 ... and makes that part of the name of the filename
-function getSnapshotTime() {
- local hour=$(date -u +%H)
- local minutes=$(date -u +%M)
-
- dec_hour() {
- hour=${hour#0}
- ((hour--))
- if [[ ${#hour} == 1 ]]; then
- hour=0$hour
- fi
- }
-
- if [[ $hour == 00 ]] && (( $minutes < 30)); then
- hour=23
- fi
-
- # wierd return codes, yes
- if (( ${hour#0} % 2 )); then
- # odd hour
- dec_hour
- else
- # even hour
- if (( $minutes < 30 )); then
- dec_hour; dec_hour
- fi
- fi
- echo ${hour}30
-}
-
-# for a good test try the following; first change the header to take
arguments
-#for i in 00 01 09 10 23; do for j in 05 29 30 31; do
-#getSnapshotTime $i $j; echo --------; done; done



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (97ba6f5e1570f9ad3250d9f2fcfe24c7e77cf6d3), Bor Kraljič, 10/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page