Added devcontainer

Author: asticode

.devcontainer/Dockerfile

@@ -0,0 +1,50 @@
+FROM debian:latest
+
+RUN apt-get update
+
+##
+# git
+##
+
+RUN apt-get install -y git nano
+
+##
+# srt
+##
+
+ARG SRT_VERSION
+                
+RUN apt-get install -y \
+    build-essential \
+    tclsh \
+    cmake \
+    pkg-config \
+    libssl-dev
+
+RUN mkdir -p /opt/srt \
+    && git clone https://github.com/Haivision/srt /opt/srt/src \
+    && cd /opt/srt/src \
+    && git checkout ${SRT_VERSION}
+
+RUN cd /opt/srt/src \
+    && ./configure --prefix=.. \
+    && make \
+    && make install
+
+##
+# go
+##
+
+ARG GO_VERSION
+
+RUN apt-get install -y wget
+RUN <<_EOF_ sh
+arch=$(dpkg --print-architecture)
+goArch="amd64"
+case \${arch} in
+    arm64) goArch="arm64" ;;
+esac
+wget -O /tmp/go.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-\${goArch}.tar.gz
+tar -C /opt -xzf /tmp/go.tar.gz
+_EOF_
+ENV PATH="$PATH:/opt/go/bin"

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+{
+	"build": {
+		"args": {
+			"SRT_VERSION": "v1.5.3",
+			"GO_VERSION": "1.25.3"
+		},
+		"dockerfile": "Dockerfile"
+	},
+	"containerEnv": {
+		"CGO_LDFLAGS": "-L/opt/srt/lib/",
+		"CGO_CFLAGS": "-I/opt/srt/include/",
+		"LD_LIBRARY_PATH": "/opt/srt/lib",
+		"PKG_CONFIG_PATH": "/opt/srt/lib/pkgconfig"
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools-extension-pack",
+				"golang.go"
+			],
+			"settings": {
+				"remote.autoForwardPorts": false
+			}
+		}
+	},
+	"mounts": [
+		"source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/root/.ssh,readonly,type=bind"
+	],
+	"name": "asticode/go-astisrt"
+}

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Test
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "test-github-actions" ]
   pull_request:
     branches: [ "master" ]
 
@@ -11,8 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        # Use macos-latest once latest version is compatible with libsrt 
-        os: [ubuntu-latest, macos-13]
+        os: [ubuntu-latest, macos-latest]
 
     env:
       LIBSRT_VERSION: v1.5.3
@@ -41,7 +40,14 @@ jobs:
     - if: ${{ steps.cache-libsrt.outputs.cache-hit != 'true' }}
       name: Install libsrt
       run: |
-        make install-srt srcPath=${{ env.LIBSRT_PATH }}/src version=${{ env.LIBSRT_VERSION }}
+        mkdir -p ${{ env.LIBSRT_PATH }}/src
+        cd ${{ env.LIBSRT_PATH }}/src
+        git clone https://github.com/Haivision/srt .
+        git checkout ${{ env.LIBSRT_VERSION }}
+        brew update cmake
+        ./configure --prefix=..
+        make
+        make install
 
     - name: Set environment variables
       run: |

.vscode/.gitignore

@@ -0,0 +1 @@
+settings.json

.vscode/c_cpp_properties.json

@@ -0,0 +1,11 @@
+{
+    "configurations": [
+        {
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/opt/srt/include"
+            ]
+        }
+    ],
+    "version": 4
+}

Makefile

@@ -1,29 +1,5 @@
-version = "v1.5.3"
-srcPath = "tmp/$(version)/src"
-currentDir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-
-install-srt:
-	rm -rf $(srcPath)
-	mkdir -p $(srcPath)
-	# cd $(srcPath) is necessary for windows build since otherwise git doesn't clone in the proper dir
-	cd $(srcPath) && git clone https://github.com/Haivision/srt .
-	cd $(srcPath) && git checkout $(version)
-	cd $(srcPath) && ./configure --prefix=.. $(configure)
-	cd $(srcPath) && make
-	cd $(srcPath) && make install
-
 generate:
 	go run internal/cmd/generate/options/main.go
 	go run internal/cmd/generate/static_consts/main.go
 	go run internal/cmd/generate/stats/main.go
-	go run internal/cmd/generate/wrap/main.go
-
-test-coverage:
-	go test -coverprofile cover.out github.com/asticode/go-astisrt/pkg
-	go tool cover -html=cover.out
-
-test-linux-build:
-	cd testdata/linux && docker build -t astisrt-test-linux .
-
-test-linux:
-	docker run -v ${currentDir}/testdata/linux/gocache:/opt/astisrt/tmp/linux/gocache -v ${currentDir}/testdata/linux/gopath:/opt/astisrt/tmp/linux/gopath -v ${currentDir}:/opt/astisrt/tmp/linux/gopath/src/github.com/asticode/go-astisrt astisrt-test-linux
+	go run internal/cmd/generate/wrap/main.go

README.md

@@ -249,14 +249,6 @@ s.Close()
 
 You can find the instructions to install `srtlib` [here](https://github.com/Haivision/srt/tree/master/docs/build).
 
-However if you don't feel like doing it manually you can use the following command:
-
-```sh
-$ make install-srt
-```
-
-`srtlib` will be built from source in a directory named `tmp` and located in you working directory.
-
 For your GO code to pick up `srtlib` dependency automatically, you'll need to add the following environment variables:
 
 (don't forget to replace `{{ path to your working directory }}` with the absolute path to your working directory)

internal/cmd/generate/options/main.go

@@ -13,8 +13,6 @@ import (
 	"unicode"
 )
 
-const version = "v1.5.3"
-
 var (
 	r1 = regexp.MustCompile("\\[`([\\w]+)`\\]")
 	r2 = regexp.MustCompile("`([\\w]+)`")
@@ -280,7 +278,7 @@ func main() {
 		log.Fatal(fmt.Errorf("main: getting working directory failed: %w", err))
 	}
 
-	opts, enums, err := options(dir)
+	opts, enums, err := options()
 	if err != nil {
 		log.Fatal(fmt.Errorf("main: getting options failed: %w", err))
 	}
@@ -312,10 +310,10 @@ const (
 	optionFilePositionEnum
 )
 
-func options(dir string) (opts []option, enums []enum, err error) {
+func options() (opts []option, enums []enum, err error) {
 	// Open doc
 	var f *os.File
-	if f, err = os.Open(filepath.Join(dir, "tmp", version, "src", "docs", "API", "API-socket-options.md")); err != nil {
+	if f, err = os.Open("/opt/srt/src/docs/API/API-socket-options.md"); err != nil {
 		err = fmt.Errorf("main: opening doc failed: %w", err)
 		return
 	}
@@ -386,7 +384,7 @@ scan:
 
 	// Read header
 	var b []byte
-	if b, err = os.ReadFile(filepath.Join(dir, "tmp", version, "include", "srt", "srt.h")); err != nil {
+	if b, err = os.ReadFile("/opt/srt/include/srt/srt.h"); err != nil {
 		err = fmt.Errorf("main: reading header failed: %w", err)
 		return
 	}

internal/cmd/generate/static_consts/main.go

@@ -10,8 +10,6 @@ import (
 	"text/template"
 )
 
-const version = "v1.5.3"
-
 var r = regexp.MustCompile(`\nstatic const ([^ ]+) ([^ ]+) =`)
 
 type staticConst struct {
@@ -53,7 +51,7 @@ func main() {
 		log.Fatal(fmt.Errorf("main: getting working directory failed: %w", err))
 	}
 
-	cs, err := staticConsts(dir)
+	cs, err := staticConsts()
 	if err != nil {
 		log.Fatal(fmt.Errorf("main: getting stats failed: %w", err))
 	}
@@ -73,10 +71,10 @@ func main() {
 	}
 }
 
-func staticConsts(dir string) (cs []staticConst, err error) {
+func staticConsts() (cs []staticConst, err error) {
 	// Read header
 	var b []byte
-	if b, err = os.ReadFile(filepath.Join(dir, "tmp", version, "include", "srt", "srt.h")); err != nil {
+	if b, err = os.ReadFile("/opt/srt/include/srt/srt.h"); err != nil {
 		err = fmt.Errorf("main: reading header failed: %w", err)
 		return
 	}

internal/cmd/generate/stats/main.go

@@ -13,8 +13,6 @@ import (
 	"unicode"
 )
 
-const version = "v1.5.3"
-
 var r1 = regexp.MustCompile(`struct CBytePerfMon\n\{([^\}]*)`)
 var r2 = regexp.MustCompile(`[\s]*([\w]+)[\s]*([\w]+);`)
 
@@ -119,7 +117,7 @@ func main() {
 		log.Fatal(fmt.Errorf("main: getting working directory failed: %w", err))
 	}
 
-	ss, err := stats(dir)
+	ss, err := stats()
 	if err != nil {
 		log.Fatal(fmt.Errorf("main: getting stats failed: %w", err))
 	}
@@ -139,10 +137,10 @@ func main() {
 	}
 }
 
-func stats(dir string) (ss []stat, err error) {
+func stats() (ss []stat, err error) {
 	// Read header
 	var b []byte
-	if b, err = os.ReadFile(filepath.Join(dir, "tmp", version, "include", "srt", "srt.h")); err != nil {
+	if b, err = os.ReadFile("/opt/srt/include/srt/srt.h"); err != nil {
 		err = fmt.Errorf("main: reading header failed: %w", err)
 		return
 	}