Merge pull request #26 from digitalgust/dev

merg github actions

Author: digitalgust

.github/workflows/github-actions-demo.yml

@@ -10,15 +10,31 @@ jobs:
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v4
+        with:
+          java-version: '8'
       - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
       - run: echo "🖥️ The workflow is now ready to test your code on the runner."
       - name: List files in the repository
         run: |
           ls ${{ github.workspace }}
       - run: echo "🍏 This job's status is ${{ job.status }}."
 
-      - run:  mkdir build
+      - run:  mkdir ${{ github.workspace }}/build
       - run:  cd build
       - run:  cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ${{ github.workspace }}/minijvm/c 
       - run:  cmake --build . 
       - run:  cmake --build . --target mini_jvm
+      - run:  ls -l
+
+#      - name: Run build jar
+#        run: |
+#          cd ${{ github.workspace }}/binary
+#          sh build_jar.sh
+#        working-directory: ${{ github.workspace }}/binary
+#      - name: Run build bin
+#        run: |
+#          cd ${{ github.workspace }}/binary
+#          sh build_mac_linux.sh
+#        working-directory: ${{ github.workspace }}/binary
+#      
+#      - run:  ${{ github.workspace }}/binary/centos_x64/mini_jvm -bootclasspath ${{ github.workspace }}/binary/lib/minijvm_rt.jar -cp ${{ github.workspace }}/binary/libex/minijvm_test.jar test.Foo3

.travis.yml

@@ -1,5 +1,5 @@
 ![](/doc/img/mini_jvm_64.png)  
-[![Build Status](https://travis-ci.org/digitalgust/miniJVM.svg?branch=master)](https://travis-ci.org/digitalgust/miniJVM)
+<img src="https://github.com/digitalgust/miniJVM/actions/workflows/github-actions-demo.yml/badge.svg"/>
 
 <span id="linkhome"/>   
 

README.md

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 echo "Requirement: jdk1.8+ jar javac "
 
@@ -8,27 +8,27 @@ JAR=jar
 
 # returns the JDK version.
 # 8 for 1.8.0_nn, 9 for 9-ea etc, and "no_java" for undetected
-function jdk_version() {
-  local result
-  local java_cmd
+jdk_version () {
+  result=""
+  java_cmd=""
   if [[ -n $(type -p java) ]]
   then
     java_cmd=java
   elif [[ (-n "$JAVA_HOME") && (-x "$JAVA_HOME/bin/java") ]]
   then
     java_cmd="$JAVA_HOME/bin/java"
   fi
-  local IFS=$'\n'
+  IFS=$'\n'
   # remove \r for Cygwin
-  local lines=$("$java_cmd" -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n')
+  lines=$("$java_cmd" -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n')
   if [[ -z $java_cmd ]]
   then
     result=no_java
   else
     for line in $lines; do
       if [[ (-z $result) && ($line = *"version \""*) ]]
       then
-        local ver=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
+        ver=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
         # on macOS, sed doesn't support '?'
         if [[ $ver = "1."* ]]
         then
@@ -44,7 +44,7 @@ function jdk_version() {
 
 
 
-function build_jar(){
+build_jar () {
     rm -rf $3/$1
     mkdir classes 
     find $2/java -name "*.java" >source.txt
@@ -102,5 +102,3 @@ echo "build ../mobile/assets/resfiles/ExApp.jar"
 $(build_jar ExApp.jar ../mobile/java/ExApp/src/main ../mobile/assets/resfiles "../mobile/assets/resfiles/minijvm_rt.jar" "../mobile/assets/resfiles/glfm_gui.jar:../mobile/assets/resfiles/xgui.jar")
 
 
-
-

binary/build_jar.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 
 #${GCCHOME} setup as: /usr/bin/gcc
@@ -47,6 +47,7 @@ echo "compile glfw_gui"
 CSRC="../desktop/glfw_gui/c"
 SRCLIST=`find ${CSRC} -type f -name "*.c"  -not -path "${CSRC}/cmake-*" -not -path "${CSRC}/.*"`
 #
+
 if [[ $UNAME == *$OSNAME* ]] 
 then
     ${GCC} -shared -fPIC -o ${LIBFILE} -I../minijvm/c/jvm -I${CSRC}/ -I${CSRC}/deps/include -L${CSRC}/deps/lib/${LIBDIR} -lpthread -lglfw3 -framework Cocoa -framework IOKit -framework OpenGL -framework CoreFoundation -framework CoreVideo $SRCLIST