| author | Clipperz <info@clipperz.com> | 2013-01-09 10:37:39 (UTC) |
|---|---|---|
| committer | Clipperz <info@clipperz.com> | 2013-01-09 10:37:39 (UTC) |
| commit | 5996ee475c193f08a713eb53338e4769c2716aa7 (patch) (side-by-side diff) | |
| tree | 18947a78d3946635ace383bfc3bacdabda11aafd /scripts | |
| parent | 813c3245eebfebf9d951e082b9a7473d0116b63a (diff) | |
| download | clipperz-5996ee475c193f08a713eb53338e4769c2716aa7.zip clipperz-5996ee475c193f08a713eb53338e4769c2716aa7.tar.gz clipperz-5996ee475c193f08a713eb53338e4769c2716aa7.tar.bz2 | |
Fixed build script
Changed the build script in order to replace placeholders even if present multiple times
| -rw-r--r-- | scripts/builder/frontendBuilder.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index fc603c4..e52c31e 100644 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py @@ -299,31 +299,31 @@ class FrontendBuilder(object): if not self.processedFiles.has_key(cacheKey): result = 'bookmarklet="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet.js']), "regular") + '";bookmarklet_ie="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet_IE.js']), "IE") + '";' self.processedFiles[cacheKey] = result else: result = self.processedFiles[cacheKey] 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 = 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) 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']) |