# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1273243809 -7200
# Node ID 1af69779f5979c1626160503e50b945cac51d439
# Parent  eab5540d96ebb8c222b9949d19d6e2c174c76317# Parent  55a40cc0ab9a71dfad57671c2fd8c40a947d83a1
merge

diff -r eab5540d96eb -r 1af69779f597 bin/cubicweb-ctl.bat
--- a/bin/cubicweb-ctl.bat	Fri May 07 14:42:18 2010 +0200
+++ b/bin/cubicweb-ctl.bat	Fri May 07 16:50:09 2010 +0200
@@ -8,8 +8,8 @@
 """
 # -------------------- Python section --------------------
 import sys
-from os.path import join, dirname
-sys.path.insert(0, join(dirname(__file__), '..', '..'))
+from os.path import join, dirname, normpath
+sys.path.insert(0, normpath(join(dirname(__file__), '..', '..')))
 from cubicweb.cwctl import run
 run(sys.argv[1:])
 
diff -r eab5540d96eb -r 1af69779f597 dbapi.py
--- a/dbapi.py	Fri May 07 14:42:18 2010 +0200
+++ b/dbapi.py	Fri May 07 16:50:09 2010 +0200
@@ -553,7 +553,7 @@
         if 'views' in subpath:
             esubpath = list(subpath)
             esubpath.remove('views')
-            esubpath.append('web/views')
+            esubpath.append(join('web', 'views'))
         cubes = reversed([config.cube_dir(p) for p in cubes])
         vpath = config.build_vregistry_path(cubes, evobjpath=esubpath,
                                             tvobjpath=subpath)
diff -r eab5540d96eb -r 1af69779f597 web/webconfig.py
--- a/web/webconfig.py	Fri May 07 14:42:18 2010 +0200
+++ b/web/webconfig.py	Fri May 07 16:50:09 2010 +0200
@@ -75,7 +75,7 @@
     """the WebConfiguration is a singleton object handling instance's
     configuration and preferences
     """
-    cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set(['web/views'])
+    cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set([join('web', 'views')])
     cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['views'])
 
     options = merge_options(CubicWebConfiguration.options + (