silecs-codegen/src/xml/runTests.py → silecs-codegen/src/xml/fesa/fesa_7_3_0/generateSourceCode.py

@@ -14,37 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
+import fesa.fesa_3_0_0.generateSourceCode
 
-from test.testBase import *
+def genHSource(className, silecsRoot, fesaRoot, sourcePath,logTopics):
+    return fesa.fesa_3_0_0.generateSourceCode.genHSource(className, silecsRoot, fesaRoot, sourcePath,logTopics)
 
-import test.fesa.fillFESADeployUnitTest
-import test.fesa.generateFesaDesignTest
-import test.fesa.generateSourceCodeTest
-import migration.runTests
+def genCppSource(className, silecsRoot, fesaRoot, sourcePath,logTopics):
+    return fesa.fesa_3_0_0.generateSourceCode.genCppSource(className, silecsRoot, fesaRoot, sourcePath,logTopics)
 
-import test.general.iecommonTest
-import test.general.genplcsrcTest
-import test.general.genParamTest
-import test.general.genDuWrapperTest
-
-def runTests():
-    migration.runTests.runAllTests()
-    test.fesa.fillFESADeployUnitTest.runTests()
-    test.fesa.generateFesaDesignTest.runTests()
-    test.fesa.generateSourceCodeTest.runTests()
-    test.general.iecommonTest.runTests()
-    test.general.genParamTest.runTests()
-    test.general.genplcsrcTest.runTests()
-    test.general.genDuWrapperTest.runTests()
-
-
-    print "################################################"
-    print "# Test suite finished - no failures detected ! #"
-    print "################################################"
-
-    sys.exit(0)
-
-# ********************** module stand alone code **********************
-if __name__ == "__main__":
-    runTests()
+def genCppFiles(className, workspacePath, silecsDesignFilePath,logTopics={'errorlog': True}):
+    return fesa.fesa_3_0_0.generateSourceCode.genCppFiles(className, workspacePath, silecsDesignFilePath,logTopics)

silecs-codegen/src/xml/genduwrapper.py

@@ -43,13 +43,13 @@ def genClassHeader(workspacePath, deploy, design, funcGetSilecsDesignFilePath, f
         classDeclarations += genduwrappertemplate.getBlockClass(block,registerInitializerList,registerGetterSetter,registersDimentionsDeclaration,registersDeclaration)
     
     blockGetters = ""
-    sendRecvBlocks = genduwrappertemplate.getDeviceSendRecvBlocks(designClass.getBlockNodes())
+    sendRecvBlocks = genduwrappertemplate.getDeviceSendRecvBlocks(designClass.getBlockNodes(), designClass.customTypesXmlNode)
     for block in designClass.getDesignBlocks():
         blockGetters += genduwrappertemplate.getDeviceBlockGetterSetter(block)
 
     classDeclarations += genduwrappertemplate.getDeviceClass(blockGetters,sendRecvBlocks)
 
-    sendRecvBlocks = genduwrappertemplate.getControllerSendRecvBlocks(designClass.getBlockNodes())
+    sendRecvBlocks = genduwrappertemplate.getControllerSendRecvBlocks(designClass.getBlockNodes(), designClass.customTypesXmlNode)
     classDeclarations = genduwrappertemplate.getDesignClass(design.name, design.version)
     designWrapper = genduwrappertemplate.designFileTemplate.substitute({'designNameCapitalized' :  iecommon.capitalizeString(design.name),'designNameUpper' :  design.name.upper(),'classDeclarations' : classDeclarations})
 

silecs-codegen/src/xml/migration/FileUtils.py

@@ -50,13 +50,6 @@ def getFesaSourceFiles(fesaClassName, projectDir):
     for root, subdirs, files in os.walk(fesaCodeFolder):
         for file in files:
             if file.endswith(".cpp") or file.endswith(".h"):
-                print os.path.join(root,file)
+                print(os.path.join(root,file))
                 sourceFiles.append(os.path.join(root,file))
     return sourceFiles
-
-def replaceInFile(filePath,searchString,replaceWithString):
-    with open(filePath, 'r') as file :
-      filedata = file.read()
-    filedata = filedata.replace(searchString, replaceWithString)
-    with open(filePath, 'w') as file:
-      file.write(filedata)
\ No newline at end of file

silecs-codegen/src/xml/migration/ParseMigrationArgs.py

+
+from argparse import ArgumentParser
+
+def parse_arguments():
+    parser = ArgumentParser(description='Migration script')
+    parser.add_argument("silecsDocument", action="store", help="The SILECS document to migrate")
+    parser.add_argument("xmlSchema", action="store", help="Path to the new schema")
+    parser.add_argument("versionOld", action="store", help="old silecs version")
+    parser.add_argument("versionNew", action="store", help="new silecs version")
+    parser.add_argument('--backup', dest='createBackup', action='store_true')
+    parser.add_argument('--no-backup', dest='createBackup', action='store_false')
+    parser.set_defaults(createBackup=False)
+    
+    arguments = parser.parse_args()
+    return arguments