Compare commits
1 Commits
master
...
98829640f4
| Author | SHA1 | Date | |
|---|---|---|---|
|
98829640f4
|
3
.gitignore
vendored
3
.gitignore
vendored
@@ -8,6 +8,5 @@
|
|||||||
ifxmetrics.config.json
|
ifxmetrics.config.json
|
||||||
|
|
||||||
.hemttout
|
.hemttout
|
||||||
influxdb/data
|
influxdb
|
||||||
influxdb/config
|
|
||||||
releases
|
releases
|
||||||
@@ -10,7 +10,6 @@ git_hash=6 # Default: 8
|
|||||||
[files]
|
[files]
|
||||||
include=[
|
include=[
|
||||||
"ifxmetrics.config.example.json",
|
"ifxmetrics.config.example.json",
|
||||||
# "ifxmetrics.config.json", # used for copying during debugging
|
|
||||||
"LICENSE",
|
"LICENSE",
|
||||||
"README.md",
|
"README.md",
|
||||||
"mod.cpp",
|
"mod.cpp",
|
||||||
|
|||||||
21
README.md
21
README.md
@@ -179,19 +179,13 @@ Run this from the project root.
|
|||||||
docker pull x1unix/go-mingw:1.20
|
docker pull x1unix/go-mingw:1.20
|
||||||
|
|
||||||
# Compile x64 Windows DLL
|
# Compile x64 Windows DLL
|
||||||
docker run --rm -it -v ${PWD}/extension/IFXMetrics:/go/work -w /go/work -e GOARCH=amd64 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./dist/ifxmetrics_x64.dll -buildmode=c-shared -ldflags "-w -s -X main.EXTENSION_VERSION=$IFXMETRICS_BUILD_VER" ./cmd
|
docker run --rm -it -v ${PWD}:/go/work -w /go/work -e GOARCH=amd64 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./ifxmetrics_x64.dll -buildmode=c-shared -ldflags "-w -s -X main.EXTENSION_VERSION=`"$IFXMETRICS_BUILD_VER`"" ./extension/cmd
|
||||||
|
|
||||||
Move-Item -Path ./extension/IFXMetrics/dist/ifxmetrics_x64.dll -Destination ./ifxmetrics_x64.dll -Force
|
|
||||||
|
|
||||||
# Compile x86 Windows DLL
|
# Compile x86 Windows DLL
|
||||||
docker run --rm -it -v ${PWD}/extension/IFXMetrics:/go/work -w /go/work -e GOARCH=386 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./dist/ifxmetrics.dll -buildmode=c-shared -ldflags "-w -s -X main.EXTENSION_VERSION=$IFXMETRICS_BUILD_VER" ./cmd
|
docker run --rm -it -v ${PWD}:/go/work -w /go/work -e GOARCH=386 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./ifxmetrics.dll -buildmode=c-shared -ldflags "-w -s -X main.EXTENSION_VERSION=`"$IFXMETRICS_BUILD_VER`"" ./extension/cmd
|
||||||
|
|
||||||
Move-Item -Path ./extension/IFXMetrics/dist/ifxmetrics.dll -Destination ./ifxmetrics.dll -Force
|
|
||||||
|
|
||||||
# Compile x64 Windows EXE
|
# Compile x64 Windows EXE
|
||||||
docker run --rm -it -v ${PWD}/extension/IFXMetrics:/go/work -w /go/work -e GOARCH=amd64 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./dist/ifxmetrics_x64.exe -ldflags "-w -s -X main.EXTENSION_VERSION=$IFXMETRICS_BUILD_VER" ./cmd
|
docker run --rm -it -v ${PWD}:/go/work -w /go/work -e GOARCH=amd64 -e CGO_ENABLED=1 x1unix/go-mingw:1.20 go build -o ./ifxmetrics_x64.exe -ldflags "-w -s -X main.EXTENSION_VERSION=`"$IFXMETRICS_BUILD_VER`"" ./extension/cmd
|
||||||
|
|
||||||
Move-Item -Path ./extension/IFXMetrics/dist/ifxmetrics_x64.exe -Destination ./ifxmetrics_x64.exe -Force
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### EXTENSION: COMPILING FOR LINUX
|
### EXTENSION: COMPILING FOR LINUX
|
||||||
@@ -202,15 +196,10 @@ Run this from the project root.
|
|||||||
docker build -t indifox926/build-a3go:linux-so -f ./build/Dockerfile.build .
|
docker build -t indifox926/build-a3go:linux-so -f ./build/Dockerfile.build .
|
||||||
|
|
||||||
# Compile x64 Linux .so
|
# Compile x64 Linux .so
|
||||||
docker run --rm -it -v ${PWD}/extension/IFXMetrics:/app -e GOOS=linux -e GOARCH=amd64 -e CGO_ENABLED=1 indifox926/build-a3go:linux-so go build -o ./dist/ifxmetrics_x64.so -linkshared -ldflags "-w -s -X main.EXTENSION_VERSION=${IFXMETRICS_BUILD_VER}" ./cmd
|
docker run --rm -it -v ${PWD}:/app -e GOOS=linux -e GOARCH=amd64 -e CGO_ENABLED=1 indifox926/build-a3go:linux-so go build -o ./ifxmetrics_x64.so -linkshared -ldflags "-w -s -X main.EXTENSION_VERSION=${IFXMETRICS_BUILD_VER}" ./extension/cmd
|
||||||
|
|
||||||
Move-Item -Path ./extension/IFXMetrics/dist/ifxmetrics_x64.so -Destination ./ifxmetrics_x64.so -Force
|
|
||||||
|
|
||||||
# Compile x86 Linux .so
|
# Compile x86 Linux .so
|
||||||
docker run --rm -it -v ${PWD}/extension/IFXMetrics:/app -e GOOS=linux -e GOARCH=386 -e CGO_ENABLED=1 indifox926/build-a3go:linux-so go build -o ./dist/ifxmetrics.so -linkshared -ldflags "-w -s -X main.EXTENSION_VERSION=${IFXMETRICS_BUILD_VER}" ./cmd
|
docker run --rm -it -v ${PWD}:/app -e GOOS=linux -e GOARCH=386 -e CGO_ENABLED=1 indifox926/build-a3go:linux-so go build -o ./ifxmetrics.so -linkshared -ldflags "-w -s -X main.EXTENSION_VERSION=${IFXMETRICS_BUILD_VER}" ./extension/cmd
|
||||||
|
|
||||||
Move-Item -Path ./extension/IFXMetrics/dist/ifxmetrics.so -Destination ./ifxmetrics.so -Force
|
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### ADDON: COMPILE USING HEMTT
|
### ADDON: COMPILE USING HEMTT
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
params [
|
params ["_allUserInfos", [], [[]]];
|
||||||
["_allUserInfos", [], [[]]]
|
|
||||||
];
|
|
||||||
|
|
||||||
private _hashesOut = [];
|
private _hashesOut = [];
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
params [
|
params ["_allUserInfos", [], [[]]];
|
||||||
["_allUserInfos", [], [[]]]
|
|
||||||
];
|
|
||||||
|
|
||||||
private _hashesOut = [];
|
private _hashesOut = [];
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,11 +5,7 @@ class CfgPatches {
|
|||||||
units[] = {};
|
units[] = {};
|
||||||
weapons[] = {};
|
weapons[] = {};
|
||||||
requiredVersion = 2.10;
|
requiredVersion = 2.10;
|
||||||
requiredAddons[] = {
|
requiredAddons[] = {};
|
||||||
"cba_main",
|
|
||||||
"cba_xeh",
|
|
||||||
"cba_settings"
|
|
||||||
};
|
|
||||||
author[] = {"IndigoFox"};
|
author[] = {"IndigoFox"};
|
||||||
authorUrl = "https://github.com/indig0fox/IFXMetrics";
|
authorUrl = "https://github.com/indig0fox/IFXMetrics";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ GVARMAIN(captureLoop) = [
|
|||||||
|
|
||||||
|
|
||||||
// getUserInfo for all users
|
// getUserInfo for all users
|
||||||
private _allUserInfos = allUsers apply {getUserInfo _x} select {count _x > 0};
|
_allUserInfos = allUsers apply {getUserInfo _x} select {count _x > 0};
|
||||||
// entity_count returns an array of hashMap
|
// entity_count returns an array of hashMap
|
||||||
{
|
{
|
||||||
GVARMAIN(extensionName) callExtension [
|
GVARMAIN(extensionName) callExtension [
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#define MAJOR 2
|
#define MAJOR 2
|
||||||
#define MINOR 0
|
#define MINOR 0
|
||||||
#define PATCH 1
|
#define PATCH 0
|
||||||
#define BUILD 20231012
|
#define BUILD 20231009
|
||||||
|
|
||||||
#define VERSION 2.0
|
#define VERSION 2.0
|
||||||
#define VERSION_STR MAJOR##.##MINOR##.##PATCH##.##BUILD
|
#define VERSION_STR MAJOR##.##MINOR##.##PATCH##.##BUILD
|
||||||
|
|||||||
@@ -319,7 +319,4 @@ func main() {
|
|||||||
// s := settings.Active.Get("cbaEventHandlers")
|
// s := settings.Active.Get("cbaEventHandlers")
|
||||||
// // return the custom cba event handlers as an arma hashmap
|
// // return the custom cba event handlers as an arma hashmap
|
||||||
// fmt.Println(a3interface.ToArmaHashMap(s))
|
// fmt.Println(a3interface.ToArmaHashMap(s))
|
||||||
|
|
||||||
fmt.Println("IFXMetrics extension started. Version: " + EXTENSION_VERSION)
|
|
||||||
fmt.Scanln()
|
|
||||||
}
|
}
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
|
||||||
influxdb:
|
|
||||||
image: influxdb:latest
|
|
||||||
container_name: influxdb
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- 8086:8086
|
|
||||||
volumes:
|
|
||||||
- ./data:/var/lib/influxdb2
|
|
||||||
- ./config:/etc/influxdb2
|
|
||||||
environment:
|
|
||||||
- DOCKER_INFLUXDB_INIT_MODE=setup
|
|
||||||
- DOCKER_INFLUXDB_INIT_USERNAME=exampleuser
|
|
||||||
- DOCKER_INFLUXDB_INIT_PASSWORD=dfaow3ho9i7funa0w3nv
|
|
||||||
- DOCKER_INFLUXDB_INIT_ORG=ifx-metrics
|
|
||||||
- DOCKER_INFLUXDB_INIT_BUCKET=test-bucket
|
|
||||||
- DOCKER_INFLUXDB_INIT_RETENTION=1w
|
|
||||||
- DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=f0982q3ahfu8yawbo27w8fb986ba90b0wb2f
|
|
||||||
Reference in New Issue
Block a user