Skip to content

Commit 9d3fc88

Browse files
author
Y_Less
committed
Merge remote-tracking branch 'remotes/upstream/shorter-user-errors' into Branch_burger
# Conflicts: # source/amx/amx.h
2 parents 263d1c1 + 07ad8e8 commit 9d3fc88

File tree

1,323 files changed

+4311931
-904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,323 files changed

+4311931
-904
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Contributing to the Pawn Compiler
22

3-
When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change.
4-
5-
Please note we have a code of conduct, please follow it in all your interactions with the project.
3+
If you are proposing a new feature or fixing a bug of significant complexity, please do not write any code and propose your planned changes via an issue first! This saves _you_ time in case changes are required or the feature is rejected and it saves the _maintainers_ time as discussing proposals is generally easier than doing code review. Thank you!
64

75
## Pull Requests
86

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Learn more about writing MCVE from [StackOverflow](https://stackoverflow.com/hel
2525
If this section is not relevant, feel free to remove this section from your issue.
2626
-->
2727

28-
```
28+
```Pawn
2929
```
3030

3131
<!-- comments on the code, if any -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ Never pull to `master` - always pull to `dev` or a relevant feature branch.
1212

1313
**Which issue(s) this PR fixes**:
1414

15-
<!--GitHub tip: using "Fixes #<issue number> will automatically close the issue upon being merged-->
15+
<!--
16+
Please ensure you have discussed your proposed changes before committing time to writing code!
17+
18+
GitHub tip: using "Fixes #<issue number> will automatically close the issue upon being merged
19+
-->
1620

1721
Fixes #
1822

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ after_failure:
3131
deploy:
3232
provider: releases
3333
api_key:
34-
secure: gDAuRNlF2uVhVHyZtJrX6MwNxnkfkQzohrC/6UcKAgqt+NKs4vZyq5FzTUceiDAkB0se70ZVx08e9ibAiXP/b7D1MPkAEiRxt9J6Vu3x6Bi1kPPuK5RfjFeT3gc1SbrULAP8Nz0NdU0chUhei6/V5NGhTegwp925DJOISq7+Ibw=
34+
secure: T90PePvue0C/4u5EwZKGLUc/aXyu2U2XMGDzdNdpla6wXONWABg3F6mY3vYXRRxdWPhz8W6qEFwQmbEIIExxLFrgH8CUGDoF/9dftaCxJIBw59WRwfbaIAWiK5p6wLzZBfRuZQWJMwWdjDu8woAYzfxWBL37hbZateUrcAB7lkc=
3535
file_glob: true
3636
file:
3737
- 'pawnc-*-linux.tar.gz'

Dockerfile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM ubuntu:eoan AS compiler-build
2+
3+
RUN apt-get update && \
4+
dpkg --add-architecture i386 && \
5+
apt-get install -y gcc \
6+
gcc-multilib \
7+
make \
8+
cmake \
9+
git \
10+
python3.8
11+
12+
WORKDIR /home
13+
ADD . /home/pawn
14+
COPY ./build.sh /home/build.sh
15+
RUN mkdir build
16+
RUN /home/build.sh
17+
WORKDIR /home/build
18+
19+
CMD ["/bin/bash"]
20+
21+
FROM ubuntu:eoan AS compiler
22+
RUN mkdir /home/compiler
23+
RUN mkdir /home/build
24+
WORKDIR /home/build
25+
COPY --from=compiler-build /home/build/pawncc .
26+
COPY --from=compiler-build /home/build/pawnruns .
27+
COPY --from=compiler-build /home/build/pawndisasm .
28+
COPY --from=compiler-build /home/build/libpawnc.so .
29+
WORKDIR /home
30+
ADD ./copy.sh /home
31+
32+
CMD /bin/bash

build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
cd build && \
4+
cmake ../pawn/source/compiler \
5+
-DCMAKE_C_FLAGS=-m32 \
6+
-DCMAKE_BUILD_TYPE=Release && \
7+
make

copy.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
cp -r /home/build /home/compiler

docker-compose.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: '3.7'
2+
3+
services:
4+
compiler:
5+
build: .
6+
stdin_open: true
7+
tty: true
8+
restart: 'no'
9+
volumes:
10+
- ${PWD}/compiler:/home/compiler

readme.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ Parallel installation is supported.
8686

8787
If you are a [sampctl][sampctl] user, you are already using this compiler!
8888

89-
### Build From Source
89+
### Building from Source
9090

91-
If you are interested in contributing or just using a specific version, check
92-
out [this page][build_source] for instructions for compiling for your platform.
91+
If you are interested in contributing then please first read
92+
[this document][contributing] and ensure you have discussed your proposed
93+
changes before writing any code. Check out [this page][build_source] for
94+
instructions for compiling for your platform.
9395

9496
## Background
9597

@@ -121,5 +123,7 @@ seems to be based on an older release of Pawn.
121123
[artifacts]:
122124
https://ci.appveyor.com/project/Southclaws/compiler/branch/master/artifacts
123125
[compat]: https://github.com/pawn-lang/compiler/wiki/Compatibility-mode
124-
[sampctl]: http://bit.ly/sampctl
126+
[sampctl]: https://github.com/Southclaws/sampctl
127+
[contributing]:
128+
https://github.com/pawn-lang/compiler/tree/master/.github/CONTRIBUTING.md
125129
[build_source]: https://github.com/pawn-lang/compiler/wiki/Building-From-Source

source/amx/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
project(pawnamx C)
22
cmake_minimum_required(VERSION 2.8)
33

4+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
5+
46
# check for optional include files
57
include(CheckIncludeFile)
68
check_include_file("unistd.h" HAVE_UNISTD_H)

0 commit comments

Comments
 (0)