Changeset 671 for CMT/v1r25-branch/mgr/CMT.pacman

Timestamp:

Feb 4, 2014, 4:11:10 PM (10 years ago)

Author:

rybkin

Message:

merge -r 668:670 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• mgr/CMT.pacman (modified) (3 diffs)

CMT/v1r25-branch/mgr/CMT.pacman

@@ -2 +2 @@
 # Copyright Christian Arnault LAL-Orsay CNRS
 # arnault@lal.in2p3.fr
+# Modified by Grigory Rybkin
 # See the complete license in cmt_license.txt "http://www.cecill.info". 
 #-----------------------------------------------------------
@@ -12 +13 @@
 
 {
-    platformGE ('Linux') ; downloadUntar ('http://www.cmtsite.org/<version>/CMT<version>Linux-i686.tar.gz', 'CMTBASE')
+    platformGE ('Linux') ; downloadUntar ('http://www.cmtsite.net/<version>/CMT<version>Linux-i686.tar.gz', 'CMTBASE')
   OR 
-    platformGE ('Cygwin') ; downloadUntar ('http://www.cmtsite.org/<version>/CMT<version>CYGWIN_NT-5.1-i686', 'CMTBASE')
-  OR
-    downloadUntar ('http://www.cmtsite.org/<version>/CMT<version>.tar.gz', 'CMTBASE')
+    platformGE ('darwin') ; processor ('i386') ; downloadUntar ('http://www.cmtsite.net/<version>/CMT<version>Darwin-i386.tar.gz', 'CMTBASE')
+  OR 
+    platformGE ('darwin') ; processor ('x86_64') ; downloadUntar ('http://www.cmtsite.net/<version>/CMT<version>Darwin-i386.tar.gz', 'CMTBASE')
+#  OR 
+#    platformGE ('darwin') ; processor ('Power Macintosh') ; downloadUntar ('http://www.cmtsite.net/<version>/CMT<version>Darwin-PowerMacintosh.tar.gz', 'CMTBASE')
+  OR 
+    downloadUntar ('http://www.cmtsite.net/<version>/CMT<version>.tar.gz', 'CMTBASE')
 }
 
@@ -22 +27 @@
 shellOutputContains ('./INSTALL', 'CMT installation terminated')
 {
-  shellOutputContains ('. setup.sh; cmt version', '<version>') 
-    OR shell ('. setup.sh; gmake') 
+  shellOutputContains ('. ./setup.sh; cmt version', '<version>') 
+    OR shell ('. ./setup.sh; make') 
 }
-shellOutputContains ('. setup.sh; cmt version', '<version>')
+shellOutputContains ('. ./setup.sh; cmt version', '<version>')
 cd ()
-