Skip to content

Commit f94bf1e

Browse files
committed
Cleanup for docs
1 parent 2a5f942 commit f94bf1e

File tree

10 files changed

+254
-124
lines changed

10 files changed

+254
-124
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
$env:INCLUDE += ";$(Resolve-Path 'C:\p4api\win32\p4api-*\include\p4\')"
4444
$env:LIB += ";$(Resolve-Path 'C:\p4api\win32\p4api-*\lib');${env:ProgramFiles(x86)}\OpenSSL\lib"
4545
46-
msbuild VersionControl.sln /t:Clean /t:P4Plugin /t:TestServer /p:Configuration=Release /p:Platform=Win32 /p:UseEnv=true
46+
perl build.pl
4747
- name: Upload Artifacts
4848
uses: actions/upload-artifact@v4
4949
with:
@@ -70,19 +70,18 @@ jobs:
7070
tar -C /tmp -xf /tmp/p4api_linux64.tgz
7171
7272
mkdir -p PerforceBinaries/linux64
73-
curl -fsSL -o 'PerforceBinaries/linux64/p4d' 'https://ftp.perforce.com/perforce/r24.1/bin.linux26x86_64/p4d'
74-
curl -fsSL -o 'PerforceBinaries/linux64/p4' 'https://ftp.perforce.com/perforce/r24.1/bin.linux26x86_64/p4'
73+
curl -fsSL -o PerforceBinaries/linux64/p4d 'https://ftp.perforce.com/perforce/r24.1/bin.linux26x86_64/p4d'
74+
curl -fsSL -o PerforceBinaries/linux64/p4 'https://ftp.perforce.com/perforce/r24.1/bin.linux26x86_64/p4'
7575
chmod +x PerforceBinaries/linux64/p4d PerforceBinaries/linux64/p4
7676
- name: Build
7777
run: |
7878
include_dir=(/tmp/p4api-*/include/p4)
7979
lib_dir=(/tmp/p4api-*/lib)
8080
81-
export CFLAGS="-O3 -fPIC -fexceptions -fvisibility=hidden -DLINUX -I$include_dir"
82-
export CXXFLAGS="$CFLAGS"
81+
export CFLAGS="-I$include_dir"
8382
export LDLIBS="-L$lib_dir"
8483
85-
make -f Makefile.gnu PLATFORM=linux64
84+
perl build.pl
8685
- name: Upload Artifacts
8786
uses: actions/upload-artifact@v4
8887
with:
@@ -109,8 +108,8 @@ jobs:
109108
tar -C /tmp -xf /tmp/p4api_macos64.tgz
110109
111110
mkdir -p PerforceBinaries/OSX
112-
curl -sSL -o 'PerforceBinaries/OSX/p4d' 'https://ftp.perforce.com/perforce/r24.1/bin.macosx12arm64/p4d'
113-
curl -sSL -o 'PerforceBinaries/OSX/p4' 'https://ftp.perforce.com/perforce/r24.1/bin.macosx12arm64/p4'
111+
curl -sSL -o PerforceBinaries/OSX/p4d 'https://ftp.perforce.com/perforce/r24.1/bin.macosx12arm64/p4d'
112+
curl -sSL -o PerforceBinaries/OSX/p4 'https://ftp.perforce.com/perforce/r24.1/bin.macosx12arm64/p4'
114113
chmod +x PerforceBinaries/OSX/p4d PerforceBinaries/OSX/p4
115114
- name: Build OpenSSL
116115
working-directory: /tmp/openssl-1.1.1w
@@ -124,10 +123,9 @@ jobs:
124123
lib_dir=(/tmp/p4api-*/lib)
125124
126125
export CFLAGS="-I$include_dir"
127-
export CXXFLAGS="$CFLAGS"
128126
export LDLIBS="-L$lib_dir -L/usr/local/ssl/[email protected]_64/lib"
129127
130-
make -f Makefile.osx
128+
perl build.pl
131129
- name: Upload Artifacts
132130
uses: actions/upload-artifact@v4
133131
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
mkdir "unity-p4-plugin-${PLUGIN_VERSION}"
3939
cp -rv "$RUNNER_TEMP/unity-p4-plugin-linux26x86_64-glibc2.31/"* "unity-p4-plugin-${PLUGIN_VERSION}"
40-
tar -czf unity-p4-plugin.linux26x86_64-glibc2.31.tgz "unity-p4-plugin-${PLUGIN_VERSION}"
40+
tar -czf unity-p4-plugin-glibc2.31.linux26x86_64.tgz "unity-p4-plugin-${PLUGIN_VERSION}"
4141
- name: Stage macOS Release Files
4242
working-directory: ${{ runner.temp }}/stage/bin.macosx1011x86_64
4343
env:

CODE_OF_CONDUCT.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Open Source Code of Conduct
2+
3+
This code of conduct outlines expectations for participation in Perforce-managed open source communities, as well as steps for reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all. People violating this code of conduct may be banned from the community.
4+
5+
Our open source communities strive to:
6+
7+
## Be friendly and patient
8+
9+
Remember you might not be communicating in someone else's primary spoken or programming language, and others may not have your level of understanding.
10+
11+
## Be welcoming
12+
13+
Our communities welcome and support people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
14+
15+
## Be respectful
16+
17+
We are a world-wide community of professionals, and we conduct ourselves professionally. Disagreement is no excuse for poor behavior and poor manners. Disrespectful and unacceptable behavior includes, but is not limited to:
18+
19+
* Violent threats or language.
20+
* Discriminatory or derogatory jokes and language.
21+
* Posting sexually explicit or violent material.
22+
* Posting, or threatening to post, people's personally identifying information ("doxing").
23+
* Insults, especially those using discriminatory terms or slurs.
24+
* Behavior that could be perceived as sexual attention.
25+
* Advocating for or encouraging any of the above behaviors.
26+
27+
## Understand disagreements
28+
29+
Disagreements, both social and technical, are useful learning opportunities. Seek to understand the other viewpoints and resolve differences constructively.
30+
31+
This code is not exhaustive or complete. It serves to capture our common understanding of a productive, collaborative environment. We expect the code to be followed in spirit as much as in the letter.

LICENSE.txt

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
8+
9+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
10+
11+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PERFORCE SOFTWARE, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12+
13+
14+
This distribution is based on works dedicated to the public domain by Unity Software Inc.
15+
16+
This distribution also includes the following third party software; please consult the accompanying license file for the license terms that apply to that software only:
17+
18+
19+
OpenSSL
20+
=======
21+
22+
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
23+
24+
OpenSSL License
25+
26+
Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
27+
28+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
29+
30+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
31+
32+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
33+
34+
3. All advertising materials mentioning features or use of this software must display the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
35+
36+
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [email protected].
37+
38+
5. Products derived from this software may not be called "OpenSSL" nor may "OpenSSL" appear in their names without prior written permission of the OpenSSL Project.
39+
40+
6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)"
41+
42+
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43+
44+
This product includes cryptographic software written by Eric Young ([email protected]). This product includes software written by Tim Hudson ([email protected]).
45+
46+
47+
Original SSLeay License
48+
49+
Copyright (C) 1995-1998 Eric Young ([email protected]) All rights reserved.
50+
51+
This package is an SSL implementation written by Eric Young ([email protected]). The implementation was written so as to conform with Netscapes SSL.
52+
53+
This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson ([email protected]).
54+
55+
Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
56+
57+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
58+
59+
1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer.
60+
61+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
62+
63+
3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
64+
"This product includes cryptographic software written by Eric Young ([email protected])"
65+
The word 'cryptographic' can be left out if the rouines from the library being used are not cryptographic related :-).
66+
67+
4. If you include any Windows specific code (or a derivative thereof) from the apps directory (application code) you must include an acknowledgement: "This product includes software written by Tim Hudson ([email protected])"
68+
69+
THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
70+
71+
The licence and distribution terms for any publically available version or derivative of this code cannot be changed. i.e. this code cannot simply be copied and put under another distribution licence [including the GNU Public Licence.]
72+
73+
74+
P4API
75+
=====
76+
77+
Copyright (c) 1995-2024, Perforce Software, Inc. All rights reserved.
78+
79+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
80+
81+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
82+
83+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
84+
85+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

License

Lines changed: 0 additions & 5 deletions
This file was deleted.

Makefile.gnu

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ AR = ar
77
GTK3_INCLUDE = -I/usr/include/gtk-3.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/harfbuzz
88
GTK3_LIBRARIES = -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
99

10-
CXXFLAGS += -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
10+
CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DLINUX
11+
CXXFLAGS += $(CFLAGS) -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
1112
LDFLAGS += -pthread
1213
LDLIBS += -ldl -lstdc++ -lrt $(GTK3_LIBRARIES)
14+
PLATFORM ?= linux64
1315

1416
COMMON_MODULES = $(COMMON_SRCS:.c=.o)
1517
COMMON_MODULES := $(COMMON_MODULES:.cpp=.o)

Makefile.osx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CC = gcc
44
CXX = g++
55
AR = ar
66

7-
CXXFLAGS += -O2 -arch x86_64 -mmacosx-version-min=10.11 -fptrauth-objc-class-ro
7+
CXXFLAGS += $(CFLAGS) -O2 -arch x86_64 -mmacosx-version-min=10.11 -fptrauth-objc-class-ro
88
LDFLAGS += -arch x86_64 -lstdc++ -mmacosx-version-min=10.11 -Wl,-ld_classic
99
PLATFORM = OSXx64
1010

0 commit comments

Comments
 (0)