diff options
author | Ed Willink | 2015-04-29 11:48:23 +0000 |
---|---|---|
committer | Ed Willink | 2015-04-29 14:16:52 +0000 |
commit | 445294f7b9491fa6ef6a4e3b7ff22b15444abb04 (patch) | |
tree | 2caaef6c5168a57b396e1b4d82b6fbe91b080b34 /releng | |
parent | 3653aa496862f4fd05388688dc42bac196f3aa63 (diff) | |
download | org.eclipse.qvtd-445294f7b9491fa6ef6a4e3b7ff22b15444abb04.tar.gz org.eclipse.qvtd-445294f7b9491fa6ef6a4e3b7ff22b15444abb04.tar.xz org.eclipse.qvtd-445294f7b9491fa6ef6a4e3b7ff22b15444abb04.zip |
[445105] Fix references from QVTbaseLibrary to OCL AS models
Diffstat (limited to 'releng')
-rw-r--r-- | releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTbaseLibrary Models.launch (renamed from releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTdStdib Model.launch) | 2 | ||||
-rw-r--r-- | releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTbaseLibraryModels.mwe2 (renamed from releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdStdlibModel.mwe2) | 26 | ||||
-rw-r--r-- | releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 | 20 | ||||
-rw-r--r-- | releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 | 2 |
4 files changed, 41 insertions, 9 deletions
diff --git a/releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTdStdib Model.launch b/releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTbaseLibrary Models.launch index fe0760184..8a912d7e3 100644 --- a/releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTdStdib Model.launch +++ b/releng/org.eclipse.qvtd.build/.launches/Generate QVTd QVTbaseLibrary Models.launch @@ -8,7 +8,7 @@ <listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/qvtd/build/mwe2/GenerateQVTdStdlibModel.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/qvtd/build/mwe2/GenerateQVTbaseLibraryModels.mwe2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.qvtd.build"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdStdlibModel.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTbaseLibraryModels.mwe2 index a6dfead6a..cdcd7dce1 100644 --- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdStdlibModel.mwe2 +++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTbaseLibraryModels.mwe2 @@ -11,7 +11,7 @@ * * Run As->MWE2 Workflow to regenerate the pivot model. *******************************************************************************/ -module GenerateQVTdStdlibModel +module GenerateQVTbaseLibraryModels import org.eclipse.ocl.examples.build.utilities.* import org.eclipse.ocl.examples.build.xtend.* @@ -33,18 +33,30 @@ Workflow { bean = GenModelSetup { resourceSet = resourceSet } component = GenerateOCLstdlibXtend { resourceSet = resourceSet projectName = "${sourceName}" - modelFile = "model/QVTd-1.3.oclstdlib" - uri = "http://www.eclipse.org/qvt/2015/QVTdLibrary" - ecoreFile = "/org.eclipse.qvtd.pivot.qvtbase/model-gen/qvtdstdlib.ecore" + modelFile = "model/QVTbaseLibrary.oclstdlib" + uri = "http://www.eclipse.org/qvt/2015/QVTbaseLibrary" + ecoreFile = "/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbaseLibrary.ecore" javaFolder = "/org.eclipse.qvtd.pivot.qvtbase/emf-gen" javaPackageName = "org.eclipse.qvtd.pivot.qvtbase.model" - javaClassName = "QVTdStdlib" + javaClassName = "QVTbaseLibrary" + generatedClassNameMap = { + from = "http://www.eclipse.org/ocl/2015/Pivot" + to = "org.eclipse.ocl.pivot.model.OCLmetamodel" + } + generatedClassNameMap = { + from = "http://www.eclipse.org/ocl/2015/Library" + to = "org.eclipse.ocl.pivot.model.OCLstdlib" + } + generatedClassNameMap = { + from = "http://www.eclipse.org/qvt/2015/QVTbase" + to = "org.eclipse.qvtd.pivot.qvtbase.model.QVTbaseMetamodel" + } } component = GenerateModel { resourceSet = resourceSet skipOnErrors = true - genModel = "/${sourceName}/model/qvtdstdlib.genmodel" + genModel = "/${sourceName}/model/QVTbaseLibrary.genmodel" } component = Model2tablesGenerator { resourceSet = resourceSet - genModelFile = "/${sourceName}/model/qvtdstdlib.genmodel" + genModelFile = "/${sourceName}/model/QVTbaseLibrary.genmodel" genOCLstdlib = true } } diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 index d4748981c..7b47cd132 100644 --- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 +++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 @@ -39,6 +39,26 @@ Workflow { modelPackageName = "org.eclipse.qvtd.pivot.qvtbase" // visitorPackageName = "org.eclipse.qvtd.pivot.qvtbase.util" } + component = GenerateOCLmetamodelXtend { //resourceSet = resourceSet + projectName = "org.eclipse.qvtd.pivot.qvtbase" + modelFile = "model/QVTbase.ecore" + uri = "http://www.eclipse.org/qvt/2015/QVTbase" + javaFolder = "emf-gen" + javaPackageName = "org.eclipse.qvtd.pivot.qvtbase.model" + javaClassName = "QVTbaseMetamodel" + generatedClassNameMap = { + from = "http://www.eclipse.org/ocl/2015/Pivot" + to = "org.eclipse.ocl.pivot.model.OCLmetamodel" + } + generatedClassNameMap = { + from = "http://www.eclipse.org/ocl/2015/Library" + to = "org.eclipse.ocl.pivot.model.OCLstdlib" + } +// generatedClassNameMap = { +// from = "http://www.eclipse.org/qvt/2015/QVTbase" +// to = "org.eclipse.qvtd.pivot.qvtbase.model.QVTbaseMetamodel" +// } + } component = @SubGenerateASModel { resourceSet = resourceSet projectName = "org.eclipse.qvtd.pivot.qvtcorebase" modelName = "QVTcoreBase" diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 index 240df28fd..ee574b0ba 100644 --- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 +++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdAll.mwe2 @@ -17,7 +17,7 @@ module GenerateQVTdAll */ Workflow { component = @GenerateQVTdASModels {} - component = @GenerateQVTdStdlibModel {} + component = @GenerateQVTbaseLibraryModels {} component = @GenerateQVTdScheduleModels {} component = @GenerateQVTdCSModels {} component = @GenerateQVTdCGModels {} |