Merge pull request #83 from Hedgefog/master

Release 1.4.2
Hedgefog · Jul 31, 2022 · 3f402f6 · 3f402f6
2 parents 5a4197e + 96114d3
commit 3f402f6
Show file tree

Hide file tree

Showing 20 changed files with 6,318 additions and 1,222 deletions.
diff --git a/.amxxpack.json b/.amxxpack.json
@@ -0,0 +1,33 @@
+{
+  "compiler": {
+    "version": "1.9.0-git5294",
+    "dev": true,
+    "addons": ["cstrike"]
+  },
+  "include": [
+    "./.compiler/include",
+    "./.thirdparty/reapi/addons/amxmodx/scripting/include"
+  ],
+  "thirdparty": {
+    "dependencies": [
+      {
+        "name": "reapi",
+        "url": "https://github.com/s1lentq/reapi/releases/download/5.21.0.252/reapi-bin-5.21.0.252.zip"
+      }
+    ]
+  },
+  "input": {
+    "scripts": "./src/scripts",
+    "include": "./src/include",
+    "assets": "./assets"
+  },
+  "output": {
+    "plugins": "./dist/reapi/addons/amxmodx/plugins",
+    "scripts": "./dist/reapi/addons/amxmodx/scripting",
+    "include": "./dist/reapi/addons/amxmodx/scripting/include",
+    "assets": "./dist/reapi"
+  },
+  "rules": {
+    "flatCompilation": true
+  }
+}
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,6 @@
+# These are supported funding model platforms
+
+github: hedgefog
+ko_fi: hedgefog
+liberapay: hedgefog
+issuehunt: hedgefog
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,14 +17,6 @@
           uses: actions/setup-node@v1
           with:
             node-version: 12
-        - name: Install Zip
-          uses: montudor/[email protected]
-        - name: Download thirdparty
-          run: |
-            mkdir downloads
-            wget https://www.amxmodx.org/amxxdrop/1.9/amxmodx-1.9.0-git5271-base-linux.tar.gz -P ./downloads
-            wget https://www.amxmodx.org/amxxdrop/1.9/amxmodx-1.9.0-git5271-cstrike-linux.tar.gz -P ./downloads
-            wget https://github.com/s1lentq/reapi/releases/download/5.19.0.211/reapi_5.19.0.211-dev.zip -P ./downloads
         - name: Setup Build Variables
           id: buildvars
           uses: actions/github-script@v3
@@ -42,13 +34,6 @@
               } catch (err) {
                 core.setFailed(err.message);
               }
-        - name: Setup compiler
-          run: |
-            mkdir ./compiler
-            tar --strip-components=3 -zxf ./downloads/amxmodx-1.9.0-git5271-base-linux.tar.gz -C ./compiler addons/amxmodx/scripting
-            tar --strip-components=3 -zxf ./downloads/amxmodx-1.9.0-git5271-cstrike-linux.tar.gz -C ./compiler addons/amxmodx/scripting
-            mkdir -p ./thirdparty/reapi
-            unzip ./downloads/reapi_5.19.0.211-dev.zip -d ./thirdparty/reapi
         - name: Install Dependencies
           run: npm install
         - name: Build project
@@ -72,7 +57,7 @@
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             upload_url: ${{ steps.create_release.outputs.upload_url }}
-            asset_path: ./dist/bundles/src/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons.zip
+            asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip
             asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip
             asset_content_type: application/zip
         - name: Upload Release Build
@@ -82,7 +67,7 @@
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             upload_url: ${{ steps.create_release.outputs.upload_url }}
-            asset_path: ./dist/bundles/full/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons.zip
+            asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-build.zip
             asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-build.zip
             asset_content_type: application/zip
         - name: Upload Release Resources
@@ -92,7 +77,7 @@
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             upload_url: ${{ steps.create_release.outputs.upload_url }}
-            asset_path: ./dist/bundles/full/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-resources.zip
+            asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-resources.zip
             asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-resources.zip
             asset_content_type: application/zip
         - name: Upload Release SDK
@@ -102,12 +87,11 @@
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             upload_url: ${{ steps.create_release.outputs.upload_url }}
-            asset_path: ./dist/bundles/sdk/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
+            asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
             asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
             asset_content_type: application/zip
         - name: Cleanup
           run: |
-            rm -rf ./compiler
-            rm -rf ./thirdparty
+            rm -rf ./.compiler
+            rm -rf ./.thirdparty
             rm -rf ./dist
-            rm -rf ./downloads
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,7 @@
 *.max
 *.log
 
-*.user.*
-
 node_modules/
-
-compiler/
-thirdparty/*/**
-
 dist/
-bundles/
+.compiler/
+.thirdparty/
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ __Version:__ 1.4.1
 - Install dependencies `npm i`
 
 #### Customize builder
-Use `config.user.js` file (Generated automatically on dependencies install)
+Use `.amxxpack.json` configuration file
 
 #### Build project
 

diff --git a/builder/config.js b/builder/config.js
diff --git a/builder/constants.js b/builder/constants.js
diff --git a/builder/factories/build-task.factory.js b/builder/factories/build-task.factory.js
diff --git a/builder/generators/bundle-readme.generator.js b/builder/generators/bundle-readme.generator.js
diff --git a/builder/index.js b/builder/index.js
diff --git a/builder/resolvers/thirdparty.resolver.js b/builder/resolvers/thirdparty.resolver.js
diff --git a/builder/resolvers/user-config.resolver.js b/builder/resolvers/user-config.resolver.js
diff --git a/builder/tasks/build.tasks.js b/builder/tasks/build.tasks.js