clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-01-10 12:00:02 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Josh 2012-03-17 15:29:33 -04:00
commit 0e396afdc4
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/builder/backendBuilder.py
View File

@ -91,28 +91,41 @@ class BackendBuilder(object):
self.compileCode() self.compileCode()
for frontend in self.frontends: for frontend in self.frontends:
if (frontend.module == frontend.submodule):
submoduleExtension = ''
else:
submoduleExtension = '.' + frontend.submodule
main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module)) main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module))
if 'debug' in self.versions: if 'debug' in self.versions:
frontend.copyResourcesToFolder(self.frontEndTempFolder()) frontend.copyResourcesToFolder(self.frontEndTempFolder())
index = self.configureIndexContent(frontend.assemble(assemblyMode='DEBUG', versionType='DEBUG')) 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: if 'install' in self.versions:
index = self.configureIndexContent(frontend.assemble()) 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() self.createPackage()
if 'development' in self.versions: if 'development' in self.versions:
for frontend in self.frontends: 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)) main.createFolder(os.path.join(self.developmentTargetFolder(), frontend.module))
index = self.configureIndexContent(frontend.assemble(assemblyMode='DEVELOPMENT', versionType='DEBUG'), self.settings['development.settings']['url']) 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)
#=================================================================== #===================================================================

5
scripts/builder/frontendBuilder.py
View File

@ -88,7 +88,8 @@ class FrontendBuilder(object):
def template (self): def template (self):
processedFile = 'html_template' processedFile = 'html_template'
if not self.processedFiles.has_key(processedFile): 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] return self.processedFiles[processedFile]
@ -319,7 +320,7 @@ class FrontendBuilder(object):
def scriptTagsForFiles (self, basePath, files): def scriptTagsForFiles (self, basePath, files):
#<script type='text/javascript' src='./js/src/bookmarklet.js'></script> #<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): def scriptTagForContent (self, content):

18
scripts/builder/repository.py
View File

@ -4,17 +4,20 @@
def repositoryWithPath (path): def repositoryWithPath (path):
try: 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 from mercurial import ui, hg
repo = hg.repository(ui.ui(), path) repo = hg.repository(ui.ui(), path)
result = HgRepository(repo, 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 return result
@ -50,6 +53,7 @@ class Repository(object):
class GitRepository(Repository): class GitRepository(Repository):
# http://gitorious.org/git-python
def revision (self): def revision (self):
return self.repository.head.commit.hexsha return self.repository.head.commit.hexsha