Skip to content

Commit 2282a68

Browse files
SRombautsUSRombautsU
committed
Add the PerforceBinaries to the repo
Remove Mercurial steps to download the PerforceBinaries hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries Submit a copy of the p4 & p4d binaries downloaded alongside the static libraries from https://filehost.perforce.com/perforce/r19.1 This is the correct way to manage dependencies (especially if we want to have branches using different versions) allowing to update it more easily to match the version of the p4api It will allow us to update to any Bokken image that wouldn't have Mercurial "hg" installed
1 parent dfa7c0b commit 2282a68

File tree

14 files changed

+91
-78
lines changed

14 files changed

+91
-78
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.lib filter=lfs diff=lfs merge=lfs -text
22
*.a filter=lfs diff=lfs merge=lfs -text
3+
PerforceBinaries/**/p4* filter=lfs diff=lfs merge=lfs -text

‎.gitignore

Lines changed: 39 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,39 @@
1-
# Specific
2-
Build/
3-
PerforceBinaries/
4-
Library/
5-
*.BASE.*.cpp
6-
*.LOCAL.*.cpp
7-
*.BACKUP.*.cpp
8-
*.REMOTE.*.cpp
9-
*.orig
10-
Test/tmp/*
11-
PerforcePlugin
12-
13-
# Compiled Object files
14-
*.slo
15-
*.lo
16-
*.o
17-
*.obj
18-
19-
# Precompiled Headers
20-
*.gch
21-
*.pch
22-
*.ipch
23-
24-
# Compiled Dynamic libraries
25-
*.so
26-
*.dylib
27-
*.dll
28-
29-
# Fortran module files
30-
*.mod
31-
32-
# Executables
33-
*.exe
34-
*.out
35-
*.app
36-
37-
# Output folders
38-
[Dd]ebug/
39-
[Rr]elease/
40-
[Bb]in/
41-
[Oo]bj/
42-
43-
# Visual Studio 2010 local files
44-
*.vcxproj.user
45-
*.opensdf
46-
*.sdf
47-
*.suo
48-
49-
# Visual Studio local files
50-
.vs/
51-
52-
# Test Ouput
53-
TestResults/
54-
55-
# Sublime files
56-
*.sublime-project
57-
*.sublime-workspace
58-
server.pid
59-
60-
# VI files
61-
*.swp
62-
63-
# JetBrains IDEs files
64-
.idea/
1+
# Specific
2+
Build/
3+
Library/
4+
*.BASE.*.cpp
5+
*.LOCAL.*.cpp
6+
*.BACKUP.*.cpp
7+
*.REMOTE.*.cpp
8+
*.orig
9+
Test/tmp/*
10+
PerforcePlugin
11+
12+
# Output folders
13+
[Dd]ebug/
14+
[Rr]elease/
15+
[Bb]in/
16+
[Oo]bj/
17+
18+
# Visual Studio 2010 local files
19+
*.vcxproj.user
20+
*.opensdf
21+
*.sdf
22+
*.suo
23+
24+
# Visual Studio local files
25+
.vs/
26+
27+
# Test Ouput
28+
TestResults/
29+
30+
# Sublime files
31+
*.sublime-project
32+
*.sublime-workspace
33+
server.pid
34+
35+
# VI files
36+
*.swp
37+
38+
# JetBrains IDEs files
39+
.idea/

‎.yamato/linux-build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ agent:
77
commands:
88
# Build PerforcePlugin and TestServer
99
- perl build.pl
10-
# Run the tests (requires Perforce P4 CLI)
11-
- hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
10+
11+
# Perforce CLI and server
12+
- chmod +x PerforceBinaries/linux64/p4 PerforceBinaries/linux64/p4d
13+
14+
# Run Perforce integration tests with the TestServer
1215
- perl build.pl -test
1316

1417
artifacts:

‎.yamato/osx-build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ agent:
77
commands:
88
# Build PerforcePlugin and TestServer
99
- perl build.pl
10-
# Run the tests (requires Perforce P4 CLI)
11-
- hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
10+
11+
# Perforce CLI and server
12+
- chmod +x PerforceBinaries/OSX/p4 PerforceBinaries/OSX/p4d
13+
14+
# Run Perforce integration tests with the TestServer
1215
- perl build.pl -test
1316

1417
artifacts:

‎.yamato/windows-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ agent:
77
commands:
88
# Build PerforcePlugin and TestServer
99
- perl build.pl
10-
# Run the tests (requires Perforce P4 CLI)
11-
- hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
10+
11+
# Run Perforce integration tests with the TestServer
1212
- perl build.pl -test
1313

1414
artifacts:

‎P4Plugin/Source/p4api/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Document the links from where the P4 C++ API (include files and static libraries
22

33
https://filehost.perforce.com/perforce/r19.1/ p4api-2019.1.2135798
44

5+
Notes: see also download_perforce_binaries.ps1
6+
57
# linux64
68
- https://filehost.perforce.com/perforce/r19.1/bin.linux26x86_64/p4api-glibc2.3-openssl1.0.2.tgz
79

‎PerforceBinaries/OSX/p4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:4bbc8fd6101d27de99355302c91b271394e93ad4cfe7edf7cb7cce415c3b4322
3+
size 8846592

‎PerforceBinaries/OSX/p4d

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:1b569ef08b506e2ade9032ba68852106bb94ad6c42bd8766e2cfda0bc1a3b760
3+
size 14729616

‎PerforceBinaries/Win_x64/p4.exe

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:2f741dc72498d8286860af4f52d2bddd705fd30b6cab9443cb2559547db0e5f3
3+
size 5037320

‎PerforceBinaries/Win_x64/p4d.exe

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:bdad2d08ebb1ed51e86f6e2468c39110880cd1ca0e67290e211d77cdc185163b
3+
size 8755968

0 commit comments

Comments
 (0)