Changeset 700

Timestamp:

08/21/07 08:25:18 (12 months ago)

Author:

daelstorm

Message:

Added stand-alone PyMucipher?; add PYMUCIPHER option to scons; don't generate messages.py from message.py.in (like in the newnet branch); Install mucous, pymuseekd, other python clients without SWIG (since PyCrypto? is an alternative)

Location:

museek+/trunk/sources

Files:

• INSTALL (modified) (1 diff)
• Mucipher/SConscript (modified) (1 diff)
• Muhelp/SConscript (modified) (1 diff)
• Museek/SConscript (modified) (1 diff)
• Museekal/SConscript (modified) (1 diff)
• PyMucipher (added)
• PyMucipher/PKG-INFO (added)
• PyMucipher/aes.c (added)
• PyMucipher/hexdigest.c (added)
• PyMucipher/md5.c (added)
• PyMucipher/mucipher.h (added)
• PyMucipher/mucipher.i (added)
• PyMucipher/mucipher.py (added)
• PyMucipher/setup.py (added)
• PyMucipher/sha.c (added)
• PyMucipher/sha256.c (added)
• PyMucipher/system.h (added)
• PyMucipher/wraphelp.c (added)
• SConstruct (modified) (2 diffs)
• Tools/SConscript (modified) (2 diffs)
• defaults.py (modified) (1 diff)
• mucous/SConscript (modified) (1 diff)
• museeq/SConscript (modified) (1 diff)
• pymuseekd/SConscript (modified) (4 diffs)
• pymuseekd/museek/SConscript (modified) (1 diff)
• pymuseekd/museek/messages.py (added)
• pymuseekd/museek/messages.py.in (deleted)
• pymuseekd/musetup (moved) (moved from museek+/trunk/sources/pymuseekd/musetup.in)
• pymuseekd/setup.py (added)

museek+/trunk/sources/INSTALL

@@ -35 +35 @@
 # make
 # make install
+
+---------------
+distutils (Python's built-in installation tool)
+---------------
+PyMucipher (requires SWIG, Python)
+# cd PyMucipher/
+# python setup.py build
+# python setup.py install
+# (or) python setup.py install --prefix=/usr/local
+...............
+PyMuseekd, Python Tools and Clients (requires PyCrypto or PyMucipher)
+# cd pymuseekd/
+# python setup.py build
+# python setup.py install
+# (or) python setup.py install --prefix=/usr/local
+---------------

museek+/trunk/sources/Mucipher/SConscript

@@ -16 +16 @@
     open(str("wraphelp.c"), "w").write(open(os.path.abspath("../../Mucipher/wraphelp.c")).read())
 
-if 'swig' in env['TOOLS']:
-    import os
-    SConscript(os.path.join('python', 'SConscript'))
-    print "SWIG found, building Python bindings for mucipher."
+if env['PYMUCIPHER']:
+        if 'swig' in env['TOOLS']:
+                import os
+                SConscript(os.path.join('python', 'SConscript'))
+                print "SWIG found, building Python bindings for mucipher."
+                print "If you get an error like: No such file or directory: 'mucipher.i'"
+                print "Disable with: PYMUCIPHER=0"
+        else:
+                print "WARNING: SWIG not found , NOT building Python bindings for mucipher."
 else:
-    print "WARNING: SWIG not found, NOT building Python bindings for mucipher."
-#    SConscript(os.path.join('perl', 'SConscript')) 
-#    can't use perl, cstring not implemented in swig-perl
+        print "WARNING: PyMucipher disabled, NOT building Python bindings for mucipher."
+        print "Enable with: PYMUCIPHER=0"
+        print "Looking for replacement (PyCrypto)..."
+        try:
+                import Crypto
+        except Exception, error:
+                print "PyCrypto is not available, maybe you should install it?:", error
+        else:
+                print "PyCrypto is available, PyMucipher isn't needed anyway."
+        
+#SConscript(os.path.join('perl', 'SConscript'))
+#can't use perl, cstring not implemented in swig-perl
+print

museek+/trunk/sources/Muhelp/SConscript

@@ -44 +44 @@
 
 env.StaticLibrary(target = 'muhelp', source = sources)
+print

museek+/trunk/sources/Museek/SConscript

@@ -32 +32 @@
 
 env.StaticLibrary(target = 'museek', source = sources)
+print

museek+/trunk/sources/Museekal/SConscript

@@ -20 +20 @@
 
 env.StaticLibrary(target = 'museekal', source = sources)
+print

museek+/trunk/sources/SConstruct

@@ -33 +33 @@
 opts.Add(BoolOption('RELEASE', 'Build for release', ''))
 opts.Add(ListOption('MULOG', 'Set debug output', '', ['debug', 'cycle', 'calltrace', 'traffictime']))
+opts.Add(BoolOption('PYMUCIPHER', 'Compile PyMucipher module with SWIG', '')) 
 opts.Add('MUSEEQTRANSLATIONS', 'Build translations for', '', )
 #['fr','de','es','it','pl','ru','pt_BR','ja','zh','sk','he', 'ar', 'cs' ]
@@ -385 +386 @@
 f.write('RELEASE = %s\n' % (`env['RELEASE']`))
 f.write('MULOG = %s\n' % (`string.join(env['MULOG'], ',')`))
+f.write('PYMUCIPHER = %s\n' % (`env['PYMUCIPHER']`))
 f.write('LOCKFLAGS = %s\n' % (`env['LOCKFLAGS']`))
 

museek+/trunk/sources/Tools/SConscript

@@ -61 +61 @@
 env.Alias('install_muscan', install)
 env.Alias('install', 'install_muscan')
-
+print "* muscan will be installed"
 
 env_muscand = env_libmuscan.Copy()
@@ -80 +80 @@
         env.Alias('install_muscand', install)
         env.Alias('install', 'install_muscand')
-
+        print "* muscand will be installed"
         
 
 
 conf.Finish()
+print

museek+/trunk/sources/defaults.py

@@ -25 +25 @@
 # Debugging verbosity (debug, cycle, calltrace)
 MULOG='debug'
+
+# Compile PyMucipher module with SWIG
+PYMUCIPHER=1
 
 # Do Not allow SCons to modify your CFLAGS, keep them as inputted

museek+/trunk/sources/mucous/SConscript

@@ -9 +9 @@
 targets = []
 manfile = []
-if 'swig' in env['TOOLS']:
-    targets.append('mucous')
-    manfile.append("mucous.1")
-    man_install = env.Install(env['DESTDIR'] + env['MANDIR'], manfile)
 
-    install = env.Install(env['DESTDIR'] + env['BINDIR'], targets)
-    env.Alias('install_mucous', man_install)
-    env.Alias('install_mucous', install)
-    env.Alias('install', 'install_mucous')
-    SConscript(os.path.join('pymucous', 'SConscript'))
-    print "SWIG found, mucous will be installed"
+targets.append('mucous')
+manfile.append("mucous.1")
+man_install = env.Install(env['DESTDIR'] + env['MANDIR'], manfile)
+
+install = env.Install(env['DESTDIR'] + env['BINDIR'], targets)
+env.Alias('install_mucous', man_install)
+env.Alias('install_mucous', install)
+env.Alias('install', 'install_mucous')
+SConscript(os.path.join('pymucous', 'SConscript'))
+    
+print "* mucous will be installed"
+if env['PYMUCIPHER'] and 'swig' in env['TOOLS']:
+        pass
 else:
-        print "WARNING: SWIG not found, mucous will NOT be installed"
+        print "WARNING: PyMucipher may not be available, so you should install either PyCrypto, or PyMucipher"

museek+/trunk/sources/museeq/SConscript

@@ -321 +321 @@
 
 env.Alias('install', 'install_museeq')
-
+print

museek+/trunk/sources/pymuseekd/SConscript

@@ -1 +1 @@
 Import('env')
 import os
-
-def build_setup(target, source, env):
-    open(str(target[0]), 'w').write( open(str(source[0]), 'r').read() )
-    os.chmod(str(target[0]), 0755)
-    return 0
 
 try:
@@ -13 +8 @@
         print "\nWARNING: pyexpat not found, musetup will NOT run, but will be installed."
 
-targets = [env.Command('musetup', ['musetup.in'], build_setup)]
+targets = ["musetup"]
 manfile = ["musetup.1"]
-
+print "* musetup will be installed"
 if env["MUSETUPGTK"]:
         try:
@@ -29 +24 @@
         targets.append('musetup-gtk')
         manfile.append ("musetup-gtk.1")
-if 'swig' in env['TOOLS']:
-        targets.append('mulog')
-        targets.append('museekcontrol')
-        manfile.append("mulog.1")
-        manfile.append("museekcontrol.1")
-        print "SWIG found, mulog and museekcontrol will be installed."
-else:
-        print "WARNING: SWIG not found, mulog and museekcontrol will NOT be installed."
+        print "* musetup-gtk will be installed"
+
+targets.append('mulog')
+targets.append('museekcontrol')
+manfile.append("mulog.1")
+manfile.append("museekcontrol.1")
+print "* mulog will be installed"
+print "* museekcontrol will be installed"
 
 man_install = env.Install(env['DESTDIR'] + env['MANDIR'], manfile)
@@ -45 +40 @@
 env.Alias('install', 'install_pymuseekd')
 
-if 'swig' in env['TOOLS']:
-        SConscript(os.path.join('museek', 'SConscript'))
+if env['PYMUCIPHER'] and 'swig' in env['TOOLS']:
+        pass
+else:
+        print "WARNING: PyMucipher is not going to be installed, so you should install either PyCrypto, or PyMucipher"
+SConscript(os.path.join('museek', 'SConscript'))
+print

museek+/trunk/sources/pymuseekd/museek/SConscript

@@ -1 @@
-def iface_build(target, source, env):
-    from muscons import IfaceGen
-    IfaceGen(str(target[0]), str(source[0]), str(source[1]))
-    return 0
-
 Import('env')
-env.Command('messages.py', ['messages.py.in', '../../museekd/IfaceMessages.hh'], iface_build)
 
 files = Split("""