Merge pull request #5 from kristjanvalur/master

Restructure, add Github actions

Author: kristjanvalur

.gitattributes

@@ -0,0 +1,6 @@
+# use unix lf line ending for everything except windows bat files
+* text=auto eol=lf
+*.asm text eol=lf
+*.h text eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

.github/workflows/test.yml

@@ -0,0 +1,74 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  test-linux-x86:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - platformflags: ""
+            name: "AMD64"
+          - platformflags: -m32
+            name: "i386"
+    name: test-linux-x86 (${{matrix.name}})
+    env:
+      PLATFORMFLAGS: ${{matrix.platformflags}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: install multilib
+      run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib 
+    - name: make
+      run: make && make test
+      
+  test-linux-arm:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+       include:
+        - arch: arm
+          emulator: qemu-arm
+          abi: arm-linux-gnueabi
+        - arch: aarch64
+          emulator: qemu-aarch64
+          abi: aarch64-linux-gnu
+    name: test-linux-arm (${{matrix.arch}})
+    env:
+      PLATFORM_PREFIX: ${{matrix.abi}}-
+      EMULATOR: ${{matrix.emulator}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: install qemu
+      run: sudo apt-get install --no-install-recommends -y qemu-user 
+    - name: install abi lib
+      run: sudo apt-get install --no-install-recommends -y gcc-${{matrix.abi}} g++-${{matrix.abi}} 
+    - name: make 
+      run: make && make test
+      
+  test-windows:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        platform: [x86, x64, ARM, ARM64]
+        include:
+          - platform: x86
+            folder: Win32
+            native: yes
+          - platform: x64
+            folder: x64
+            native: yes
+    steps:
+      - uses: actions/checkout@v2
+      - name: Add msbuild to PATH
+        uses: microsoft/[email protected]
+      - name: build
+        run: msbuild.exe vs2019\stackman.sln /p:Platform=${{matrix.platform}}
+      - name: test
+        if: ${{ matrix.native == 'yes' }}
+        run: vs2019\${{matrix.folder}}\Debug\test.exe

.travis.yml

@@ -1,6 +1,6 @@
 
 
-CPPFLAGS += -Isrc $(PLATFORMFLAGS)
+CPPFLAGS += -Istackman $(PLATFORMFLAGS)
 CFLAGS += -fPIC -g $(PLATFORMFLAGS)
 CXXFLAGS += -fPIC -g $(PLATFORMFLAGS)
 LDFLAGS += -L$(LIB) -g $(PLATFORMFLAGS)
@@ -29,7 +29,7 @@ LIB := lib/$(ABI)
 
 all: $(LIB)/libstackman.a
 
-obj = src/stackman.o src/stackman_s.o
+obj = stackman/stackman.o stackman/stackman_s.o
 
 
 $(LIB)/libstackman.a: lib $(obj)
@@ -40,7 +40,7 @@ lib:
 	mkdir -p $(LIB) bin
 
 clean:
-	rm -f src/*.o tests/*.o
+	rm -f stackman/*.o tests/*.o
 	rm -f bin/* 
 	rm -rf tmp
 

Makefile

@@ -114,7 +114,7 @@ platforms as they come along.
 
 ## Cross-compilation
 Linux on x86-64 can be used to cross compile for x86 and ARM targets.  This is most useful to generate assembly code, e.g. when compiling
-src/platform/gen_asm.c
+stackman/platform/gen_asm.c
  - x86 requires the -m32 flag to compilers and linkers.
  - arm32 requires to use the arm-linux-gnueabi-* tools, including cc and linker
  - aarch64 requires the aarch64-linux-gnu-* tools.
@@ -138,4 +138,4 @@ platforms may need to be done independently.
  - install **gcc-aarch64-linux-gnu** and **g++-aarch64-linux-gnu**
  - install __qemu-user__ for hardware emulation 
  - *compile* using `aarch64-linux-gnu-gcc`
- - *make* using `make PLATFORM_PREFIX=aarch64-linux-gnu- EMULATOR=qemu-arm64 test`
+ - *make* using `make PLATFORM_PREFIX=aarch64-linux-gnu- EMULATOR=qemu-aarch64 test`

README.md

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# this script compiles and runs src/abiname.c which merely prints
+# this script compiles and runs stackman/abiname.c which merely prints
 # out the name of the abi.  This can be used by makefiles to identify
 # the correct library path to use to link the library
 # Instead of just compiling and running, we will use the provided compiler
@@ -16,7 +16,7 @@ tmp=$(mktemp "${here}/tmp/abinameXXX.c")
 #1 create the preprocessed file
 CC=${1:-cc}
 CFLAGS=${2:-}
-${CC} ${CFLAGS} -E -I "${here}/src" -o "${tmp}" "${here}/src/abiname.c"
+${CC} ${CFLAGS} -E -o "${tmp}" "${here}/stackman/abiname.c"
 #2 compile resulting file
 cc -o "${tmp}.out" "${tmp}"
 #3 run it