Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d24a7a239f905e48e105dc0a8c391c22d64130d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d24a7a239f905e48e105dc0a8c391c22d64130d)
  • Date: Mon, 13 Aug 2012 08:51:47 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ruby-raa/passenger/BUILD | 5 ++++-
ruby-raa/passenger/DETAILS | 8 +++++++-
ruby-raa/passenger/HISTORY | 5 +++++
ruby-raa/passenger/INSTALL | 2 ++
ruby-raa/passenger/PREPARE | 1 +
5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 8d24a7a239f905e48e105dc0a8c391c22d64130d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

passenger: => 3.0.15

diff --git a/ruby-raa/passenger/BUILD b/ruby-raa/passenger/BUILD
index 1d1dc92..0350e13 100755
--- a/ruby-raa/passenger/BUILD
+++ b/ruby-raa/passenger/BUILD
@@ -6,6 +6,9 @@ if is_depends_enabled $SPELL nginx; then
rake nginx
fi &&

-rm -rf old.binaries old.libraries &&
+if [[ $PASSENGER_BRANCH == 3 ]]; then
+ rm -rf ext/libev/.libs
+fi &&

+# post-build cleanup
find "$SOURCE_DIRECTORY" -name '*.[a|o]' -delete
diff --git a/ruby-raa/passenger/DETAILS b/ruby-raa/passenger/DETAILS
index d6f84e8..78b525a 100755
--- a/ruby-raa/passenger/DETAILS
+++ b/ruby-raa/passenger/DETAILS
@@ -1,11 +1,17 @@
SPELL=passenger
+if [[ $PASSENGER_BRANCH == 2 ]]; then
VERSION=2.2.15
RAAID=71376
+
SOURCE_HASH=sha512:a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e
+else
+ VERSION=3.0.15
+ RAAID=76337
+
SOURCE_HASH=sha512:44fd8e7a67386143fe3ac6394c81c347cc479fa7519dc4b741adf35f7b7a3c45215d342cce3fbb9b156b4f137ef4e1aa5158d2d6435c7103e27d234c4a6bb4fa
+fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://rubyforge.org/frs/download.php/$RAAID/$SOURCE
WEB_SITE=http://www.modrails.com/
-
SOURCE_HASH=sha512:a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e
LICENSE[0]=GPL
ENTERED=20080628
KEYWORDS="ruby rails apache nginx"
diff --git a/ruby-raa/passenger/HISTORY b/ruby-raa/passenger/HISTORY
index b97296e..4b18292 100644
--- a/ruby-raa/passenger/HISTORY
+++ b/ruby-raa/passenger/HISTORY
@@ -1,3 +1,8 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added branch 3; updated spell to 3.0.15
+ * PREPARE: added, for branch selector; made 2nd branch default
+ * BUILD, INSTALL: corrected post-build cleanup procedure for all
branches
+
2010-09-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.15

diff --git a/ruby-raa/passenger/INSTALL b/ruby-raa/passenger/INSTALL
index c25773e..b214119 100755
--- a/ruby-raa/passenger/INSTALL
+++ b/ruby-raa/passenger/INSTALL
@@ -1,3 +1,5 @@
+rm -rf old.binaries old.libraries &&
+
local INSTALL_DIR="$INSTALL_ROOT/usr/lib/passenger" &&

mkdir -vp "$INSTALL_DIR" &&
diff --git a/ruby-raa/passenger/PREPARE b/ruby-raa/passenger/PREPARE
new file mode 100755
index 0000000..dadcaf9
--- /dev/null
+++ b/ruby-raa/passenger/PREPARE
@@ -0,0 +1 @@
+config_query_list PASSENGER_BRANCH "which branch?" 2 3



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d24a7a239f905e48e105dc0a8c391c22d64130d), Vlad Glagolev, 08/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page