[Mobies-commit] [commit] r3978 - in UDM/trunk: . WiX

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Dec  1 15:59:00 2011
New Revision: 3978

Log:
error checking

Modified:
   UDM/trunk/WiX/build_msi.py
   UDM/trunk/make.msbuild

Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py	Thu Dec  1 15:58:49 2011	(r3977)
+++ UDM/trunk/WiX/build_msi.py	Thu Dec  1 15:59:00 2011	(r3978)
@@ -35,6 +35,10 @@
 def adjacent_file(file):
     return os.path.join(os.path.dirname(__file__), file)
 
+def build_packed(args):
+    sourcedir, arch, msi = args
+    build(sourcedir, arch, msi)
+
 def build(sourcedir, arch, msi=False):
     def get_wixobj(file):
         return os.path.splitext(file)[0] + ('_x64' if arch == 'x64' else '') + ".wixobj"
@@ -56,6 +60,8 @@
     import glob
     sources = glob.glob(sourcedir + '*.wxi') + glob.glob(sourcedir + '*.wxs')
     sources = [source for source in sources if source.find('Udm_inc.wxi') == -1]
+    if len(sources) == 0:
+        raise Exception("0 sources found in " + sourcedir)
 
     defines = [('UDM_3RDPARTY_PATH',  os.environ['UDM_3RDPARTY_PATH']),
                ('GREAT_PATH',  os.environ['GREAT_PATH'])]
@@ -95,20 +101,26 @@
         import glob
         import os.path
         files = [os.path.dirname(wxs) for wxs in glob.glob(os.path.join(os.path.dirname(__file__ ), '*/*.wxs'))]
+        if len(files) == 0:
+            raise Exception("0 sources found in " + os.path.dirname(__file__ ))
     import multiprocessing
     pool = multiprocessing.Pool()
+    jobs = []
     for file in files:
         for arch in arches:
             print 'Building ' + file + ' ' + arch
-            #build(file, arch)
-            pool.apply_async(build, (file, arch))
+            jobs.append(pool.apply_async(build, (file, arch)))
     pool.close()
     pool.join()
+    for job in jobs:
+        job.get()
 
     if options.msi or len(args) == 0:
-        import multiprocessing
+        jobs = []
         pool = multiprocessing.Pool()
         for arch in arches:
-            pool.apply_async(build, ('', arch, True))
+            jobs.append(pool.apply_async(build, ('', arch, True)))
         pool.close()
         pool.join()
+        for job in jobs:
+            job.get()

Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild	Thu Dec  1 15:58:49 2011	(r3977)
+++ UDM/trunk/make.msbuild	Thu Dec  1 15:59:00 2011	(r3978)
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <Target Name="CheckEnv" DependsOnTargets="CheckEnvGme;CheckEnvUdm">
+    <Error Text="UDM_3RDPARTY_PATH='$(UDM_3RDPARTY_PATH)' doesn't exist" Condition="!Exists('$(UDM_3RDPARTY_PATH)')"/>
     <Error Text="JDK_PATH='$(JDK_PATH)' doesn't exist" Condition="!Exists('$(JDK_PATH)')"/>
   </Target>