Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 3b0f20e

Browse files
shanashana
authored
Merge pull request #226 from github-for-unity/feature/mac-support
Finish mac support
2 parents ccfeef3 + a2ca6b4 commit 3b0f20e

File tree

87 files changed

+1293
-682
lines changed

Some content is hidden

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

87 files changed

+1293
-682
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
*.exe filter=lfs diff=lfs merge=lfs -text
1111
*.meta -text
1212
*.asset -text
13-
*.unity -text
13+
*.unity -text
14+
*.bundle filter=lfs diff=lfs merge=lfs -text

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# [GitHub for Unity](https://unity.github.com)
22

3+
## Notices
4+
5+
From version 0.19 onwards, the location of the plugin has moved to `Assets/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
6+
37
![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
48

59
[![Join the chat at https://gitter.im/github-for-unity/Unity](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github-for-unity/Unity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
610
[![Join the chat at https://discord.gg/5zH8hVx](https://img.shields.io/badge/discord-join%20chat-7289DA.svg)](https://discord.gg/5zH8hVx)
711
[![GitHub for Unity live coding on Twitch](https://img.shields.io/badge/twitch-live%20coding-6441A4.svg)](https://www.twitch.tv/sh4na)
812

13+
## About
914

1015
The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub into [Unity](https://unity3d.com/), integrating source control into your work with friendly and accessible tools and workflows.
1116

‎appveyor.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ install:
4242
git submodule update
4343
4444
nuget restore GitHub.Unity.sln
45+
46+
assembly_info:
47+
patch: false
48+
file: common\SolutionInfo.cs
49+
assembly_informational_version: "{version}"
50+
51+
configuration: Release
4552
build:
4653
project: GitHub.Unity.sln
4754
verbosity: minimal
@@ -51,6 +58,7 @@ test:
5158
- DoNotRunOnAppVeyor
5259
- TimeSensitive
5360
artifacts:
54-
- path: unity\TestProject\Assets\Editor\*.dll
55-
- path: unity\TestProject\Assets\Editor\*.pdb
61+
- path: unity\PackageProject
62+
type: zip
63+
name: github-for-unity-packageproject
5664
- path: build\*.log

‎build.cmd‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,34 @@ if not %2.==. (
1212
)
1313

1414
if %Target%==Rebuild (
15-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.dll
16-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.mdb
17-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.pdb
18-
19-
if exist "..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub" (
20-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.dll
21-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.mdb
22-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.pdb
15+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.dll
16+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.mdb
17+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
18+
19+
if exist "..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor" (
20+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.dll
21+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.mdb
22+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.pdb
2323
)
2424
)
2525

2626
call common\nuget.exe restore GitHub.Unity.sln
27+
2728
echo xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
2829
call xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
2930

30-
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Editor\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Editor
31-
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Editor\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Editor
31+
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
32+
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
33+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
34+
35+
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
36+
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
3237

33-
del /Q unity\PackageProject\Assets\Editor\GitHub\deleteme*
34-
del /Q unity\PackageProject\Assets\Editor\GitHub\deleteme*
35-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.xml
38+
echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
39+
call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
3640

37-
if exist ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub (
38-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\deleteme*
39-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\deleteme*
40-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.xml
41+
if exist ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor (
42+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
43+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
44+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.xml
4145
)

‎build.sh‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ if [ $# -gt 1 ]; then
1010
fi
1111

1212
if [ x"$Target" == x"Rebuild" ]; then
13-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.dll
14-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.mdb
15-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.pdb
16-
17-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub ]; then
18-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.dll
19-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.mdb
20-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.pdb
13+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.dll
14+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.mdb
15+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
16+
17+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
18+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.dll
19+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.mdb
20+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.pdb
2121
fi
2222
fi
2323

@@ -34,14 +34,16 @@ fi
3434

3535
xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true
3636

37-
cp -r unity/PackageProject/Assets/Editor/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Editor || true
37+
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
38+
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
39+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
3840

39-
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
40-
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
41-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.xml
41+
cp -r unity/PackageProject/Assets/GitHub ../github-unity-test/GitHubExtensionProject/Assets/ || true
42+
cp -r unity/PackageProject/Assets/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/ || true
4243

43-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub ]; then
44-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/deleteme*
45-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/deleteme*
46-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.xml
44+
45+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
46+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
47+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
48+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.xml
4749
fi

‎common/nativelibraries.props‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Content Include="$(SolutionDir)\lib\sfw\linux\libsfw.so">
5+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6+
</Content>
7+
<Content Include="$(SolutionDir)\lib\sfw\linux\libsfw.so.meta">
8+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9+
</Content>
10+
<Content Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle">
11+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12+
</Content>
13+
<Content Include="$(SolutionDir)\lib\sfw\mac\libsfw.bundle.meta">
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</Content>
16+
<Content Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll">
17+
<Link>x64\sfw_x64.dll</Link>
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</Content>
20+
<Content Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
21+
<Link>x64\sfw_x64.dll.meta</Link>
22+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
23+
</Content>
24+
<Content Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll">
25+
<Link>x64\pthreadVC2.dll</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</Content>
28+
<Content Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll.meta">
29+
<Link>x64\pthreadVC2.dll.meta</Link>
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</Content>
32+
<Content Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll">
33+
<Link>x86\sfw_x86.dll</Link>
34+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35+
</Content>
36+
<Content Include="$(SolutionDir)\lib\sfw\win\x86\sfw_x86.dll.meta">
37+
<Link>x86\sfw_x86.dll.meta</Link>
38+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39+
</Content>
40+
<Content Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll">
41+
<Link>x86\pthreadVC2.dll</Link>
42+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
</Content>
44+
<Content Include="$(SolutionDir)\lib\sfw\win\x86\pthreadVC2.dll.meta">
45+
<Link>x86\pthreadVC2.dll.meta</Link>
46+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47+
</Content>
48+
</ItemGroup>
49+
</Project>

‎common/packaging.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\Editor\GitHub</PublishTo>
6-
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub</ExternalPublishTo>
5+
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\GitHub\Editor</PublishTo>
6+
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor</ExternalPublishTo>
77
</PropertyGroup>
88

99
<!-- After the build is done, we copy all the artifacts into two locations:

‎lib/sfw.net/Debug/sfw.net.dll‎

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

‎lib/sfw.net/Debug/sfw.net.dll.mdb‎

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

‎lib/sfw.net/Release/sfw.net.dll‎

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

0 commit comments

Comments
 (0)