Skip to content

Commit

Permalink
remove samp.json and use pawn.json instead
Browse files Browse the repository at this point in the history
  • Loading branch information
Sreyas-Sreelal committed Apr 18, 2019
1 parent de2da76 commit f6e7516
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -9,8 +9,13 @@
*dll
*so
*zip
*log

/dependencies/
/gamemodes/
/plugins/
/scriptfiles/
/filterscripts/

announce
samp03svr
Expand Down
13 changes: 5 additions & 8 deletions makefile
Expand Up @@ -2,15 +2,15 @@ ifdef OS
TOOLCHAIN = +stable-i686-pc-windows-msvc
BINARYNAME = {{crate_name}}.dll
OUPUTNAME = {{crate_name}}.dll
CP_RELEASE = cp .\target\release\$(BINARYNAME) .\test\plugins\$(OUPUTNAME)
CP_DEBUG = cp .\target\debug\$(BINARYNAME) .\test\plugins\$(OUPUTNAME)
CP_RELEASE = cp .\target\release\$(BINARYNAME) .\plugins\$(OUPUTNAME)
CP_DEBUG = cp .\target\debug\$(BINARYNAME) .\plugins\$(OUPUTNAME)
else
ifeq ($(shell uname), Linux)
TOOLCHAIN = +stable-i686-unknown-linux-gnu
BINARYNAME = lib{{crate_name}}.so
OUPUTNAME = {{crate_name}}.so
CP_RELEASE = cp target/release/$(BINARYNAME) test/plugins/$(OUPUTNAME)
CP_DEBUG = cp target/debug/$(BINARYNAME) test/plugins/$(OUPUTNAME)
CP_RELEASE = cp target/release/$(BINARYNAME) plugins/$(OUPUTNAME)
CP_DEBUG = cp target/debug/$(BINARYNAME) plugins/$(OUPUTNAME)
endif
endif

Expand All @@ -23,18 +23,15 @@ debug:
$(CP_DEBUG)

setup:
cd test && mkdir plugins
cd test && mkdir gamemodes
sampctl package ensure
sampctl package build
cd test && sampctl server ensure

ensure:
sampctl package ensure

run:
sampctl package build
cd test && sampctl server run
sampctl package run

clean:
cargo clean
10 changes: 8 additions & 2 deletions pawn.json
Expand Up @@ -2,7 +2,7 @@
"user": "{{authors}}",
"repo": "{{project-name}}",
"entry": "pawn-tests/test.pwn",
"output": "test/gamemodes/test.amx",
"output": "gamemodes/test.amx",
"dependencies": ["sampctl/pawn-stdlib"],
"dev_dependencies": ["pawn-lang/YSI-Includes"],
"include_path": "include",
Expand All @@ -13,7 +13,13 @@
}
],
"runtime": {
"plugins": ["{{authors}}/{{project-name}}"]
"rcon_password": "|%GuRd324$\u0026|",
"port": 7777,
"plugins":["{{crate_name}}"],
"gamemodes":["test"],
"hostname": "test",
"maxplayers": 32,
"mode": "y_testing"
},
"resources": [
{
Expand Down
9 changes: 0 additions & 9 deletions test/samp.json

This file was deleted.

0 comments on commit f6e7516

Please sign in to comment.