3 files changed, 31 insertions, 13 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
@@ -91,28 +91,41 @@ class BackendBuilder(object):
                         self.compileCode()
                 
                         for frontend in self.frontends:
+                                if (frontend.module == frontend.submodule):
+                                        submoduleExtension = ''
+                                else:
+                                        submoduleExtension = '.' + frontend.submodule
+
                                 main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module))
 
                                 if 'debug' in self.versions:
                                         frontend.copyResourcesToFolder(self.frontEndTempFolder())
 
                                         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)
                                 
                                 if 'install' in self.versions:
                                         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")
                         
                         self.createPackage()
 
                 if 'development' in self.versions:
                         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))
 
                                 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
@@ -88,7 +88,8 @@ class FrontendBuilder(object):
         def template (self):
                 processedFile = 'html_template'
                 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']])
                         
                 return self.processedFiles[processedFile]
         
@@ -319,7 +320,7 @@ class FrontendBuilder(object):
 
         def scriptTagsForFiles (self, basePath, files):
                 #<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))
         
 
         def scriptTagForContent (self, content):
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 0efa10b..0045de7 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -4,17 +4,20 @@
 
 def repositoryWithPath (path):
         try:
-                from git import Repo
-
-                repo = Repo(path)
-                result = GitRepository(repo, path)
-        except ImportError:
-                print "Failed to import git, please install http://gitorious.org/git-python"
-        except:
                 from mercurial import ui, hg
 
                 repo = hg.repository(ui.ui(), path)
                 result = HgRepository(repo, path)
+        except:
+                try:
+                        from git import Repo
+
+                        repo = Repo(path)
+                        result = GitRepository(repo, path)
+                except ImportError, exception:
+                        print "Failed to import git, please install http://gitorious.org/git-python"
+                        raise exception
+
 
         return result
 
@@ -50,6 +53,7 @@ class Repository(object):
 
 
 class GitRepository(Repository):
+                #http://gitorious.org/git-python
 
         def revision (self):
                 return self.repository.head.commit.hexsha