Skip to content

Commit

Permalink
add environment aarch64 forr #3331
Browse files Browse the repository at this point in the history
  • Loading branch information
@hqnghi88
hqnghi88 committed Mar 21, 2022
1 parent 0a73a1b commit 5faade0
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 37 deletions.
7 changes: 5 additions & 2 deletions msi.gama.headless/SimpleGUI.html
View file
Expand Up @@ -129,6 +129,7 @@ <h3>Create a new <code>Dialog</code> Widget</h3>
</tr>
<tr>
<td colspan=2>
<input type="button" id="exp_compile" value="Compile" onclick="compile()" disabled>
<input type="button" id="exp_launch" value="Launch" onclick="launch()" disabled>
<input type="button" id="exp_play" value="Play" onclick="play()" disabled>
<input type="button" id="exp_step" value="Step" onclick="dostep()" disabled>
Expand Down Expand Up @@ -298,6 +299,7 @@ <h3>Create a new <code>Dialog</code> Widget</h3>
$("#sk_open").prop("disabled", true);
$("#sk_close").prop("disabled", false);
$("#sk_exit").prop("disabled", false);
$("#exp_compile").prop("disabled", false);
$("#exp_launch").prop("disabled", false);
$('#errors').text('Socket connected!');
});
Expand All @@ -311,6 +313,7 @@ <h3>Create a new <code>Dialog</code> Widget</h3>
$("#btn_upload").prop("disabled", true);
$("#sk_close").prop("disabled", true);
$("#sk_exit").prop("disabled", true);
$("#exp_compile").prop("disabled", true);
$("#exp_launch").prop("disabled", true);
$("#exp_play").prop("disabled", true);
$("#exp_step").prop("disabled", true);
Expand All @@ -337,8 +340,8 @@ <h3>Create a new <code>Dialog</code> Widget</h3>
//setInterval(function(){
// socket.send(""); }, 100);
if (socket && socket.readyState === 1) {
socket.binaryType = 'string';
socket.send("compile@" + $('#gaml_path').val() + "@" + $('#exp_name').val());
// socket.binaryType = 'string';
socket.send("compile@" + model_path + "\\" + $('#gaml_path').val() + "@" + $('#exp_name').val());
socket.onmessage = function (event) {
exp_compiled = event.data;
console.log(exp_compiled);
Expand Down
16 changes: 9 additions & 7 deletions msi.gama.headless/src/msi/gama/headless/runtime/GamaWebSocketServer.java
View file
Expand Up @@ -83,14 +83,16 @@ public GamaWebSocketServer(int port, Application a) {
}

void deleteFolder(File file) {
for (File subFile : file.listFiles()) {
if (subFile.isDirectory()) {
deleteFolder(subFile);
} else {
subFile.delete();
if(file.listFiles()!=null) {
for (File subFile : file.listFiles()) {
if (subFile.isDirectory()) {
deleteFolder(subFile);
} else {
subFile.delete();
}
}
file.delete();
}
file.delete();
}

public Application getDefaultApp() {
Expand Down Expand Up @@ -129,7 +131,7 @@ public static void createSocketServer(final int port, final Application a) {

while (true) {
String in = sysin.readLine();
instance.broadcast(in);
// instance.broadcast(in);
if ("exit".equals(in)) {
instance.stop(1000);
break;
Expand Down
56 changes: 28 additions & 28 deletions msi.gama.parent/pom.xml
View file
Expand Up @@ -30,7 +30,10 @@
<url>http://buchen.github.io/maven-repo</url>
<layout>default</layout>
</pluginRepository>

<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
<pluginRepository>
<id>jzy3d-releases</id>
<name>Jzy3d Releases</name>
Expand Down Expand Up @@ -77,13 +80,6 @@
<goal>upload</goal>
</goals>
<configuration>
<rules>
<requireFilesSize>
<maxsize>50000</maxsize>
<minsize>90</minsize>
</requireFilesSize>
</rules>
<removeAll>true</removeAll>
<fromDir>${repo.path}</fromDir>
<includes>**</includes>
<toDir>${ftp.toDir}</toDir>
Expand Down Expand Up @@ -124,7 +120,7 @@
</repository>
<repository>
<id>xtext</id>
<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/</url>
<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down Expand Up @@ -256,7 +252,7 @@
<batik.version>1.7</batik.version>
<p2-maven.version>1.2.0-SNAPSHOT</p2-maven.version>
<jetty-maven.version>8.1.5.v20120716</jetty-maven.version>
<tycho.version>2.6.0</tycho.version>
<tycho.version>3.0.0-SNAPSHOT</tycho.version>
<jdk.version>17</jdk.version>
<project.version>1.8.2-SNAPSHOT</project.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -371,18 +367,7 @@
<useProjectSettings>false</useProjectSettings>
<generatedSourcesDirectory>${project.build.directory}</generatedSourcesDirectory>
<optimize>true</optimize>
<executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<debug>false</debug>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
<executionEnvironment>${jdk.version}</executionEnvironment>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -559,27 +544,42 @@
<arch>x86</arch>
</environment>
-->
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!-- obsolete on 1812
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
-->
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64le</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
<arch>aarch64</arch>
</environment>
</environments>
<executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
Expand Down

0 comments on commit 5faade0

Please sign in to comment.