Merge pull request #31 from gcsolaroli/master

Updated build scripts

1 files changed, 3 insertions, 2 deletions

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
@@ -43,97 +43,98 @@ class FrontendBuilder(object):
 
 	def absolutePathForTargetFile (self, folder, basePath, file):
 		return os.path.join(folder, self.module, basePath, file)
 
 
 	def filterFiles (self, files):
 		result = []
 		
 		for file in files:
 			if file.startswith('--'):
 				pass
 			else:
 				result.append(file)
 			
 		return result
 	
 
 	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)
 		
 
 	def copyResourcesToFolder (self, targetFolder):
 		self.copyResources(self.projectDir, targetFolder, 'css')
 		self.copyResources(self.projectDir, targetFolder, 'js')
 	
 
 	def loadFilesContent (self, basePath, files):
 		result = ""
 		
 		for file in self.filterFiles(files):
 			try:
 				fileHandler = codecs.open(self.absolutePathForSourceFile(basePath, file), 'r', 'utf-8')
 			except:
 				print "FILE: " + file
 
 			result += fileHandler.read() + '\n'
 			fileHandler.close()
 			
 		return result
 	
 
 	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]
 	
 
 	def cssminCompressor (self, css):
 		# package found here:
 		# - http://stackoverflow.com/questions/222581/python-script-for-minifying-css/2396777#2396777
 		# actual downloaded version: http://pypi.python.org/pypi/cssmin/0.1.4
 		return cssmin.cssmin(css)
 	
 
 	def regexCssCompressor (self, css):
 		# http://stackoverflow.com/questions/222581/python-script-for-minifying-css/223689#223689
 		
 		# remove comments - this will break a lot of hacks :-P
 		css = re.sub( r'\s*/\*\s*\*/', "$$HACK1$$", css ) # preserve IE<6 comment hack
 		css = re.sub( r'/\*[\s\S]*?\*/', "", css )
 		css = css.replace( "$$HACK1$$", '/**/' ) # preserve IE<6 comment hack
 
 		# url() doesn't need quotes
 		css = re.sub( r'url\((["\'])([^)]*)\1\)', r'url(\2)', css )
 
 		# spaces may be safely collapsed as generated content will collapse them anyway
 		css = re.sub( r'\s+', ' ', css )
 
 		# shorten collapsable colors: #aabbcc to #abc
 		css = re.sub( r'#([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3(\s|;)', r'#\1\2\3\4', css )
 
 		# fragment values can loose zeros
 		css = re.sub( r':\s*0(\.\d+([cm]m|e[mx]|in|p[ctx]))\s*;', r':\1;', css )
 
 		for rule in re.findall( r'([^{]+){([^}]*)}', css ):
 
 		    # we don't need spaces around operators
 		    selectors = [re.sub( r'(?<=[\[\(>+=])\s+|\s+(?=[=~^$*|>+\]\)])', r'', selector.strip() ) for selector in rule[0].split( ',' )]
 
 		    # order is important, but we still want to discard repetitions
 		    properties = {}
 		    porder = []
 		    for prop in re.findall( '(.*?):(.*?)(;|$)', rule[1] ):
 		        key = prop[0].strip().lower()
 		        if key not in porder: porder.append( key )
 		        properties[ key ] = prop[1].strip()
 		
 		    # output rule if it contains any declarations
 		    if properties:
 		        print "%s{%s}" % ( ','.join( selectors ), ''.join(['%s:%s;' % (key, properties[key]) for key in porder])[:-1] )
 		
@@ -274,97 +275,97 @@ class FrontendBuilder(object):
 		
 		return result
 	
 
 	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 = re.sub('@js_[^@]+@', '', result)
 
 		return result
 	
 
 	def assembleCopyrightHeader (self):
 		processedFile = 'copyright'
 		if not self.processedFiles.has_key(processedFile):
 			#self.log("assembling copyright header")
 			copyrightValues = self.settings['copyright.values']
 			license = self.loadFilesContent('../../properties', ['license.txt'])
 			result  = self.loadFilesContent('properties', ['creditsAndCopyrights.txt'])
 			
 			result = re.sub('@clipperz.license@', license, result)
 			for key in copyrightValues:
 				result = re.sub('@'+key+'@', copyrightValues[key], result)
 			
 			self.processedFiles[processedFile] = result
 			
 		return self.processedFiles[processedFile]
 	
 
 	def cssTagsForFiles (self, basePath, files):
 		#<link rel="stylesheet" type="text/css" href="./css/reset-min.css" />
 		return '\n'.join(map(lambda file: '<link rel="stylesheet" type="text/css" href="' + basePath + '/' + file + '" />', files))
 	
 
 	def cssTagForContent (self, content):
 		return '<style type="text/css">' + content + '</style>'
 	
 
 	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):
 		return '<script>' + content + '</script>'
 	
 
 	def assembleVersion (self, pageTitle, copyright, css, js, jsLoadMode, version, versionType):
 		cacheKey = version + "-" + versionType
 		if not self.processedFiles.has_key(cacheKey):
 			result = self.replaceTemplatePlaceholders(pageTitle, copyright, css, js, jsLoadMode, version, versionType)
 			self.processedFiles[cacheKey] = result
 		else:
 			result = self.processedFiles[cacheKey]
 		
 		#self.log("# cacheKey:\n" + result)
 		return result
 	
 
 	def assemble (self, assemblyMode='INSTALL', versionType='LIVE'):
 
 		if versionType == 'LIVE':
 			pageTitle = "Clipperz - " + self.module
 		else:
 			pageTitle = "Clipperz - " + self.module + " [" + versionType + " - " + assemblyMode +"]"
 
 		if assemblyMode == 'INSTALL':
 			copyright = self.assembleCopyrightHeader()
 			css	=	self.cssTagForContent(self.compressCSS(self.loadFilesContent('css', self.settings['css'])))
 			js	=	self.scriptTagForContent(
 						self.bookmarklet() +
 						'\n' +
 						self.compressJS(self.loadFilesContent('js', self.settings['js']), "application")
 					)
 			jsLoadMode = 'EMBEDDED'
 
 		elif assemblyMode == 'DEBUG':
 			copyright = self.assembleCopyrightHeader()
 			css	=	self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))
 			js	=	self.scriptTagForContent(self.bookmarklet()) + \
 				 	'\n' + \
 					self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js']))
 			jsLoadMode = 'LINKED'
 
 		elif assemblyMode == 'DEVELOPMENT':
 			copyright = ""
 			css	=	self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))
 			js	=	self.scriptTagForContent(self.bookmarklet()) + \
 				 	'\n' + \