Updated builder script

1 files changed, 20 insertions, 6 deletions

diff --git a/scripts/builder/main.py b/scripts/builder/main.py
index 6fce65d..b9fe04a 100755
--- a/scripts/builder/main.py
+++ b/scripts/builder/main.py
@@ -11,5 +11,5 @@ import itertools
 from collections   import deque
 
-import frontendBuilder
+#import frontendBuilder
 import repository
 
@@ -76,5 +76,5 @@ def assembleBackend (backend, frontends, versions):
 	builderModuleName = backend + 'Builder'
 	builderClassName  = backend.capitalize() + 'Builder'
-
+	#print ("BUILD BACKENDS - module: " + builderModuleName + " , class: " + builderClassName)
 	builderModule  = __import__(builderModuleName)
 	builderClass   = getattr(builderModule, builderClassName)
@@ -89,8 +89,20 @@ def build (settings, repository):
 	
 	if repository.areTherePendingChanges():
-		print "\nWARNING: repository has pending changes\n"
+		if 'install' in settings['versions']:
+			raise Exception("repository has pending changes, can't 'install'")
+		else:
+			print "\nWARNING: repository has pending changes\n"
 
 	for frontend in settings['frontends']:
-		frontends.append(frontendBuilder.FrontendBuilder(frontend, loadSettings('frontend', frontend), repository.version()))
+		normalizedFrontendName = frontend.replace(".", "_")
+		builderModuleName = normalizedFrontendName + 'Builder'
+		builderClassName  = normalizedFrontendName.title() + 'Builder'
+
+		#print ("BUILD FRONTEND - module: " + builderModuleName + " , class: " + builderClassName)
+		builderModule  = __import__(builderModuleName)
+		builderClass   = getattr(builderModule, builderClassName)
+		builder = builderClass(frontend, loadSettings('frontend', frontend), repository.version())
+		#builder = frontendBuilder.FrontendBuilder(frontend, loadSettings('frontend', frontend), repository.version())
+		frontends.append(builder)
 
 	for backend in settings['backends']:
@@ -115,4 +127,5 @@ def usage (message):
 	print "build install --ALL"
 	print "build install debug --ALL"
+	print "build install debug development --ALL"
 	# print "build clean install debug --ALL"
 	print "build install debug --backends php python --frontends beta gamma"
@@ -123,5 +136,5 @@ def usage (message):
 
 def allFrontends ():
-	return ['beta', 'gamma',  'mobile']
+	return ['beta', 'gamma',  'gamma.mobile']
 
 def allBackends ():
@@ -135,4 +148,5 @@ def main ():
 
 	sys.path.append(os.path.join(scriptDir(), 'backends'))
+	sys.path.append(os.path.join(scriptDir(), 'frontends'))
 	currentRepository = repository.repositoryWithPath(projectBaseDir())
 
@@ -175,3 +189,3 @@ def main ():
 
 if __name__ == "__main__":
-    main()
+	main()