1 files changed, 38 insertions, 8 deletions

diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py
index 1f0f92f..e52c31e 100644
--- a/scripts/builder/frontendBuilder.py
+++ b/scripts/builder/frontendBuilder.py
@@ -11,6 +11,8 @@ import urllib
 
 import main
 
+#===============================================================================
+
 class FrontendBuilder(object):
 
         def __init__ (self, frontend, settings, repositoryVersion):
@@ -28,9 +30,22 @@ class FrontendBuilder(object):
                 self.repositoryVersion = repositoryVersion
                 self.processedFiles = {}
                 
+        #---------------------------------------------------------------------------
+
+        def name (self):
+                raise NotImplementedError()
+
+
+        def copyStaticResources (self, targetFolder):
+                raise NotImplementedError()
+
+        #---------------------------------------------------------------------------
 
         def log (self, message):
-                print "frontend [" + self.module + "]: " + message
+                module = self.module
+                if (self.module != self.submodule):
+                        module = module + "." + self.submodule
+                print "frontend [" + module + "]: " + message
         
 
         def absolutePathForSources (self):
@@ -58,16 +73,30 @@ class FrontendBuilder(object):
         
 
         def copyResources (self, sourceFolder, destinationFolder, fileType):
+                if fileType in self.settings:
                 for file in self.filterFiles(self.settings[fileType]):
                         src = self.absolutePathForSourceFile(fileType, file)
                         dst = self.absolutePathForTargetFile(destinationFolder, fileType, file)
                         main.createFolder(os.path.dirname(dst))
                         shutil.copy2(src, dst)
+                else:
+                        srcFolder = os.path.join(self.absolutePathForSources(), fileType)
+                        dstFolder = os.path.join(destinationFolder, self.module, fileType)
+                        if not(os.path.exists(dstFolder)):
+                                shutil.copytree(srcFolder, dstFolder)
+
+        #               try:
+        #                       shutil.copytree(srcFolder, dstFolder)
+        #               except:
+        #                       pass
+
                 
 
         def copyResourcesToFolder (self, targetFolder):
                 self.copyResources(self.projectDir, targetFolder, 'css')
                 self.copyResources(self.projectDir, targetFolder, 'js')
+                self.copyResources(self.projectDir, targetFolder, 'images')
+                self.copyStaticResources(targetFolder)
         
 
         def loadFilesContent (self, basePath, files):
@@ -279,13 +308,13 @@ class FrontendBuilder(object):
         def replaceTemplatePlaceholders (self, pageTitle, copyright, css, code, jsLoadMode, version, versionType):
                 result = self.template()
                 
-                        result = result.replace('@page.title@',                                         pageTitle,      1)
-                        result = result.replace('@copyright@',                                  copyright,      1)
-                        result = result.replace('@css@',                                                css,            1)
-                        #result = result.replace('@bookmarklet@',                               bookmarklet,1)
-                        result = result.replace('@application.version@',                version,        1)
-                        result = result.replace('@application.version.type@',   versionType,1)
-                        result = result.replace('@js_' + jsLoadMode + '@',              code,           1)
+                        result = result.replace('@page.title@',                                 pageTitle)
+                        result = result.replace('@copyright@',                          copyright)
+                        result = result.replace('@css@',                                        css)
+                        #result = result.replace('@bookmarklet@',                       bookmarklet)
+                        result = result.replace('@application.version@',        version)
+                        result = result.replace('@application.version.type@',versionType)
+                        result = result.replace('@js_' + jsLoadMode + '@',      code)
 
                 result = re.sub('@js_[^@]+@', '', result)
 
@@ -371,6 +400,7 @@ class FrontendBuilder(object):
                                          '\n' + \
                                         self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))
                         jsLoadMode = 'LINKED'
+                        versionType = 'development'
 
                 else:
                         raise NotImplementedError()