(WIP) fixes in build scripts #1144

IETS3 · Jan 21, 2025 · 0cfe6ae · 0cfe6ae
1 parent 8e55fe5
commit 0cfe6ae
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/...ource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected] b/...ource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected]
@@ -2690,6 +2690,24 @@
                 </node>
               </node>
             </node>
+            <node concept="2Vbh7Z" id="6DrRQvKqVFa" role="2VaTZU">
+              <node concept="2pNNFK" id="6DrRQvKqZPC" role="2Vbh7K">
+                <property role="2pNNFO" value="property" />
+                <property role="qg3DV" value="true" />
+                <node concept="2pNUuL" id="6DrRQvKqZSW" role="2pNNFR">
+                  <property role="2pNUuO" value="name" />
+                  <node concept="2pMdtt" id="6DrRQvKqZSX" role="2pMdts">
+                    <property role="2pMdty" value="build.jna.library.path" />
+                  </node>
+                </node>
+                <node concept="2pNUuL" id="6DrRQvKqZWh" role="2pNNFR">
+                  <property role="2pNUuO" value="location" />
+                  <node concept="2pMdtt" id="6DrRQvKqZWi" role="2pMdts">
+                    <property role="2pMdty" value="${artifacts.mps}/lib/jna" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="2VaTY3" id="5eJiSDhB5oI" role="2VaTZU" />
             <node concept="2Vbh7Z" id="3BExUgsKUkr" role="2VaTZU">
               <node concept="2pNNFK" id="3BExUgsKUuU" role="2Vbh7K">
@@ -3251,6 +3269,16 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2pNNFK" id="6OON6YVXP4c" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="6OON6YVXP4d" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="6OON6YVXP4e" role="2pMdts">
+                        <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="2pNNFK" id="oY$DTc6Q1K" role="3o6s8t">
                     <property role="2pNNFO" value="arg" />
                     <property role="qg3DV" value="true" />

diff --git a/...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -15295,7 +15295,7 @@
       <ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
       <node concept="NbPM2" id="5iD3V$BSj$B" role="1psgkv">
         <node concept="3Mxwew" id="yHjyt5yb1m" role="3MwsjC">
-          <property role="3MwjfP" value="-Xss2048k -Xmx4096m " />
+          <property role="3MwjfP" value="-Xss2048k -Xmx4096m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5072" />
         </node>
       </node>
       <node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">
@@ -15380,15 +15380,6 @@
         </node>
       </node>
     </node>
-    <node concept="398rNT" id="7OQaAJRI74I" role="1l3spd">
-      <property role="TrG5h" value="dependencies.mbeddr.platform" />
-      <node concept="398BVA" id="7OQaAJRI74J" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74E" resolve="dependencies.root" />
-        <node concept="2Ry0Ak" id="7OQaAJRI74K" role="iGT6I">
-          <property role="2Ry0Am" value="com.mbeddr.platform" />
-        </node>
-      </node>
-    </node>
     <node concept="55IIr" id="7OQaAJRI72Q" role="auvoZ" />
     <node concept="1l3spV" id="7OQaAJRI72R" role="1l3spN">
       <node concept="m$_wl" id="5loVtKO0X_7" role="39821P">
@@ -15398,10 +15389,13 @@
     </node>
     <node concept="3b7kt6" id="7OQaAJRI73q" role="10PD9s" />
     <node concept="_l39y" id="7OQaAJRI72U" role="10PD9s" />
-    <node concept="2sgV4H" id="2U5AnekTjUj" role="1l3spa">
+    <node concept="2sgV4H" id="5XBogrkSN6B" role="1l3spa">
       <ref role="1l3spb" to="al5i:3AVJcIMlF8l" resolve="com.mbeddr.platform" />
-      <node concept="398BVA" id="2U5AnekTjVb" role="2JcizS">
-        <ref role="398BVh" node="7OQaAJRI74I" resolve="dependencies.mbeddr.platform" />
+      <node concept="398BVA" id="5XBogrkSN6C" role="2JcizS">
+        <ref role="398BVh" node="7OQaAJRI74E" resolve="dependencies.root" />
+        <node concept="2Ry0Ak" id="5XBogrkSN6D" role="iGT6I">
+          <property role="2Ry0Am" value="com.mbeddr.platform" />
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="2U5Anele3Kt" role="1l3spa">
@@ -15521,6 +15515,12 @@
         </node>
       </node>
     </node>
+    <node concept="398rNT" id="5XBogrkSN6F" role="1l3spd">
+      <property role="TrG5h" value="mps.macro.iets3.github.opensource.home" />
+      <node concept="398BVA" id="5XBogrkSN6G" role="398pKh">
+        <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
+      </node>
+    </node>
   </node>
 </model>