Changeset 13fded3 in mainline

Timestamp:

2006-01-15T14:23:57Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c0d692

Parents:

214e89e3

Message:

allow setting ARCH from Makefile argument

Files:

• Makefile (modified) (1 diff)
• tools/config.py (modified) (3 diffs)

Makefile

@@ -153 +153 @@
 
 all:
-        tools/config.py default
+        tools/config.py default $(ARCH)
         $(MAKE) -C . build
 

tools/config.py

@@ -418 +418 @@
 
     outf.write('\n')
-    outf.write('REVISION=%s\n' % commands.getoutput('svnversion . 2> /dev/null'))
-    outf.write('TIMESTAMP=%s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"'))
+    outf.write('REVISION = %s\n' % commands.getoutput('svnversion . 2> /dev/null'))
+    outf.write('TIMESTAMP = %s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"'))
     outf.close()
     f.close()
@@ -431 +431 @@
         dlg = NoDialog()
 
-    if len(sys.argv) == 2 and sys.argv[1]=='default':
+    if len(sys.argv) >= 2 and sys.argv[1]=='default':
         defmode = True
     else:
@@ -440 +440 @@
     if os.path.exists(OUTPUT):
         read_defaults(OUTPUT, defaults)
+
+        # Get ARCH from command line if specified       
+    if len(sys.argv) >= 3:
+        defaults['ARCH'] = sys.argv[2]
 
     # Dry run only with defaults