[Checkins] SVN: hurry.jqueryui/trunk/ Various tweaks:

[Martijn Faassen]

Log message for revision 115153:
  Various tweaks:
  
  * better zest.releaser integration
  
  * hurry.resource 0.10 entry point support
  

Changed:
  U   hurry.jqueryui/trunk/CHANGES.txt
  U   hurry.jqueryui/trunk/buildout.cfg
  U   hurry.jqueryui/trunk/setup.py
  U   hurry.jqueryui/trunk/src/hurry/jqueryui/__init__.py
  D   hurry.jqueryui/trunk/src/hurry/jqueryui/configure.zcml
  U   hurry.jqueryui/trunk/src/hurry/jqueryui/prepare.py

-=-
Modified: hurry.jqueryui/trunk/CHANGES.txt
===================================================================
--- hurry.jqueryui/trunk/CHANGES.txt	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/CHANGES.txt	2010-07-28 15:18:01 UTC (rev 115153)
@@ -4,10 +4,13 @@
 1.8.2.1 (2010-07-15)
 ====================
 
-* Update to jQueryUI-1.8.2
+* Update to jQueryUI 1.8.2
 
 * Better integration with zest.releaser to make releases
 
+* Update to use entry points instead of configure.zcml, needed for
+  hurry.resource 0.10.
+
 1.7.2.1 (2009-11-08) (jQuery UI version 1.7.2)
 ==============================================
 

Modified: hurry.jqueryui/trunk/buildout.cfg
===================================================================
--- hurry.jqueryui/trunk/buildout.cfg	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/buildout.cfg	2010-07-28 15:18:01 UTC (rev 115153)
@@ -5,7 +5,7 @@
 
 [versions]
 py = 1.0
-zest.releaser = 3.11
+zest.releaser = 3.12
 
 [scripts]
 recipe = zc.recipe.egg

Modified: hurry.jqueryui/trunk/setup.py
===================================================================
--- hurry.jqueryui/trunk/setup.py	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/setup.py	2010-07-28 15:18:01 UTC (rev 115153)
@@ -44,12 +44,14 @@
             'jqueryuiprepare = hurry.jqueryui.prepare:main',
             ],
         'zest.releaser.prereleaser.middle': [
-            'prepare = hurry.jqueryui.prepare:prepare_jqueryui',
+            'prepare = hurry.jqueryui.prepare:working_entrypoint',
             ],
-        # ALSO grab jqueryui in the separate tag checkout
-        'zest.releaser.releaser.middle': [
-            'prepare = hurry.jqueryui.prepare:prepare_jqueryui',
+        'zest.releaser.releaser.after_checkout': [
+            'prepare = hurry.jqueryui.prepare:tag_entrypoint',
             ],
+        'hurry.resource.libraries': [
+            'jqueryui = hurry.jqueryui:jqueryui_lib',
+            ],
     },
     extras_require={
         'zopesupport': ['hurry.zoperesource'],

Modified: hurry.jqueryui/trunk/src/hurry/jqueryui/__init__.py
===================================================================
--- hurry.jqueryui/trunk/src/hurry/jqueryui/__init__.py	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/src/hurry/jqueryui/__init__.py	2010-07-28 15:18:01 UTC (rev 115153)
@@ -5,7 +5,7 @@
 except ImportError:
     pass
 
-jqueryui = Library('jqueryui')
+jqueryui_lib = Library('jqueryui', 'jqueryui-build')
 
 jqueryui = ResourceInclusion(jqueryui, 'jquery-ui.js', depends=[jquery],
                              minified='jquery-ui.min.js')

Deleted: hurry.jqueryui/trunk/src/hurry/jqueryui/configure.zcml
===================================================================
--- hurry.jqueryui/trunk/src/hurry/jqueryui/configure.zcml	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/src/hurry/jqueryui/configure.zcml	2010-07-28 15:18:01 UTC (rev 115153)
@@ -1,11 +0,0 @@
-<configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:browser="http://namespaces.zope.org/browser">
-
-  <browser:resourceDirectory
-    name="jqueryui"
-    directory="jqueryui-build" />
-  <browser:resourceDirectory
-    name="jqueryui_themes"
-    directory="jqueryui-themes" />
-</configure>

Modified: hurry.jqueryui/trunk/src/hurry/jqueryui/prepare.py
===================================================================
--- hurry.jqueryui/trunk/src/hurry/jqueryui/prepare.py	2010-07-28 14:53:47 UTC (rev 115152)
+++ hurry.jqueryui/trunk/src/hurry/jqueryui/prepare.py	2010-07-28 15:18:01 UTC (rev 115153)
@@ -14,8 +14,7 @@
 FULL = "jquery-ui.js"
 THEME_URL = 'http://jquery-ui.googlecode.com/files/jquery-ui-themes-%s.zip' % VERSION
 
-def prepare_jqueryui(data):
-    package_dir = py.path.local(os.path.dirname(__file__))
+def prepare_jqueryui(package_dir):
     jquery_dest_path = package_dir.join('jqueryui-build')
 
     # remove previous jquery library build
@@ -70,7 +69,7 @@
     py_path = package_dir.join('_themes.py')
     print 'Generating inclusion module "%s"' % py_path
 
-    library = Library('jqueryui_themes')
+    library = Library('jqueryui_themes', 'jqueryui-themes')
     inclusion_map = {}
     for theme in themes_dest_path.listdir():
         if not theme.check(dir=True):
@@ -88,5 +87,10 @@
     module.close()
 
 def main():
-    prepare_jqueryui(None)
+    prepare_jqueryui(py.path.local(os.path.dirname(__file__)))
 
+def working_entrypoint(data):    
+    prepare_jqueryui(py.path.local(os.path.dirname(__file__)))
+
+def tag_entrypoint(data):
+    prepare_jquery(data['tagdir'] + '/src/hurry/jqueryui')