[GME-commit] GMESRC/Install/Build GMEBuild.kpf,1.1,1.2 build.py,1.12,1.13 tools.py,1.27,1.28

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Install/Build
In directory escher:/tmp/cvs-serv26931/Install/Build

Modified Files:
	GMEBuild.kpf build.py tools.py 
Log Message:
Fixed problems with Dispatch-based drag&drop (python support)

CVS User: Peter Volgyesi, ISIS (volgy)

Index: GMEBuild.kpf
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Build/GMEBuild.kpf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEBuild.kpf	16 Feb 2006 22:14:17 -0000	1.1
--- GMEBuild.kpf	28 Feb 2006 19:57:06 -0000	1.2
***************
*** 1,6 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- Komodo Project File - DO NOT EDIT -->
! <project kpf_version="2" id="D501123A-99C8-45DF-A612-74CA83B098E4" name="GMEBuild">
  <preference-set id="">
  </preference-set>
  </project>
--- 1,12 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- Komodo Project File - DO NOT EDIT -->
! <project id="D501123A-99C8-45DF-A612-74CA83B098E4" name="GMEBuild" kpf_version="2">
  <preference-set id="">
  </preference-set>
+ <file url="build.py" id="F16E7F0B-AEED-4F66-A696-FDB9CDF784C3" name="build.py">
+ </file>
+ <file url="prefs.py" id="529C4DA3-A3B0-41C6-969B-787E76DCC0CA" name="prefs.py">
+ </file>
+ <file url="tools.py" id="D585E55D-4128-44EA-9D01-28155C0F6FD5" name="tools.py">
+ </file>
  </project>

Index: tools.py
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Build/tools.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tools.py	16 Feb 2006 22:14:17 -0000	1.27
--- tools.py	28 Feb 2006 19:57:06 -0000	1.28
***************
*** 58,62 ****
      else:
          list_arg = ""
!     cmd_line = "%s -9 -r %s %s" % (ZIP_PRG, list_arg, zipname)
      system(cmd_line, dirname)
  
--- 58,62 ----
      else:
          list_arg = ""
!     cmd_line = "%s -9 -r %s %s . >NUL" % (ZIP_PRG, list_arg, zipname)
      system(cmd_line, dirname)
  
***************
*** 93,97 ****
  	config_name  : name of the build configuration (e.g.: "Release")
      """
!     toolmsg("Compiling " + sln_path + " [" + project_name + "] (" + config_name + ") ")
      DTE = win32com.client.Dispatch("VisualStudio.DTE.7.1")
      DTE.Solution.Open( sln_path )
--- 93,99 ----
  	config_name  : name of the build configuration (e.g.: "Release")
      """
!     msg = "Cleaning and " * prefs['clean']
!     msg += "Compiling " + sln_path + " [" + project_name + "] (" + config_name + ") "
!     toolmsg(msg)
      DTE = win32com.client.Dispatch("VisualStudio.DTE.7.1")
      DTE.Solution.Open( sln_path )
***************
*** 134,138 ****
      extension.
      """
!     toolmsg("Parsing and registering" + xml_file + " (" + paradigm + ")")
      regsitrar = win32com.client.Dispatch( "MGA.MgaRegistrar" )
      regsitrar.RegisterParadigmFromData( "XML=" + xml_file, paradigm, 2 )
--- 136,140 ----
      extension.
      """
!     toolmsg("Parsing and registering " + xml_file + " (" + paradigm + ")")
      regsitrar = win32com.client.Dispatch( "MGA.MgaRegistrar" )
      regsitrar.RegisterParadigmFromData( "XML=" + xml_file, paradigm, 2 )

Index: build.py
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Build/build.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.py	16 Feb 2006 22:14:17 -0000	1.12
--- build.py	28 Feb 2006 19:57:06 -0000	1.13
***************
*** 20,26 ****
  GME_ROOT = os.path.normpath(os.path.abspath("../.."))
  
- 
- # ISvars: GMEVersionStr, GuidStrMetaGME, GuidStrSF, GuidStrUML, GuidStrHFSM
- 
  #
  # Build steps
--- 20,23 ----
***************
*** 162,166 ****
      tools.xmp2mta(meta_file, "MetaGME")
      meta_file = os.path.join(meta_root, "MetaGME-model.xme")
!     tools.xme2mga(sample_file, "MetaGME")
  
  
--- 159,163 ----
      tools.xmp2mta(meta_file, "MetaGME")
      meta_file = os.path.join(meta_root, "MetaGME-model.xme")
!     tools.xme2mga(meta_file, "MetaGME")
  
  
***************
*** 196,200 ****
  def build_msi():
      "Build InstallShield Project (msi)"
!     # TODO: load IS_vars
      tools.build_IS(os.path.join(GME_ROOT, "Install.isv"), "FullConfig", "Release", IS_vars)
  
--- 193,204 ----
  def build_msi():
      "Build InstallShield Project (msi)"
!     IS_vars = {}
!     # ISvars: , GuidStrMetaGME, GuidStrSF, GuidStrUML, GuidStrHFSM
! 
!     IS_vars["ProductVersion"] = prefs["version_string"]
!     IS_vars["GuidStrMetaGME"] = tools.query_GUID("MetaGME")
!     IS_vars["GuidStrSF"] = tools.query_GUID("SF")
!     IS_vars["GuidStrUML"] = tools.query_GUID("UML")
!     IS_vars["GuidStrHFSM"] = tools.query_GUID("HFSM")
      tools.build_IS(os.path.join(GME_ROOT, "Install.isv"), "FullConfig", "Release", IS_vars)
  
***************
*** 313,316 ****
--- 317,327 ----
      print usage
      sys.exit(2)
+     
+ prefs["version_string"] = ".".join([str(prefs["version_major"]),
+                                    str(prefs["version_minor"]),
+                                    str(prefs["version_patch"])])
+ 
+ print "Building GME version " + prefs["version_string"], prefs["release"] and "RELEASE" or "TEST"
+ 
  try:
      for i in range(len(build_steps)):