Updated builder script

1 files changed, 37 insertions, 7 deletions

diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py
index 1f0f92f..fc603c4 100644
--- a/scripts/builder/frontendBuilder.py
+++ b/scripts/builder/frontendBuilder.py
@@ -12,4 +12,6 @@ import urllib
 import main
 
+#===============================================================================
+
 class FrontendBuilder(object):
 
@@ -28,8 +30,21 @@ 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
 	
 
@@ -59,9 +74,21 @@ class FrontendBuilder(object):
 
 	def copyResources (self, sourceFolder, destinationFolder, fileType):
-		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)
+		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
+
 		
 
@@ -69,4 +96,6 @@ class FrontendBuilder(object):
 		self.copyResources(self.projectDir, targetFolder, 'css')
 		self.copyResources(self.projectDir, targetFolder, 'js')
+		self.copyResources(self.projectDir, targetFolder, 'images')
+		self.copyStaticResources(targetFolder)
 	
 
@@ -372,4 +401,5 @@ class FrontendBuilder(object):
 					self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))
 			jsLoadMode = 'LINKED'
+			versionType = 'development'
 
 		else: