Changeset 31247

Timestamp:

2008-09-22 22:15:06 (4 months ago)

Author:

sunshine

Message:

Augmented CS/scripts/msi/Jamfile to warn about unassigned
WIN32LIBS.MSM_PATH variable only if one of the msi/msm targets are built,
rather than every single time Jam is invoked for any target. Also, the
warning is now issued only once per session (until 'jam clean' resets it).

Files:

• CS/trunk/scripts/msi/Jamfile (modified) (3 diffs)

CS/trunk/scripts/msi/Jamfile

@@ -10 +10 @@
 # This will become the MSI package version "build" number.
 MSI_VERSION_PACKAGE = 4 ;
+
+WIN32LIBS.MSM_PATH_DEFAULT = "$(BUILDTOP)/win32libs/mergemodules" ;
 
 # Set up file lists for MSVC binaries.
@@ -193 +195 @@
 rule GetWin32LibsMSMPath
 {
-  if "$(WIN32LIBS.MSM_PATH)" = ""
-  {
-    local guess = "$(TOP)/win32libs/mergemodules" ;
-    echo "No path for the cs-win32libs MSMs was set; I'm guessing $(guess)." ;
-    echo "If that is not what you want specify the WIN32LIBS.MSM_PATH Jam variable." ;
+  local guess ;
+  if ! $(WIN32LIBS.MSM_PATH)
+  {
+    guess = $(WIN32LIBS.MSM_PATH_DEFAULT) ;
     WIN32LIBS.MSM_PATH = $(guess) ;
   }
-  return $(WIN32LIBS.MSM_PATH) ;
+  local p = $(WIN32LIBS.MSM_PATH) ;
+  MkDir $(p) ;
+  if $(guess) 
+  {
+    Depends $(p) : [ WarnMsmPathNotSet $(guess) ] ;
+  }
+  CleanDir clean : $(p) ;
+  return $(p) ;
+}
+
+rule WarnMsmPathNotSet
+{
+  local guess = $(1) ;
+  local w = issue.warning ;
+  MakeLocate $(w) : $(LOCATE.MSI) ;
+  GUESS on $(w) = $(guess) ;
+  WarnMsmPathNotSet1 $(w) ;
+  return $(w) ;
+}
+
+actions WarnMsmPathNotSet1
+{
+  echo "*** No path for the cs-win32libs MSM's was set." >&2
+  echo "*** Defaulting to: $(GUESS)" >&2
+  echo "*** If default is undesirable, assign WIN32LIBS.MSM_PATH Jam variable." >&2
+  echo "dummy file" > $(1)
 }
 
@@ -210 +236 @@
   local msi = CS-$(kind)-$(arch).msi ;
 
+  Depends $(msi) : $(win32libs_msms) ;
   Depends $(msi) : mergemodules-neutral ;
   Depends $(msi) : mergemodules-$(arch) ;