[Commits] (heikki) Build changes for OpenSSL and M2Crypto, not yet enabled by default.

[commits at osafoundation.org]

Commit by: heikki
Modified files:
osaf/hardhat/hardhatlib.py 1.70 1.71
osaf/hardhat/wrapper.py 1.6 1.7
osaf/hardhat/buildscripts/chandler.py 1.49 1.50
osaf/chandler/Chandler/__hardhat__.py 1.159 1.160
osaf/chandler/openssl/__hardhat__.py None 1.1
osaf/chandler/m2crypto/__hardhat__.py None 1.1

Log message:
Build changes for OpenSSL and M2Crypto, not yet enabled by default.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/hardhatlib.py.diff?r1=text&tr1=1.70&r2=text&tr2=1.71
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/wrapper.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/buildscripts/chandler.py.diff?r1=text&tr1=1.49&r2=text&tr2=1.50
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/__hardhat__.py.diff?r1=text&tr1=1.159&r2=text&tr2=1.160
http://cvs.osafoundation.org/index.cgi/osaf/chandler/openssl/__hardhat__.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/osaf/chandler/m2crypto/__hardhat__.py?rev=1.1&content-type=text/vnd.viewcvs-markup

Index: osaf/hardhat/hardhatlib.py
diff -u osaf/hardhat/hardhatlib.py:1.70 osaf/hardhat/hardhatlib.py:1.71
--- osaf/hardhat/hardhatlib.py:1.70	Thu Feb 19 14:25:41 2004
+++ osaf/hardhat/hardhatlib.py	Tue Mar  2 15:10:50 2004
@@ -1,5 +1,5 @@
-__version__     = "$Revision: 1.70 $"
-__date__        = "$Date: 2004/02/19 22:25:41 $"
+__version__     = "$Revision: 1.71 $"
+__date__        = "$Date: 2004/03/02 23:10:50 $"
 __copyright__   = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__     = "GPL -- see LICENSE.txt"
 
@@ -48,8 +48,8 @@
             - os: win, posix, unknown
             - path: system executable search path
             - compiler: full path to C compiler (currently windows only)
-            - python: full path to release verion of python we are building
-            - python_d: full path to debug verion of python we are building
+            - python: full path to release version of python we are building
+            - python_d: full path to debug version of python we are building
             - verbose: 0 for quiet, > 0 for messages displayed to stdout
             - log: a time-ordered list of log entries
             - version: 'debug' or 'release'
@@ -118,8 +118,8 @@
     buildenv['gzip'] = findInPath(buildenv['path'], "gzip")
     buildenv['zip']  = findInPath(buildenv['path'], "zip")
     buildenv['cvs']  = findInPath(buildenv['path'], "cvs")
+    #buildenv['perl']  = findInPath(buildenv['path'], "perl")
 
-    
     # set OS-specific variables
     if buildenv['os'] == 'win':
 

Index: osaf/hardhat/wrapper.py
diff -u osaf/hardhat/wrapper.py:1.6 osaf/hardhat/wrapper.py:1.7
--- osaf/hardhat/wrapper.py:1.6	Mon May 19 09:26:43 2003
+++ osaf/hardhat/wrapper.py	Tue Mar  2 15:10:50 2004
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-__version__     = "$Revision: 1.6 $"
-__date__        = "$Date: 2003/05/19 16:26:43 $"
+__version__     = "$Revision: 1.7 $"
+__date__        = "$Date: 2004/03/02 23:10:50 $"
 __copyright__   = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__     = "GPL -- see LICENSE.txt"
 
@@ -39,7 +39,9 @@
     args[:0] = [args[0]]  
 
     # ...but strip out the path of the executable in args[1]
-    args[1] = os.path.basename(args[1]) 
+    if os.path.basename(args[1]) != 'do_masm.bat' and \
+       os.path.basename(args[1]) != 'test.bat': # XXX openssl build hacks
+        args[1] = os.path.basename(args[1]) 
 
     # all args need to be quoted
     args = map(quoteString, args)

Index: osaf/hardhat/buildscripts/chandler.py
diff -u osaf/hardhat/buildscripts/chandler.py:1.49 osaf/hardhat/buildscripts/chandler.py:1.50
--- osaf/hardhat/buildscripts/chandler.py:1.49	Wed Jan 28 14:34:11 2004
+++ osaf/hardhat/buildscripts/chandler.py	Tue Mar  2 15:10:50 2004
@@ -58,6 +58,8 @@
     'osaf/chandler/pyxml',
     'osaf/chandler/SOAPpy',
     'osaf/chandler/epydoc',
+    'osaf/chandler/openssl',
+    'osaf/chandler/m2crypto',    
 )
 
 # If any of these modules have changed, scrub everything before building
@@ -71,6 +73,8 @@
     'osaf/chandler/pyxml':1,
     'osaf/chandler/SOAPpy':1,
     'osaf/chandler/epydoc':1,
+    'osaf/chandler/openssl':1,
+    'osaf/chandler/m2crypto':1,
 }
 
 mainModule = 'osaf/chandler/Chandler'

Index: osaf/chandler/Chandler/__hardhat__.py
diff -u osaf/chandler/Chandler/__hardhat__.py:1.159 osaf/chandler/Chandler/__hardhat__.py:1.160
--- osaf/chandler/Chandler/__hardhat__.py:1.159	Thu Feb 19 14:53:45 2004
+++ osaf/chandler/Chandler/__hardhat__.py	Tue Mar  2 15:10:51 2004
@@ -19,6 +19,7 @@
                 'jabber-py',
                 'SOAPpy',
                 'pychecker',
+                #'m2crypto',
                 'Chandler/repository'
                )