[commit] r1634 - in trunk: Install Install/Build Paradigms/MetaGME Paradigms/MetaGME/Paradigm Tests/GPyUnit

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Oct 14 13:59:39 2011
New Revision: 1634

Log:
Move GME models to GME_ROOT/Paradigms/MetaGME like the installed version of GME

Added:
   trunk/Paradigms/MetaGME/MetaGME-model.xme
      - copied, changed from r1632, trunk/Paradigms/MetaGME/Paradigm/MetaGME-model.xme
   trunk/Paradigms/MetaGME/MetaGME.xmp
      - copied, changed from r1632, trunk/Paradigms/MetaGME/Paradigm/MetaGME.xmp
Deleted:
   trunk/Paradigms/MetaGME/Paradigm/MetaGME-model.xme
   trunk/Paradigms/MetaGME/Paradigm/MetaGME.xmp
Modified:
   trunk/Install/Build/build.py
   trunk/Install/GME.wxs
   trunk/Install/GME_dyn.wxi
   trunk/Tests/GPyUnit/GME_371.py
   trunk/Tests/GPyUnit/test_parser.py

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Oct 14 12:22:43 2011	(r1633)
+++ trunk/Install/Build/build.py	Fri Oct 14 13:59:39 2011	(r1634)
@@ -162,7 +162,7 @@
 
 def generate_meta_files():
     "Generate meta files (mta/mga)"
-    meta_root = os.path.join(GME_ROOT, "Paradigms", "MetaGME", "Paradigm")
+    meta_root = os.path.join(GME_ROOT, "Paradigms", "MetaGME")
     meta_file = os.path.join(meta_root, "MetaGME.xmp")
     tools.xmp2mta(meta_file, "MetaGME")
     meta_file = os.path.join(meta_root, "MetaGME-model.xme")

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Fri Oct 14 12:22:43 2011	(r1633)
+++ trunk/Install/GME.wxs	Fri Oct 14 13:59:39 2011	(r1634)
@@ -1110,9 +1110,9 @@
 
       <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
         <Component Id="MetaParadigmFiles" Guid="18535c6e-aeff-4e89-b262-f3eb0a7854ee">
-          <File Id="MetaGME.xmp" Name="MetaGME.xmp" KeyPath="yes" Source="..\Paradigms\MetaGME\Paradigm\MetaGME.xmp" />
-          <File Id="MetaGME_model.xme" Name="MetaGME-model.xme" Source="..\Paradigms\MetaGME\Paradigm\MetaGME-model.xme" />
-          <File Id="MetaGME_model.mga" Name="MetaGME-model.mga" Source="..\Paradigms\MetaGME\Paradigm\MetaGME-model.mga" />
+          <File Id="MetaGME.xmp" Name="MetaGME.xmp" KeyPath="yes" Source="..\Paradigms\MetaGME\MetaGME.xmp" />
+          <File Id="MetaGME_model.xme" Name="MetaGME-model.xme" Source="..\Paradigms\MetaGME\MetaGME-model.xme" />
+          <File Id="MetaGME_model.mga" Name="MetaGME-model.mga" Source="..\Paradigms\MetaGME\MetaGME-model.mga" />
         </Component>
       </DirectoryRef>
 

Modified: trunk/Install/GME_dyn.wxi
==============================================================================
--- trunk/Install/GME_dyn.wxi	Fri Oct 14 12:22:43 2011	(r1633)
+++ trunk/Install/GME_dyn.wxi	Fri Oct 14 13:59:39 2011	(r1634)
@@ -1,6 +1,6 @@
 <!-- DO NOT EDIT THIS FILE. WILL BE REGENERATED BY THE BUILD SCRIPTS -->
 <Include>
-   <?define VERSIONSTR='10.10.11' ?>
+   <?define VERSIONSTR='11.10.14' ?>
    <?define GUIDSTRMETAGME='{9D3F9884-FE60-409C-8FC1-45789193989B}' ?>
    <?define GUIDSTRHFSM='{757682DE-E57F-4003-9A7E-8EE5C0368980}' ?>
    <?define GUIDSTRSF='{A47F17D5-E360-4395-8351-AE3A1A843468}' ?>

Copied and modified: trunk/Paradigms/MetaGME/MetaGME-model.xme (from r1632, trunk/Paradigms/MetaGME/Paradigm/MetaGME-model.xme)
==============================================================================

Copied and modified: trunk/Paradigms/MetaGME/MetaGME.xmp (from r1632, trunk/Paradigms/MetaGME/Paradigm/MetaGME.xmp)
==============================================================================

Modified: trunk/Tests/GPyUnit/GME_371.py
==============================================================================
--- trunk/Tests/GPyUnit/GME_371.py	Fri Oct 14 12:22:43 2011	(r1633)
+++ trunk/Tests/GPyUnit/GME_371.py	Fri Oct 14 13:59:39 2011	(r1634)
@@ -4,7 +4,7 @@
 class TestParser(unittest.TestCase):
     def test_ParseMetaGME(self):
         testdir = os.path.dirname(os.path.abspath(__file__))
-        inputfile = testdir + r"\..\..\Paradigms\MetaGME\Paradigm\MetaGME-model.xme"
+        inputfile = os.environ['GME_ROOT'] + r"\Paradigms\MetaGME\MetaGME-model.xme"
         from pythoncom import com_error
         import win32com.client
         xme = win32com.client.DispatchEx("Mga.MgaParser")

Modified: trunk/Tests/GPyUnit/test_parser.py
==============================================================================
--- trunk/Tests/GPyUnit/test_parser.py	Fri Oct 14 12:22:43 2011	(r1633)
+++ trunk/Tests/GPyUnit/test_parser.py	Fri Oct 14 13:59:39 2011	(r1634)
@@ -4,7 +4,7 @@
 class TestParser(unittest.TestCase):
     def test_ParseMetaGME(self):
         testdir = os.path.dirname(os.path.abspath(__file__))
-        inputfile = testdir + r"\..\..\Paradigms\MetaGME\Paradigm\MetaGME-model.xme"
+        inputfile = os.environ['GME_ROOT'] + r"\Paradigms\MetaGME\MetaGME-model.xme"
         import win32com.client
         xme = win32com.client.DispatchEx("Mga.MgaParser")
         (paradigm, parversion, parguid, basename, ver) = xme.GetXMLInfo(inputfile)