[Lunar-commits] r24618 - in moonbase/trunk: devel/scons utils/nonpareil

[Terry Chan]

Author: tchan
Date: 2007-05-29 22:31:30 +0200 (Tue, 29 May 2007)
New Revision: 24618

Modified:
   moonbase/trunk/devel/scons/DETAILS
   moonbase/trunk/utils/nonpareil/BUILD
   moonbase/trunk/utils/nonpareil/DEPENDS
Log:
Fixed the nonpareil module to no longer use the installed version of scons. This
allows scons in moonbase to be any version. Removed the Warning message about
version bumping scons in moonbase.


Modified: moonbase/trunk/devel/scons/DETAILS
===================================================================
--- moonbase/trunk/devel/scons/DETAILS	2007-05-29 20:30:32 UTC (rev 24617)
+++ moonbase/trunk/devel/scons/DETAILS	2007-05-29 20:31:30 UTC (rev 24618)
@@ -1,5 +1,3 @@
-# WARNING: Do NOT upgrade this past 0.96.92 UNLESS you test modules in moonbase
-# that actually use scons. nonpareil does NOT compile with scons-0.96.93 or greater.
           MODULE=scons
          VERSION=0.97
           SOURCE=$MODULE-$VERSION.tar.gz

Modified: moonbase/trunk/utils/nonpareil/BUILD
===================================================================
--- moonbase/trunk/utils/nonpareil/BUILD	2007-05-29 20:30:32 UTC (rev 24617)
+++ moonbase/trunk/utils/nonpareil/BUILD	2007-05-29 20:31:30 UTC (rev 24618)
@@ -1,8 +1,9 @@
 (
   
-  scons prefix=/usr debug=no &&
+  cd scons-local && tar xf scons-local-0.96.90.tar.gz && cd .. &&
+  scons-local/scons.py prefix=/usr debug=no &&
   prepare_install &&
-  scons install prefix=/usr &&
+  scons-local/scons.py  install prefix=/usr &&
   gather_docs DEBUGGING TODO
 
 ) >$C_FIFO 2>&1

Modified: moonbase/trunk/utils/nonpareil/DEPENDS
===================================================================
--- moonbase/trunk/utils/nonpareil/DEPENDS	2007-05-29 20:30:32 UTC (rev 24617)
+++ moonbase/trunk/utils/nonpareil/DEPENDS	2007-05-29 20:31:30 UTC (rev 24618)
@@ -5,5 +5,4 @@
 depends  SDL_mixer &&
 depends  flex &&
 depends  bison &&
-depends  netpbm &&
-depends  scons
+depends  netpbm