Skip to content

Commit fbdbff9

Browse files
manuelesimimanuelesimi
committed
Remove local dependency on MPS extensions. Update languages and build script.
1 parent e959cbf commit fbdbff9

2 files changed

Lines changed: 21 additions & 23 deletions

File tree

‎build.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<property name="org.campagnelab.metaR" value="./" />
88
<property name="org.campagnelab.hta.results_dir" location="" />
99
<property name="org.campagnelab.goby.workbench.home" location="${basedir}/../NYoSh.core" />
10-
<property name="mps.extensions.home" location="${basedir}/../de.itemis.mps.extensions" />
1110
<property name="metaR_version" value="2.4.6" />
1211
<property name="textoutput_version" value="3.2" />
1312
<property name="ANTLR_version" value="1.2" />
@@ -25,7 +24,7 @@
2524
<property name="artifacts.mpsExecutionPlugin" location="${mps_home}" />
2625
<property name="artifacts.mpsJavaPlatform" location="${mps_home}" />
2726
<property name="artifacts.mpsTesting" location="${mps_home}" />
28-
<property name="artifacts.de.itemis.mps.extensions" location="${mps.extensions.home}/mps-richtext" />
27+
<property name="artifacts.de.itemis.mps.extensions" location="${mps_home}" />
2928
<property file="${artifacts.mps}/build.properties" prefix="import.mps" />
3029
<property file="${artifacts.org.campagnelab.TextOutput}/build.properties" prefix="import.org.campagnelab.TextOutput" />
3130
<property file="${artifacts.org.campagnelab.mps.UI}/build.properties" prefix="import.org.campagnelab.mps.UI" />
@@ -2654,16 +2653,16 @@
26542653
<target name="buildDependents" />
26552654

26562655
<target name="fetchDependencies">
2656+
<mkdir dir="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
2657+
<unzip src="${artifacts.org.campagnelab.mps.UI}/org.campagnelab.UI-${org.campagnelab.mps.UI.ui_version}.zip" dest="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
26572658
<mkdir dir="${build.tmp}/deps/ANTLR/ANTLR__dl__lbrace_ANTLR_version_rbrace_.zip" />
26582659
<unzip src="${artifacts.ANTLR}/ANTLR_${ANTLR.ANTLR_version}.zip" dest="${build.tmp}/deps/ANTLR/ANTLR__dl__lbrace_ANTLR_version_rbrace_.zip" />
2659-
<mkdir dir="${build.tmp}/deps/org.campagnelab.Logger/org.campagnelab.logger-_dl__lbrace_logger.version_rbrace_.zip" />
2660-
<unzip src="${artifacts.org.campagnelab.Logger}/org.campagnelab.logger-${org.campagnelab.Logger.logger.version}.zip" dest="${build.tmp}/deps/org.campagnelab.Logger/org.campagnelab.logger-_dl__lbrace_logger.version_rbrace_.zip" />
26612660
<mkdir dir="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip" />
26622661
<unzip src="${artifacts.XChart}/XChart_${XChart.XChart_version}.zip" dest="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip" />
26632662
<mkdir dir="${build.tmp}/deps/org.campagnelab.TextOutput/org.campagnelab.TextOutput-_dl__lbrace_textoutput_version_rbrace_.zip" />
26642663
<unzip src="${artifacts.org.campagnelab.TextOutput}/org.campagnelab.TextOutput-${org.campagnelab.TextOutput.textoutput_version}.zip" dest="${build.tmp}/deps/org.campagnelab.TextOutput/org.campagnelab.TextOutput-_dl__lbrace_textoutput_version_rbrace_.zip" />
2665-
<mkdir dir="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
2666-
<unzip src="${artifacts.org.campagnelab.mps.UI}/org.campagnelab.UI-${org.campagnelab.mps.UI.ui_version}.zip" dest="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
2664+
<mkdir dir="${build.tmp}/deps/org.campagnelab.Logger/org.campagnelab.logger-_dl__lbrace_logger.version_rbrace_.zip" />
2665+
<unzip src="${artifacts.org.campagnelab.Logger}/org.campagnelab.logger-${org.campagnelab.Logger.logger.version}.zip" dest="${build.tmp}/deps/org.campagnelab.Logger/org.campagnelab.logger-_dl__lbrace_logger.version_rbrace_.zip" />
26672666
<mkdir dir="${build.tmp}/deps/org.campagnelab.NYoSh/org.campagnelab.NYoSh-_dl__lbrace_nyosh_version_rbrace_.zip" />
26682667
<unzip src="${artifacts.org.campagnelab.NYoSh}/org.campagnelab.NYoSh-${org.campagnelab.NYoSh.nyosh_version}.zip" dest="${build.tmp}/deps/org.campagnelab.NYoSh/org.campagnelab.NYoSh-_dl__lbrace_nyosh_version_rbrace_.zip" />
26692668
</target>
@@ -2884,7 +2883,6 @@
28842883
<macro name="mps_home" path="${mps_home}" />
28852884
<macro name="org.campagnelab.hta.results_dir" path="${org.campagnelab.hta.results_dir}" />
28862885
<macro name="org.campagnelab.goby.workbench.home" path="${org.campagnelab.goby.workbench.home}" />
2887-
<macro name="mps.extensions.home" path="${mps.extensions.home}" />
28882886
</generate>
28892887
</target>
28902888

@@ -5096,6 +5094,8 @@
50965094
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
50975095
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
50985096
<fileset file="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip/XChart/languages/XChart/org.campagnelab.mps.XChart.jar" />
5097+
<fileset file="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip/UI/languages/org.campagnelab.ui.jar" />
5098+
<fileset file="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip/UI/languages/org.campagnelab.ui.code.jar" />
50995099
<fileset file="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip/XChart/lib/xchart-2.4.1-SNAPSHOT.jar" />
51005100
</classpath>
51015101
</javac>

‎solutions/build.plugins/models/build/plugins.mps‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,6 @@
215215
</node>
216216
</node>
217217
</node>
218-
<node concept="398rNT" id="1UrpUrLUcXs" role="1l3spd">
219-
<property role="TrG5h" value="mps.extensions.home" />
220-
<node concept="55IIr" id="1UrpUrLUcXt" role="398pKh">
221-
<node concept="2Ry0Ak" id="1UrpUrLUcXu" role="iGT6I">
222-
<property role="2Ry0Am" value=".." />
223-
<node concept="2Ry0Ak" id="6T2IikInnQx" role="2Ry0An">
224-
<property role="2Ry0Am" value="de.itemis.mps.extensions" />
225-
</node>
226-
</node>
227-
</node>
228-
</node>
229218
<node concept="2kB4xC" id="3gMg70bX6Gp" role="1l3spd">
230219
<property role="TrG5h" value="metaR_version" />
231220
<node concept="aVJcg" id="3gMg70bX6HN" role="aVJcv">
@@ -406,11 +395,8 @@
406395
</node>
407396
<node concept="2sgV4H" id="fjQrsdNobh" role="1l3spa">
408397
<ref role="1l3spb" to="90a9:2Xjt3l56m0V" resolve="de.itemis.mps.extensions" />
409-
<node concept="398BVA" id="fjQrsdNoqn" role="2JcizS">
410-
<ref role="398BVh" node="1UrpUrLUcXs" resolve="mps.extensions.home" />
411-
<node concept="2Ry0Ak" id="6T2IikInnVk" role="iGT6I">
412-
<property role="2Ry0Am" value="mps-richtext" />
413-
</node>
398+
<node concept="398BVA" id="2i6qROa4tVv" role="2JcizS">
399+
<ref role="398BVh" node="3gMg70bRmeS" resolve="mps_home" />
414400
</node>
415401
</node>
416402
<node concept="1l3spV" id="3gMg70bRmfC" role="1l3spN">
@@ -2940,6 +2926,18 @@
29402926
</node>
29412927
</node>
29422928
</node>
2929+
<node concept="1SiIV0" id="2i6qROad9ZX" role="3bR37C">
2930+
<node concept="3bR9La" id="2i6qROad9ZY" role="1SiIV1">
2931+
<property role="3bR36h" value="false" />
2932+
<ref role="3bR37D" node="3gMg70bRmfh" resolve="org.campagnelab.metar.tables" />
2933+
</node>
2934+
</node>
2935+
<node concept="1SiIV0" id="2i6qROad9ZZ" role="3bR37C">
2936+
<node concept="3bR9La" id="2i6qROada00" role="1SiIV1">
2937+
<property role="3bR36h" value="false" />
2938+
<ref role="3bR37D" to="ael0:5KK2jWpWo0e" resolve="org.campagnelab.ui" />
2939+
</node>
2940+
</node>
29432941
</node>
29442942
<node concept="1E1JtD" id="3vYuQ8LHEFz" role="2G$12L">
29452943
<property role="BnDLt" value="true" />

0 commit comments

Comments
 (0)