Merge pull request #47 from toniebox-reverse-engineering/develop

Next Version
toniebox-reverse-engineering · Aug 20, 2023 · 4d2f9fe · 4d2f9fe
2 parents 1843243 + fb82e68
commit 4d2f9fe
Show file tree

Hide file tree

Showing 65 changed files with 4,334 additions and 1,055 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -101,6 +101,11 @@ jobs:
         draft: true
         prerelease: ${{ env.IS_PRERELEASE }}
       if: github.event_name != 'pull_request'
+
+    - uses: actions/upload-artifact@master
+      with:
+        name: release.zip
+        path: ./install/zip/release.zip
 
     - name: Upload Release Asset
       id: upload-release-asset 

diff --git a/.github/workflows/build_release_multiarch.yml b/.github/workflows/build_release_multiarch.yml
diff --git a/.github/workflows/build_release_test.yml b/.github/workflows/build_release_test.yml
@@ -1,4 +1,4 @@
-name: Build and zip windows/linux
+name: Build and zip windows/linux Test
 
 on:
   workflow_dispatch:
@@ -16,23 +16,25 @@ jobs:
 
     - name: Build windows
       id:  build-zip
-      run: make build
+      run: cmd /c "C:\"Program Files"\"Microsoft Visual Studio"\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat && make build PLATFORM=windows SHELL_ENV=bash"
+      shell: cmd
     - name: Check windows executable existence
       id: check_release
       uses: andstor/file-existence-action@v1
       with:
-        files: "./bin/teddybench.exe"  
+        files: "bin/teddycloud.exe"  
         allow_failure: false 
     - name: File exist
       if: steps.check_files.outputs.files_exists == 'true'
       run: echo windows release zip exists!
     - uses: actions/upload-artifact@master
       with:
         name: windows-exe
-        path: /bin/teddybench.exe
+        path: bin\*
 
 
   build-linux-amd64:
+    needs: build-windows-amd64
     runs-on: ubuntu-latest
     outputs:
       upload_url: ${{ steps.set_data1.outputs.upload_url }}
@@ -68,7 +70,7 @@ jobs:
     - uses: actions/download-artifact@master
       with:
         name: windows-exe
-        path: /bin/teddybench.exe
+        path: ./bin/
 
     - name: Build and zip amd64
       id:  build-zip

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ contrib/certs/server/teddy-key.pem
 contrib/certs/client/teddy-cert.pem
 contrib/certs/client/teddy-key.csr
 contrib/certs/client/teddy-key.pem
+.vs/
+SSLKEYLOGFILE
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,22 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "windowsSdkVersion": "10.0.22000.0",
+            "compilerPath": "cl.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "windows-msvc-x64",
+            "configurationProvider": "ms-vscode.makefile-tools"
+        }
+    ],
+    "version": 4
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,7 +1,7 @@
 {
     "configurations": [
         {
-            "name": "Launch Server",
+            "name": "[linux] teddyCloud",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/bin/teddycloud",
@@ -16,7 +16,7 @@
             },
         },
         {
-            "name": "Launch Cloud Time Test",
+            "name": "[linux] teddyCloud Time Test",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/bin/teddycloud",
@@ -31,6 +31,46 @@
             "linux": {
                 "MIMode": "gdb",
             },
+        },
+        {
+            "name": "[wsl] teddyCloud",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "bin/teddycloud",
+            "args": [],
+            "cwd": ".",
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "pipeTransport": {
+                "pipeProgram": "wsl",
+                "pipeArgs": [ "--cd", "${workspaceFolder}", "-e", "bash", "-c" ]
+            },
+            "preLaunchTask": "[wsl] build",
+            "logging": {
+                "programOutput": true,
+                "engineLogging": true,
+                "trace": false,
+                "traceResponse": false,
+                "exceptions": false
+            }
+        },
+        {
+            "name": "[win32] teddyCloud",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/teddycloud.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/",
+            "environment": [],
+            "externalConsole": true,
+            "preLaunchTask": "[win32] build"
         }
     ]
 }