[Plone-cvs] r50148 - in Installers/UnifiedInstaller/trunk: . Licenses base_skeleton buildout_templates helper_scripts tests

[Steve M. <svn...@pl...>]

Author: smcmahon
Date: Tue May 31 17:32:24 2011
New Revision: 50148

Added:
   Installers/UnifiedInstaller/trunk/Licenses/MIT.txt   (contents, props changed)
Removed:
   Installers/UnifiedInstaller/trunk/base_skeleton/lxml.cfg
Modified:
   Installers/UnifiedInstaller/trunk/Licenses/licenses.txt
   Installers/UnifiedInstaller/trunk/buildout_templates/base.cfg
   Installers/UnifiedInstaller/trunk/buildout_templates/standalone.cfg
   Installers/UnifiedInstaller/trunk/helper_scripts/create_instance.py
   Installers/UnifiedInstaller/trunk/install.sh
   Installers/UnifiedInstaller/trunk/tests/tests.txt
   Installers/UnifiedInstaller/trunk/update_packages.py
Log:
Add static-build lxml with option to skip. Refs #11308

Added: Installers/UnifiedInstaller/trunk/Licenses/MIT.txt
==============================================================================
--- (empty file)
+++ Installers/UnifiedInstaller/trunk/Licenses/MIT.txt	Tue May 31 17:32:24 2011
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: Installers/UnifiedInstaller/trunk/Licenses/licenses.txt
==============================================================================
--- Installers/UnifiedInstaller/trunk/Licenses/licenses.txt	(original)
+++ Installers/UnifiedInstaller/trunk/Licenses/licenses.txt	Tue May 31 17:32:24 2011
@@ -26,6 +26,9 @@
 on some platforms (e.g., OS X), and the licenses may not be in the
 compiled versions:
 
+libjpeg:
+    See jpeg.txt
+
 readline library:
     GPL
 
@@ -38,6 +41,9 @@
 Zope
     Zope Public License, version 2.1
 
+libxml2, libxslt
+    MIT License
+
 For license specifications for Python Packages and Eggs
 see the included PKG-INFO files.
 

Modified: Installers/UnifiedInstaller/trunk/buildout_templates/base.cfg
==============================================================================
--- Installers/UnifiedInstaller/trunk/buildout_templates/base.cfg	(original)
+++ Installers/UnifiedInstaller/trunk/buildout_templates/base.cfg	Tue May 31 17:32:24 2011
@@ -204,6 +204,14 @@
 update-command = ${chown-zeo:command}
 
 
+[lxml]
+recipe = z3c.recipe.staticlxml
+egg = lxml
+libxml2-url = ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
+libxslt-url = ftp://xmlsoft.org/libxml2/libxslt-1.1.26.tar.gz
+static-build = true
+
+
 [osxcontroller]
 recipe=plone.recipe.osxcontroller
 

Modified: Installers/UnifiedInstaller/trunk/buildout_templates/standalone.cfg
==============================================================================
--- Installers/UnifiedInstaller/trunk/buildout_templates/standalone.cfg	(original)
+++ Installers/UnifiedInstaller/trunk/buildout_templates/standalone.cfg	Tue May 31 17:32:24 2011
@@ -71,6 +71,7 @@
 #
 eggs =
     Plone
+    lxml
 
 
 # Optional Functionality

Modified: Installers/UnifiedInstaller/trunk/helper_scripts/create_instance.py
==============================================================================
--- Installers/UnifiedInstaller/trunk/helper_scripts/create_instance.py	(original)
+++ Installers/UnifiedInstaller/trunk/helper_scripts/create_instance.py	Tue May 31 17:32:24 2011
@@ -95,6 +95,9 @@
    (int(platform.platform().split('-')[1].split('.')[0]) >= 9):
     # add to parts
     buildout = buildout.replace('parts =\n', 'parts =\n    osxcontroller')
+    wantOSX = True
+else:
+    wantOSX = False
 
 # set password
 buildout = buildout.replace('__PASSWORD__', PASSWORD)
@@ -108,6 +111,9 @@
 except:
     buildout = buildout.replace('    Plone\n', '    Plone\n    Pillow\n')
 
+if INSTALL_LXML == 'no':
+    buildout = buildout.replace('    lxml\n', '')
+
 fn = os.path.join(INSTANCE_HOME, 'buildout.cfg')
 fd = file(fn, 'w')
 fd.write(buildout)
@@ -151,6 +157,12 @@
     del buildout['instance']
     del buildout['chown']
 
+if INSTALL_LXML == 'no':
+    del buildout['lxml']
+
+if not wantOSX:
+    del buildout['osxcontroller']
+
 fn = os.path.join(INSTANCE_HOME, 'base.cfg')
 fd = file(fn, 'w')
 fd.write(str(buildout))
@@ -182,11 +194,6 @@
         uid, gid = pwd.getpwnam(CLIENT_USER)[2:4]
         os.seteuid(uid)
 
-    if INSTALL_LXML == 'yes':
-        print "Building lxml with static libxml2 and libxslt; this takes a while..."
-        returncode = doCommand(os.path.join(INSTANCE_HOME, 'bin', 'buildout') + " -NUc lxml.cfg")
-        returncode = doCommand("rm .installed.cfg")
-
     print "Running buildout; this takes a while..."
 
     if OFFLINE == '1':

Modified: Installers/UnifiedInstaller/trunk/install.sh
==============================================================================
--- Installers/UnifiedInstaller/trunk/install.sh	(original)
+++ Installers/UnifiedInstaller/trunk/install.sh	Tue May 31 17:32:24 2011
@@ -53,10 +53,8 @@
 #   no     - to force no install
 #
 # lxml option:
-# --lxml
-# Builds lxml egg in with static libxml2 and libxslt; Useful if you need
-# lxml but your system libxml2 or libxslt libraries conflict.
-# This option requires online operation.
+# --without-lxml
+# Prevents automatic build of lxml with static xml2 and xslt libraries
 
 
 # Path for Root install
@@ -88,7 +86,7 @@
 . ./buildenv.sh
 
 
-INSTALL_LXML=no
+INSTALL_LXML=yes
 INSTALL_ZLIB=auto
 INSTALL_JPEG=auto
 if [ `uname` = "Darwin" ]; then
@@ -264,8 +262,8 @@
             fi
             ;;
 
-        --lxml | --withlxml )
-            INSTALL_LXML=yes
+        --without-lxml )
+            INSTALL_LXML=no
             ;;
 
         --without-ssl | --without-openssl )

Modified: Installers/UnifiedInstaller/trunk/tests/tests.txt
==============================================================================
--- Installers/UnifiedInstaller/trunk/tests/tests.txt	(original)
+++ Installers/UnifiedInstaller/trunk/tests/tests.txt	Tue May 31 17:32:24 2011
@@ -10,8 +10,9 @@
     >>> import subprocess, os, os.path, sys, shutil, urllib2, stat, pwd, time
     >>> uid = os.geteuid()
     >>> root = uid == 0
-    # Make sure the test target is in a partition where ownership &
-    # permissions work. That may not be so in a mountable or tmp partition.
+
+    NOTE: Make sure the test target is in a partition where ownership &
+    permissions work. That may not be so in a mountable or tmp partition.
     >>> testTarget = '/Users/steve/nobackup/plonetest'
     >>> withPython = '/opt/local/bin/python'
 
@@ -120,6 +121,22 @@
     True
 
 
+    Check the python
+    ----------------
+    
+    >>> stdout, stderr, returncode = doCommand('%s/zeocluster/bin/zopepy "from _imaging import jpeg_decoder"' % testTarget)
+    >>> returncode
+    0
+    >>> stderr
+    ''
+    
+    >>> stdout, stderr, returncode = doCommand('%s/zeocluster/bin/zopepy "from _imaging import zip_decoder"' % testTarget)
+    >>> returncode
+    0
+    >>> stderr
+    ''
+    
+
     Run it
     ------
     

Modified: Installers/UnifiedInstaller/trunk/update_packages.py
==============================================================================
--- Installers/UnifiedInstaller/trunk/update_packages.py	(original)
+++ Installers/UnifiedInstaller/trunk/update_packages.py	Tue May 31 17:32:24 2011
@@ -34,7 +34,7 @@
 
 
 # source directory for packages
-target = '/Users/steve/nobackup/work/p41'
+target = '/Volumes/kingston/p41'
 
 
 def doCommand(command):
@@ -96,7 +96,6 @@
 downloads = os.path.join(workDir, 'downloads')
 dist = os.path.join(downloads, 'dist')
 
-
 print "clean older packages"
 packages = PackageList( (dist,) )
 packages.cleanOlder()