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
@@ -7,13 +7,13 @@ import json
 import shutil
 import pprint
 import codecs
 import itertools
 from collections   import deque
 
-import frontendBuilder
+#import frontendBuilder
 import repository
 
 pp = pprint.PrettyPrinter(indent=4, depth=4)
 
 #--------------------------------------------------------------------
 
@@ -72,29 +72,41 @@ def loadSettings (component, module):
 
 def assembleBackend (backend, frontends, versions):
         settings = loadSettings('backend', backend)
         
         builderModuleName = backend + 'Builder'
         builderClassName  = backend.capitalize() + 'Builder'
-
+        #print ("BUILD BACKENDS - module: " + builderModuleName + " , class: " + builderClassName)
         builderModule  = __import__(builderModuleName)
         builderClass   = getattr(builderModule, builderClassName)
         
         backendBuilder = builderClass(projectTargetDir(), frontends, versions, settings)
                 backendBuilder.run()
 
 #====================================================================
 
 def build (settings, repository):
         frontends = []
         
         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']:
                 assembleBackend(backend, frontends, settings['versions'])
 
 #--------------------------------------------------------------------
 
@@ -111,32 +123,34 @@ def usage (message):
         
         print
         # print "build clean"
         # print "build clean install"
         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"
         print "build install debug development --backends php python --frontends beta gamma gamma.mobile"
         exit(1)
 
 #--------------------------------------------------------------------
 
 def allFrontends ():
-        return ['beta', 'gamma',  'mobile']
+        return ['beta', 'gamma',  'gamma.mobile']
 
 def allBackends ():
         return ['php',  'python']
 
 #--------------------------------------------------------------------
 
 def main ():
         settings = {}
         parameters = list(itertools.islice(sys.argv, 1, None))
 
         sys.path.append(os.path.join(scriptDir(), 'backends'))
+        sys.path.append(os.path.join(scriptDir(), 'frontends'))
         currentRepository = repository.repositoryWithPath(projectBaseDir())
 
         clean()
         versions = list(itertools.takewhile(lambda x: not x.startswith('--'), parameters))
                 settings['versions']  = versions;       #['debug', 'install', 'development']
         parameters = deque(itertools.dropwhile(lambda x: not x.startswith('--'), parameters))
@@ -171,7 +185,7 @@ def main ():
                 build(settings, currentRepository)
         else:
                 usage("Suggestions on how to call the 'build' script:")
 
 
 if __name__ == "__main__":
-    main()
+        main()