3 files changed, 27 insertions, 11 deletions

diff --git a/scripts/builder/backendBuilder.py b/scripts/builder/backendBuilder.py
index 3e61955..5b91678 100644
--- a/scripts/builder/backendBuilder.py
+++ b/scripts/builder/backendBuilder.py
@@ -93,2 +93,7 @@ class BackendBuilder(object):
                         for frontend in self.frontends:
+                                if (frontend.module == frontend.submodule):
+                                        submoduleExtension = ''
+                                else:
+                                        submoduleExtension = '.' + frontend.submodule
+
                                 main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module))
@@ -99,3 +104,3 @@ class BackendBuilder(object):
                                         index = self.configureIndexContent(frontend.assemble(assemblyMode='DEBUG', versionType='DEBUG'))
-                                        self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index_debug.html'), index)
+                                        self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index_debug' + submoduleExtension + '.html'), index)
                                 
@@ -103,5 +108,5 @@ class BackendBuilder(object):
                                         index = self.configureIndexContent(frontend.assemble())
-                                        self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index.html'), index)
+                                        self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index' + submoduleExtension + '.html'), index)
 
-                                        self.logChecksums(index, "[" + self.name() + " - " + frontend.module + "] index.html checksum")
+                                        self.logChecksums(index, "[" + self.name() + " - " + frontend.module + "] index" + submoduleExtension + ".html checksum")
                         
@@ -111,2 +116,10 @@ class BackendBuilder(object):
                         for frontend in self.frontends:
+                                if (frontend.module == frontend.submodule):
+                                        submoduleExtension = ''
+                                else:
+                                        submoduleExtension = '.' + frontend.submodule
+
+                                print "FRONTEND module: " + frontend.module
+                                print "FRONTEND submodule: " + frontend.submodule
+
                                 main.createFolder(os.path.join(self.developmentTargetFolder(), frontend.module))
@@ -114,3 +127,3 @@ class BackendBuilder(object):
                                 index = self.configureIndexContent(frontend.assemble(assemblyMode='DEVELOPMENT', versionType='DEBUG'), self.settings['development.settings']['url'])
-                                self.writeToFolder(self.developmentTargetFolder(), os.path.join(frontend.module, 'index.html'), index)
+                                self.writeToFolder(self.developmentTargetFolder(), os.path.join(frontend.module, 'index' + submoduleExtension + '.html'), index)
 
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py
index dae837b..1f0f92f 100644
--- a/scripts/builder/frontendBuilder.py
+++ b/scripts/builder/frontendBuilder.py
@@ -90,3 +90,4 @@ class FrontendBuilder(object):
                 if not self.processedFiles.has_key(processedFile):
-                        self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html'])
+                        #self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html'])
+                        self.processedFiles[processedFile] = self.loadFilesContent('html', [self.settings['html.template']])
                         
@@ -321,3 +322,3 @@ class FrontendBuilder(object):
                 #<script type='text/javascript' src='./js/src/bookmarklet.js'></script>
-                return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '"></script>', files))
+                return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '" charset="utf-8"></script>', files))
         
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 89db9a5..f8528c2 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -6,3 +6,3 @@ def repositoryWithPath (path):
         try:
-                from dulwich.repo import Repo
+                from git import Repo
 
@@ -10,3 +10,5 @@ def repositoryWithPath (path):
                 result = GitRepository(repo, path)
-        except:
+        except ImportError:
+                print "Failed to import git, please install http://gitorious.org/git-python"
+        #except:
                 from mercurial import ui, hg
@@ -52,7 +54,7 @@ class GitRepository(Repository):
         def revision (self):
-                return repository.refs['HEAD']
-        
+                return self.repository.head.commit.hexsha
+
 
         def areTherePendingChanges (self):
-                return repository.is_dirty()
+                return self.repository.is_dirty()